🐛 Trim outputs

steelbrain · Feb 11, 2016 · 1ff7e66 · 1ff7e66
1 parent 1e73922
commit 1ff7e66
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/spec/helper-spec.js b/spec/helper-spec.js
@@ -15,7 +15,7 @@ const stderrScript = path.join(__dirname, 'fixtures', 'stderr') +
 const testFile = path.join(__dirname, 'fixtures', 'test.txt')
 const packageJsonPath = fs.realpathSync(`${__dirname}/../package.json`)
 
-const testContents = fs.readFileSync(testFile).toString()
+const testContents = fs.readFileSync(testFile).toString().trim()
 
 describe('linter helpers', function () {
   describe('::exec*', function () {
@@ -68,8 +68,8 @@ describe('linter helpers', function () {
       }, 'STDERR')
 
       waitsForAsyncRejection(async function () {
-        return await helpers.exec(stderrScript, [])
-      }, 'STDERR\n')
+        return (await helpers.exec(stderrScript, [])).trim()
+      }, 'STDERR')
     })
 
     it('shows a nicer error for EACCESS', function () {
@@ -91,7 +91,7 @@ describe('linter helpers', function () {
             })
             expect(false).toBe(true)
           } catch (_) {
-            expect(_.message).toBe('STDERR\n')
+            expect(_.message.trim()).toBe('STDERR')
           }
         })
       })

diff --git a/src/helpers.js b/src/helpers.js
@@ -114,14 +114,14 @@ export function exec(
       exit() {
         if (options.stream === 'stdout') {
           if (data.stderr.length && options.throwOnStdErr) {
-            handleError(new Error(data.stderr.join('')))
+            handleError(new Error(data.stderr.join('').trim()))
           } else {
-            resolve(data.stdout.join(''))
+            resolve(data.stdout.join('').trim())
           }
         } else if (options.stream === 'stderr') {
-          resolve(data.stderr.join(''))
+          resolve(data.stderr.join('').trim())
         } else {
-          resolve({ stdout: data.stdout.join(''), stderr: data.stderr.join('') })
+          resolve({ stdout: data.stdout.join('').trim(), stderr: data.stderr.join('').trim() })
         }
       }
     }