trimming trailing white space

serverless · Aug 30, 2016 · ce2ce4a · ce2ce4a
1 parent 45353bc
commit ce2ce4a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/lib/classes/Utils.js b/lib/classes/Utils.js
@@ -74,7 +74,7 @@ class Utils {
     } else if (filePath.endsWith('.yml') || filePath.endsWith('.yaml')) {
       contents = YAML.load(contents.toString());
     } else {
-      contents = contents.toString();
+      contents = contents.toString().trim();
     }
 
     return contents;

diff --git a/tests/classes/Variables.js b/tests/classes/Variables.js
@@ -335,6 +335,20 @@ describe('Service', () => {
       expect(valueToPopulate).to.equal('hello world');
     });
 
+    it('should trim trailing whitespace and new line character', () => {
+      const serverless = new Serverless();
+      const SUtils = new Utils();
+      const tmpDirPath = testUtils.getTmpDirPath();
+
+      SUtils.writeFileSync(path.join(tmpDirPath, 'someFile'),
+        'hello world \n');
+
+      serverless.config.update({ servicePath: tmpDirPath });
+
+      const valueToPopulate = serverless.variables.getValueFromFile('file(./someFile)');
+      expect(valueToPopulate).to.equal('hello world');
+    });
+
     it('should populate from another file when variable is of any type', () => {
       const serverless = new Serverless();
       const SUtils = new Utils();