Handle all decaffeinate suggestions

Author: realityking

test/integration/cli-test.js

@@ -4,11 +4,6 @@
 */
 // TODO: This file was created by bulk-decaffeinate.
 // Fix any style issues and re-enable lint.
-/*
- * decaffeinate suggestions:
- * DS102: Remove unnecessary code created because of implicit returns
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
- */
 const fs = require('fs');
 const { assert } = require('chai');
 const { exec } = require('child_process');
@@ -31,21 +26,21 @@ describe('Command line', () => {
         if (error) {
           exitStatus = error.status;
         }
-        return done();
+        done();
       });
 
-      return cli.on('exit', code => exitStatus = code);
+      cli.on('exit', code => exitStatus = code);
     });
 
     it('should not return nothing to stderr', () => assert.equal(stderr, ''));
 
     it('should return with exit code 0', () => {});
 
-    return it('should return parsed body to standard output', (done) => {
+    it('should return parsed body to standard output', (done) => {
       const expectedOutputPath = './test/fixtures/get/expected-output';
-      return fs.readFile(expectedOutputPath, 'utf8', (err, expected) => {
+      fs.readFile(expectedOutputPath, 'utf8', (err, expected) => {
         assert.equal(stdout, expected);
-        return done();
+        done();
       });
     });
   });
@@ -65,26 +60,26 @@ describe('Command line', () => {
         if (error) {
           exitStatus = error.status;
         }
-        return done();
+        done();
       });
 
-      return cli.on('exit', code => exitStatus = code);
+      cli.on('exit', code => exitStatus = code);
     });
 
     it('should not return nothing to stderr', () => assert.equal(stderr, ''));
 
     it('should return with exit code 0', () => {});
 
-    return it('should return parsed body in API Blueprint format to standard output', (done) => {
+    it('should return parsed body in API Blueprint format to standard output', (done) => {
       const expectedOutputPath = './test/fixtures/post/expected-output.md';
-      return fs.readFile(expectedOutputPath, 'utf8', (err, expected) => {
+      fs.readFile(expectedOutputPath, 'utf8', (err, expected) => {
         assert.equal(stdout, expected);
-        return done();
+        done();
       });
     });
   });
 
-  return describe('no input on stdin and no options', () => {
+  describe('no input on stdin and no options', () => {
     let stdout = '';
     let stderr = '';
     let exitStatus = '';
@@ -95,20 +90,20 @@ describe('Command line', () => {
         stdout = out;
         stderr = err;
         if (error) {
-          return exitStatus = error.code;
+          exitStatus = error.code;
         }
       });
 
 
-      return cli.on('exit', (code) => {
+      cli.on('exit', (code) => {
         exitStatus = code;
-        return done();
+        done();
       });
     });
 
 
     it('should exit with status 1', () => assert.equal(exitStatus, 1));
 
-    return it('should return error message to stderr', () => assert.include(stderr, 'No input on stdin'));
+    it('should return error message to stderr', () => assert.include(stderr, 'No input on stdin'));
   });
 });

test/integration/js-api-test.js

@@ -4,11 +4,7 @@
 */
 // TODO: This file was created by bulk-decaffeinate.
 // Fix any style issues and re-enable lint.
-/*
- * decaffeinate suggestions:
- * DS102: Remove unnecessary code created because of implicit returns
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
- */
+
 const fs = require('fs');
 
 const { assert } = require('chai');
@@ -22,11 +18,11 @@ describe('Javascript API', () =>
       const traceFilePath = './test/fixtures/get/tracefile';
       const expectedOutputPath = './test/fixtures/get/expected-output';
 
-      return fs.readFile(traceFilePath, 'utf8', (err, trace) => {
+      fs.readFile(traceFilePath, 'utf8', (err, trace) => {
         const parsed = parser.parseToString(trace);
-        return fs.readFile(expectedOutputPath, 'utf8', (err, expected) => {
+        fs.readFile(expectedOutputPath, 'utf8', (err, expected) => {
           assert.equal(parsed, expected);
-          return done();
+          done();
         });
       });
     })));

test/unit/parser-test.js

@@ -4,13 +4,7 @@
 */
 // TODO: This file was created by bulk-decaffeinate.
 // Fix any style issues and re-enable lint.
-/*
- * decaffeinate suggestions:
- * DS101: Remove unnecessary use of Array.from
- * DS102: Remove unnecessary code created because of implicit returns
- * DS205: Consider reworking code to avoid use of IIFEs
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
- */
+
 const fs = require('fs');
 const { assert } = require('chai');
 const parser = require('../../lib/parser');
@@ -23,7 +17,7 @@ describe('parser module', () => {
     fs.readFile(`${__dirname}/../fixtures/get/tracefile`, (err, data) => {
       if (err) { done(err); }
       trace = data.toString();
-      return done();
+      done();
     }));
 
   it('has parse() defined', () => assert.isFunction(parser.parse));
@@ -33,7 +27,7 @@ describe('parser module', () => {
 
     it('is obejct', () => assert.isObject(output));
 
-    return describe('returned object', () => {
+    describe('returned object', () => {
       it('has key request', () => assert.include(Object.keys(output), 'request'));
 
       it('has key response', () => assert.include(Object.keys(output), 'response'));
@@ -44,37 +38,37 @@ describe('parser module', () => {
 
         it('contains multiple lines delimited by CRLF', () => {
           const lines = request.split('\r\n');
-          return assert.isTrue(lines.length > 1, `expected more than 1 item, got: ${lines.length}`);
+          assert.isTrue(lines.length > 1, `expected more than 1 item, got: ${lines.length}`);
         });
 
         it('contains user agent string', () => {
           const agentString = 'curl/7.24.0 (x86_64-apple-darwin12.0) libcurl/7.24.0 OpenSSL/0.9.8x zlib/1.2.5';
-          return assert.include(request, agentString);
+          assert.include(request, agentString);
         });
 
 
-        return it('does not contain double LF at the end', () => {
+        it('does not contain double LF at the end', () => {
           const outputChars = request.split('');
 
           let lastChars = '';
           lastChars = outputChars.pop() + lastChars;
           lastChars = outputChars.pop() + lastChars;
-          return assert.notInclude(lastChars, '\n\n');
+          assert.notInclude(lastChars, '\n\n');
         });
       });
 
-      return describe('parsed response', () => {
+      describe('parsed response', () => {
         let response = '';
         before(() => response = output.response);
 
         it('containt application/json', () => {
           const string = 'application/json';
-          return assert.include(response, string);
+          assert.include(response, string);
         });
 
-        return it('contains multiple lines delimited by CRLF', () => {
+        it('contains multiple lines delimited by CRLF', () => {
           const lines = response.split('\r\n');
-          return assert.isTrue(lines.length > 1, `expected more than 1 item, got: ${lines.length}`);
+          assert.isTrue(lines.length > 1, `expected more than 1 item, got: ${lines.length}`);
         });
       });
     });
@@ -90,48 +84,40 @@ describe('parser module', () => {
       let lastChars = '';
       lastChars = outputChars.pop() + lastChars;
       lastChars = outputChars.pop() + lastChars;
-      return assert.include(lastChars, '\n');
+      assert.include(lastChars, '\n');
     });
 
     it('should have Request ended by trailling LF', () => {
       const request = [];
 
-      for (const line of Array.from(output.split('\r\n'))) {
+      for (const line of output.split('\r\n')) {
         if (/^> /.test(line)) { request.push(line); }
       }
 
       const lastLine = request.pop();
-      return assert.equal(lastLine.split('').pop(), '\n');
+      assert.equal(lastLine.split('').pop(), '\n');
     });
 
     it("should have all parsed Request lines leaded by '> '", () => {
       const request = parser.parse(trace).request;
 
       let counter = 0;
-      return (() => {
-        const result = [];
-        for (const line of Array.from(request.split('\r\n'))) {
-          counter++;
-          const needle = `> ${line}`;
-          result.push(assert.include(output, needle, `Request on line #${counter.toString()} does not contain needle.`));
-        }
-        return result;
-      })();
+      for (const line of request.split('\r\n')) {
+        counter++;
+        const needle = `> ${line}`;
+        assert.include(output, needle, `Request on line #${counter.toString()} does not contain needle.`);
+      }
     });
 
-    return it("should have all parsed Response lines leaded by '< '", () => {
+    it("should have all parsed Response lines leaded by '< '", () => {
       const response = parser.parse(trace).response;
 
       let counter = 0;
-      return (() => {
-        const result = [];
-        for (const line of Array.from(response.split('\r\n'))) {
-          counter++;
-          const needle = `< ${line}`;
-          result.push(assert.include(output, needle, `Response on line #${counter.toString()} does not contain needle.`));
-        }
-        return result;
-      })();
+      for (const line of response.split('\r\n')) {
+        counter++;
+        const needle = `< ${line}`;
+        assert.include(output, needle, `Response on line #${counter.toString()} does not contain needle.`);
+      }
     });
   });
 
@@ -142,14 +128,14 @@ describe('parser module', () => {
     before(() => {
       parsedObject = parser.parse(trace);
       parsedString = parser.parseToString(trace);
-      return output = parser.parseBackRequestAndResponseFromString(parsedString);
+      output = parser.parseBackRequestAndResponseFromString(parsedString);
     });
 
     it('has parseBackRequestAndResponseFromString() defined', () => assert.isFunction(parser.parseBackRequestAndResponseFromString));
 
     it('should return object', () => assert.isObject(output));
 
-    return describe('returned object', () => {
+    describe('returned object', () => {
       it('has key request', () => assert.include(Object.keys(output), 'request'));
 
       it('has key response', () => assert.include(Object.keys(output), 'response'));
@@ -160,23 +146,23 @@ describe('parser module', () => {
 
         it('is a string', () => assert.isString(request));
 
-        return it('is equal to raw genuine request', () => assert.equal(request, parsedObject.request));
+        it('is equal to raw genuine request', () => assert.equal(request, parsedObject.request));
       });
 
-      return describe('parsed response', () => {
+      describe('parsed response', () => {
         let response = '';
         before(() => response = output.response);
 
         it('is a string', () => assert.isString(response));
 
-        return it('is equal to raw genuine response', () => assert.equal(response, parsedObject.response));
+        it('is equal to raw genuine response', () => assert.equal(response, parsedObject.response));
       });
     });
   });
 
-  return describe('parseBack(parsedString) ', () => {
+  describe('parseBack(parsedString) ', () => {
     it('is a function', () => assert.isFunction(parser.parseBack));
 
-    return it('is an alias for parseBackRequestAndResponseFromString', () => assert.equal(parser.parseBack, parser.parseBackRequestAndResponseFromString));
+    it('is an alias for parseBackRequestAndResponseFromString', () => assert.equal(parser.parseBack, parser.parseBackRequestAndResponseFromString));
   });
 });