From 84cc6ec125a17235f6ed25cac0cd334b820617db Mon Sep 17 00:00:00 2001 From: decaffeinate Date: Sun, 11 Feb 2018 09:58:10 -0800 Subject: [PATCH 1/7] decaffeinate: Rename cli-test.coffee and 2 other files from .coffee to .js --- test/integration/{cli-test.coffee => cli-test.js} | 0 test/integration/{js-api-test.coffee => js-api-test.js} | 0 test/unit/{parser-test.coffee => parser-test.js} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename test/integration/{cli-test.coffee => cli-test.js} (100%) rename test/integration/{js-api-test.coffee => js-api-test.js} (100%) rename test/unit/{parser-test.coffee => parser-test.js} (100%) diff --git a/test/integration/cli-test.coffee b/test/integration/cli-test.js similarity index 100% rename from test/integration/cli-test.coffee rename to test/integration/cli-test.js diff --git a/test/integration/js-api-test.coffee b/test/integration/js-api-test.js similarity index 100% rename from test/integration/js-api-test.coffee rename to test/integration/js-api-test.js diff --git a/test/unit/parser-test.coffee b/test/unit/parser-test.js similarity index 100% rename from test/unit/parser-test.coffee rename to test/unit/parser-test.js From 414be3c302f8329b03b97636b6a3c2efd7f1d87b Mon Sep 17 00:00:00 2001 From: decaffeinate Date: Sun, 11 Feb 2018 09:58:12 -0800 Subject: [PATCH 2/7] decaffeinate: Convert cli-test.coffee and 2 other files to JS --- test/integration/cli-test.js | 202 ++++++++++--------- test/integration/js-api-test.js | 40 ++-- test/unit/parser-test.js | 339 +++++++++++++++++--------------- 3 files changed, 313 insertions(+), 268 deletions(-) diff --git a/test/integration/cli-test.js b/test/integration/cli-test.js index 0d954d7..f52523a 100644 --- a/test/integration/cli-test.js +++ b/test/integration/cli-test.js @@ -1,93 +1,109 @@ -fs = require('fs') -{assert} = require('chai') -{exec} = require('child_process') - -cmdPrefix = '' - -describe "Command line", () -> - describe "parsing from standard input with --raw", () -> - stdout = "" - stderr = "" - exitStatus = "" - - before (done) -> - cmd = 'cat ./test/fixtures/get/tracefile | ' + - './bin/curl-trace-parser --raw' - - cli = exec cmdPrefix + cmd, (error, out, err) -> - stdout = out - stderr = err - if error - exitStatus = error.status - done() - - cli.on 'exit', (code) -> - exitStatus = code - - it "should not return nothing to stderr", () -> - assert.equal stderr, "" - - it "should return with exit code 0", () -> - - it "should return parsed body to standard output", (done) -> - expectedOutputPath = "./test/fixtures/get/expected-output" - fs.readFile expectedOutputPath, 'utf8', (err, expected) -> - assert.equal stdout, expected - done() - - describe "parsing from standard input with --blueprint option", () -> - stdout = "" - stderr = "" - exitStatus = "" - - before (done) -> - cmd = 'cat ./test/fixtures/post/tracefile | ' + - './bin/curl-trace-parser --blueprint' - - cli = exec cmdPrefix + cmd, (error, out, err) -> - stdout = out - stderr = err - if error - exitStatus = error.status - done() - - cli.on 'exit', (code) -> - exitStatus = code - - it "should not return nothing to stderr", () -> - assert.equal stderr, "" - - it "should return with exit code 0", () -> - - it "should return parsed body in API Blueprint format to standard output", (done) -> - expectedOutputPath = "./test/fixtures/post/expected-output.md" - fs.readFile expectedOutputPath, 'utf8', (err, expected) -> - assert.equal stdout, expected - done() - - describe "no input on stdin and no options", ()-> - - stdout = "" - stderr = "" - exitStatus = "" - - before (done) -> - cmd = './bin/curl-trace-parser' - cli = exec cmdPrefix + cmd, (error, out, err) -> - stdout = out - stderr = err - if error - exitStatus = error.code - - - cli.on 'exit', (code) -> - exitStatus = code - done() - - - it "should exit with status 1", () -> - assert.equal exitStatus, 1 - - it "should return error message to stderr", () -> - assert.include stderr, "No input on stdin" - +/* + * 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'); + +const cmdPrefix = ''; + +describe("Command line", function() { + describe("parsing from standard input with --raw", function() { + let stdout = ""; + let stderr = ""; + let exitStatus = ""; + + before(function(done) { + const cmd = 'cat ./test/fixtures/get/tracefile | ' + + './bin/curl-trace-parser --raw'; + + const cli = exec(cmdPrefix + cmd, function(error, out, err) { + stdout = out; + stderr = err; + if (error) { + exitStatus = error.status; + } + return done(); + }); + + return cli.on('exit', code => exitStatus = code); + }); + + it("should not return nothing to stderr", () => assert.equal(stderr, "")); + + it("should return with exit code 0", function() {}); + + return it("should return parsed body to standard output", function(done) { + const expectedOutputPath = "./test/fixtures/get/expected-output"; + return fs.readFile(expectedOutputPath, 'utf8', function(err, expected) { + assert.equal(stdout, expected); + return done(); + }); + }); + }); + + describe("parsing from standard input with --blueprint option", function() { + let stdout = ""; + let stderr = ""; + let exitStatus = ""; + + before(function(done) { + const cmd = 'cat ./test/fixtures/post/tracefile | ' + + './bin/curl-trace-parser --blueprint'; + + const cli = exec(cmdPrefix + cmd, function(error, out, err) { + stdout = out; + stderr = err; + if (error) { + exitStatus = error.status; + } + return done(); + }); + + return cli.on('exit', code => exitStatus = code); + }); + + it("should not return nothing to stderr", () => assert.equal(stderr, "")); + + it("should return with exit code 0", function() {}); + + return it("should return parsed body in API Blueprint format to standard output", function(done) { + const expectedOutputPath = "./test/fixtures/post/expected-output.md"; + return fs.readFile(expectedOutputPath, 'utf8', function(err, expected) { + assert.equal(stdout, expected); + return done(); + }); + }); + }); + + return describe("no input on stdin and no options", function(){ + + let stdout = ""; + let stderr = ""; + let exitStatus = ""; + + before(function(done) { + const cmd = './bin/curl-trace-parser'; + const cli = exec(cmdPrefix + cmd, function(error, out, err) { + stdout = out; + stderr = err; + if (error) { + return exitStatus = error.code; + } + }); + + + return cli.on('exit', function(code) { + exitStatus = code; + return 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")); + }); +}); diff --git a/test/integration/js-api-test.js b/test/integration/js-api-test.js index 013890e..ab50d02 100644 --- a/test/integration/js-api-test.js +++ b/test/integration/js-api-test.js @@ -1,18 +1,28 @@ -fs = require 'fs' +/* + * 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'); -{assert} = require('chai') -{exec} = require('child_process') -parser = require('../../lib/parser') +const {assert} = require('chai'); +const {exec} = require('child_process'); +const parser = require('../../lib/parser'); -describe "Javascript API", () -> - describe "parsing from file", () -> - - it "should return expected raw HTTP in format described in Readme", (done) -> - traceFilePath = "./test/fixtures/get/tracefile" - expectedOutputPath = "./test/fixtures/get/expected-output" +describe("Javascript API", () => + describe("parsing from file", () => - fs.readFile traceFilePath, 'utf8', (err,trace) -> - parsed = parser.parseToString trace - fs.readFile expectedOutputPath, 'utf8', (err,expected) -> - assert.equal parsed, expected - done() \ No newline at end of file + it("should return expected raw HTTP in format described in Readme", function(done) { + const traceFilePath = "./test/fixtures/get/tracefile"; + const expectedOutputPath = "./test/fixtures/get/expected-output"; + + return fs.readFile(traceFilePath, 'utf8', function(err,trace) { + const parsed = parser.parseToString(trace); + return fs.readFile(expectedOutputPath, 'utf8', function(err,expected) { + assert.equal(parsed, expected); + return done(); + }); + }); + }) + ) +); diff --git a/test/unit/parser-test.js b/test/unit/parser-test.js index c06fab8..b20025f 100644 --- a/test/unit/parser-test.js +++ b/test/unit/parser-test.js @@ -1,161 +1,180 @@ -fs = require 'fs' -assert = require('chai').assert -parser = require '../../lib/parser' - -describe 'parser module', () -> - output = "" - trace = "" - - before (done) -> - fs.readFile __dirname + '/../fixtures/get/tracefile', (err, data) -> - done err if err - trace = data.toString() - done() - - it "has parse() defined", () -> - assert.isFunction parser.parse - - describe "parse(string) return", () -> - - before () -> - output = parser.parse trace - - it "is obejct", () -> - assert.isObject output - - describe "returned object", () -> - - it "has key request", () -> - assert.include Object.keys(output), "request" - - it "has key response", () -> - assert.include Object.keys(output), "response" - - describe "parsed request", () -> - request = "" - before () -> - request = output['request'] - - it "contains multiple lines delimited by CRLF", () -> - lines = request.split "\r\n" - assert.isTrue lines.length > 1, 'expected more than 1 item, got: ' + lines.length - - it "contains user agent string", () -> - agentString = "curl/7.24.0 (x86_64-apple-darwin12.0) libcurl/7.24.0 OpenSSL/0.9.8x zlib/1.2.5" - assert.include request, agentString - - - it "does not contain double LF at the end", () -> - outputChars = request.split '' - - lastChars = "" - lastChars = outputChars.pop() + lastChars - lastChars = outputChars.pop() + lastChars - assert.notInclude lastChars, "\n\n" - - describe "parsed response", () -> - response = "" - before () -> - response = output['response'] - - it "containt application/json", () -> - string = "application/json" - assert.include response, string - - it "contains multiple lines delimited by CRLF", () -> - lines = response.split "\r\n" - assert.isTrue lines.length > 1, 'expected more than 1 item, got: ' + lines.length - - it "has parseToString() defined", () -> - assert.isFunction parser.parseToString - - describe "parseToString(traceString) return", () -> - - before () -> - output = parser.parseToString trace - - it "should have trailing LF as last character to do not brake terminal", () -> - outputChars = output.split '' - lastChars = "" - lastChars = outputChars.pop() + lastChars - lastChars = outputChars.pop() + lastChars - assert.include lastChars, "\n" - - it "should have Request ended by trailling LF", () -> - request = [] - - for line in output.split('\r\n') - request.push line if /^> /.test line - - lastLine = request.pop() - assert.equal lastLine.split('').pop(), '\n' - - it "should have all parsed Request lines leaded by '> '", () -> - request = parser.parse(trace)['request'] - - counter = 0 - for line in request.split "\r\n" - counter++ - needle = '> ' + line - assert.include output, needle, "Request on line #" + counter.toString() + " does not contain needle." - - it "should have all parsed Response lines leaded by '< '", () -> - response = parser.parse(trace)['response'] - - counter = 0 - for line in response.split "\r\n" - counter++ - needle = '< ' + line - assert.include output, needle, "Response on line #" + counter.toString() + " does not contain needle." - - describe "parseBackRequestAndResponseFromString(parsedString)", () -> - parsedObject = {} - parsedString = "" - - before () -> - parsedObject = parser.parse trace - parsedString = parser.parseToString trace - output = parser.parseBackRequestAndResponseFromString parsedString - - it "has parseBackRequestAndResponseFromString() defined", () -> - assert.isFunction parser.parseBackRequestAndResponseFromString - - it "should return object", () -> - assert.isObject output - - describe "returned object", () -> - it "has key request", () -> - assert.include Object.keys(output), "request" - - it "has key response", () -> - assert.include Object.keys(output), "response" - - describe "parsed request", () -> - request = "" - before () -> - request = output['request'] - - it "is a string", () -> - assert.isString request - - it "is equal to raw genuine request", () -> - assert.equal request, parsedObject['request'] - - describe "parsed response", () -> - response = "" - before () -> - response = output['response'] - - it "is a string", () -> - assert.isString response - - it "is equal to raw genuine response", () -> - assert.equal response, parsedObject['response'] - - describe "parseBack(parsedString) ", () -> - it "is a function", () -> - assert.isFunction parser.parseBack - - it "is an alias for parseBackRequestAndResponseFromString", () -> - assert.equal parser.parseBack, parser.parseBackRequestAndResponseFromString +/* + * 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'); +describe('parser module', function() { + let output = ""; + let trace = ""; + + before(done => + fs.readFile(__dirname + '/../fixtures/get/tracefile', function(err, data) { + if (err) { done(err); } + trace = data.toString(); + return done(); + }) + ); + + it("has parse() defined", () => assert.isFunction(parser.parse)); + + describe("parse(string) return", function() { + + before(() => output = parser.parse(trace)); + + it("is obejct", () => assert.isObject(output)); + + return describe("returned object", function() { + + it("has key request", () => assert.include(Object.keys(output), "request")); + + it("has key response", () => assert.include(Object.keys(output), "response")); + + describe("parsed request", function() { + let request = ""; + before(() => request = output['request']); + + it("contains multiple lines delimited by CRLF", function() { + const lines = request.split("\r\n"); + return assert.isTrue(lines.length > 1, `expected more than 1 item, got: ${lines.length}`); + }); + + it("contains user agent string", function() { + 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); + }); + + + return it("does not contain double LF at the end", function() { + const outputChars = request.split(''); + + let lastChars = ""; + lastChars = outputChars.pop() + lastChars; + lastChars = outputChars.pop() + lastChars; + return assert.notInclude(lastChars, "\n\n"); + }); + }); + + return describe("parsed response", function() { + let response = ""; + before(() => response = output['response']); + + it("containt application/json", function() { + const string = "application/json"; + return assert.include(response, string); + }); + + return it("contains multiple lines delimited by CRLF", function() { + const lines = response.split("\r\n"); + return assert.isTrue(lines.length > 1, `expected more than 1 item, got: ${lines.length}`); + }); + }); + }); + }); + + it("has parseToString() defined", () => assert.isFunction(parser.parseToString)); + + describe("parseToString(traceString) return", function() { + + before(() => output = parser.parseToString(trace)); + + it("should have trailing LF as last character to do not brake terminal", function() { + const outputChars = output.split(''); + let lastChars = ""; + lastChars = outputChars.pop() + lastChars; + lastChars = outputChars.pop() + lastChars; + return assert.include(lastChars, "\n"); + }); + + it("should have Request ended by trailling LF", function() { + const request = []; + + for (let line of Array.from(output.split('\r\n'))) { + if (/^> /.test(line)) { request.push(line); } + } + + const lastLine = request.pop(); + return assert.equal(lastLine.split('').pop(), '\n'); + }); + + it("should have all parsed Request lines leaded by '> '", function() { + const request = parser.parse(trace)['request']; + + let counter = 0; + return (() => { + const result = []; + for (let 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; + })(); + }); + + return it("should have all parsed Response lines leaded by '< '", function() { + const response = parser.parse(trace)['response']; + + let counter = 0; + return (() => { + const result = []; + for (let 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; + })(); + }); + }); + + describe("parseBackRequestAndResponseFromString(parsedString)", function() { + let parsedObject = {}; + let parsedString = ""; + + before(function() { + parsedObject = parser.parse(trace); + parsedString = parser.parseToString(trace); + return output = parser.parseBackRequestAndResponseFromString(parsedString); + }); + + it("has parseBackRequestAndResponseFromString() defined", () => assert.isFunction(parser.parseBackRequestAndResponseFromString)); + + it("should return object", () => assert.isObject(output)); + + return describe("returned object", function() { + it("has key request", () => assert.include(Object.keys(output), "request")); + + it("has key response", () => assert.include(Object.keys(output), "response")); + + describe("parsed request", function() { + let request = ""; + before(() => request = output['request']); + + it("is a string", () => assert.isString(request)); + + return it("is equal to raw genuine request", () => assert.equal(request, parsedObject['request'])); + }); + + return describe("parsed response", function() { + 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'])); + }); + }); +}); + + return describe("parseBack(parsedString) ", function() { + it("is a function", () => assert.isFunction(parser.parseBack)); + + return it("is an alias for parseBackRequestAndResponseFromString", () => assert.equal(parser.parseBack, parser.parseBackRequestAndResponseFromString)); + }); +}); From 99f25835812e3267f97b321dc89042b1e3bf690e Mon Sep 17 00:00:00 2001 From: decaffeinate Date: Sun, 11 Feb 2018 09:58:13 -0800 Subject: [PATCH 3/7] decaffeinate: Run post-processing cleanups on cli-test.coffee and 2 other files --- test/integration/cli-test.js | 77 +++++++++-------- test/integration/js-api-test.js | 28 ++++--- test/unit/parser-test.js | 144 ++++++++++++++++---------------- 3 files changed, 130 insertions(+), 119 deletions(-) diff --git a/test/integration/cli-test.js b/test/integration/cli-test.js index f52523a..f23bf1f 100644 --- a/test/integration/cli-test.js +++ b/test/integration/cli-test.js @@ -1,25 +1,31 @@ +/* eslint-disable + no-return-assign, + no-unused-vars, +*/ +// 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'); +const { assert } = require('chai'); +const { exec } = require('child_process'); const cmdPrefix = ''; -describe("Command line", function() { - describe("parsing from standard input with --raw", function() { - let stdout = ""; - let stderr = ""; - let exitStatus = ""; +describe('Command line', () => { + describe('parsing from standard input with --raw', () => { + let stdout = ''; + let stderr = ''; + let exitStatus = ''; - before(function(done) { + before((done) => { const cmd = 'cat ./test/fixtures/get/tracefile | ' + './bin/curl-trace-parser --raw'; - const cli = exec(cmdPrefix + cmd, function(error, out, err) { + const cli = exec(cmdPrefix + cmd, (error, out, err) => { stdout = out; stderr = err; if (error) { @@ -31,29 +37,29 @@ describe("Command line", function() { return cli.on('exit', code => exitStatus = code); }); - it("should not return nothing to stderr", () => assert.equal(stderr, "")); + it('should not return nothing to stderr', () => assert.equal(stderr, '')); - it("should return with exit code 0", function() {}); + it('should return with exit code 0', () => {}); - return it("should return parsed body to standard output", function(done) { - const expectedOutputPath = "./test/fixtures/get/expected-output"; - return fs.readFile(expectedOutputPath, 'utf8', function(err, expected) { + return it('should return parsed body to standard output', (done) => { + const expectedOutputPath = './test/fixtures/get/expected-output'; + return fs.readFile(expectedOutputPath, 'utf8', (err, expected) => { assert.equal(stdout, expected); return done(); }); }); }); - describe("parsing from standard input with --blueprint option", function() { - let stdout = ""; - let stderr = ""; - let exitStatus = ""; + describe('parsing from standard input with --blueprint option', () => { + let stdout = ''; + let stderr = ''; + let exitStatus = ''; - before(function(done) { + before((done) => { const cmd = 'cat ./test/fixtures/post/tracefile | ' + './bin/curl-trace-parser --blueprint'; - const cli = exec(cmdPrefix + cmd, function(error, out, err) { + const cli = exec(cmdPrefix + cmd, (error, out, err) => { stdout = out; stderr = err; if (error) { @@ -65,28 +71,27 @@ describe("Command line", function() { return cli.on('exit', code => exitStatus = code); }); - it("should not return nothing to stderr", () => assert.equal(stderr, "")); + it('should not return nothing to stderr', () => assert.equal(stderr, '')); - it("should return with exit code 0", function() {}); + it('should return with exit code 0', () => {}); - return it("should return parsed body in API Blueprint format to standard output", function(done) { - const expectedOutputPath = "./test/fixtures/post/expected-output.md"; - return fs.readFile(expectedOutputPath, 'utf8', function(err, expected) { + return 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) => { assert.equal(stdout, expected); return done(); }); }); }); - return describe("no input on stdin and no options", function(){ + return describe('no input on stdin and no options', () => { + let stdout = ''; + let stderr = ''; + let exitStatus = ''; - let stdout = ""; - let stderr = ""; - let exitStatus = ""; - - before(function(done) { - const cmd = './bin/curl-trace-parser'; - const cli = exec(cmdPrefix + cmd, function(error, out, err) { + before((done) => { + const cmd = './bin/curl-trace-parser'; + const cli = exec(cmdPrefix + cmd, (error, out, err) => { stdout = out; stderr = err; if (error) { @@ -95,15 +100,15 @@ describe("Command line", function() { }); - return cli.on('exit', function(code) { + return cli.on('exit', (code) => { exitStatus = code; return done(); }); }); - it("should exit with status 1", () => assert.equal(exitStatus, 1)); + 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")); + return it('should return error message to stderr', () => assert.include(stderr, 'No input on stdin')); }); }); diff --git a/test/integration/js-api-test.js b/test/integration/js-api-test.js index ab50d02..5d1c23a 100644 --- a/test/integration/js-api-test.js +++ b/test/integration/js-api-test.js @@ -1,3 +1,9 @@ +/* eslint-disable + no-shadow, + no-unused-vars, +*/ +// 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 @@ -5,24 +11,22 @@ */ const fs = require('fs'); -const {assert} = require('chai'); -const {exec} = require('child_process'); +const { assert } = require('chai'); +const { exec } = require('child_process'); const parser = require('../../lib/parser'); -describe("Javascript API", () => - describe("parsing from file", () => +describe('Javascript API', () => + describe('parsing from file', () => - it("should return expected raw HTTP in format described in Readme", function(done) { - const traceFilePath = "./test/fixtures/get/tracefile"; - const expectedOutputPath = "./test/fixtures/get/expected-output"; + it('should return expected raw HTTP in format described in Readme', (done) => { + const traceFilePath = './test/fixtures/get/tracefile'; + const expectedOutputPath = './test/fixtures/get/expected-output'; - return fs.readFile(traceFilePath, 'utf8', function(err,trace) { + return fs.readFile(traceFilePath, 'utf8', (err, trace) => { const parsed = parser.parseToString(trace); - return fs.readFile(expectedOutputPath, 'utf8', function(err,expected) { + return fs.readFile(expectedOutputPath, 'utf8', (err, expected) => { assert.equal(parsed, expected); return done(); }); }); - }) - ) -); + }))); diff --git a/test/unit/parser-test.js b/test/unit/parser-test.js index b20025f..0003326 100644 --- a/test/unit/parser-test.js +++ b/test/unit/parser-test.js @@ -1,3 +1,9 @@ +/* eslint-disable + no-return-assign, + prefer-destructuring, +*/ +// 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 @@ -9,92 +15,88 @@ const fs = require('fs'); const { assert } = require('chai'); const parser = require('../../lib/parser'); -describe('parser module', function() { - let output = ""; - let trace = ""; +describe('parser module', () => { + let output = ''; + let trace = ''; before(done => - fs.readFile(__dirname + '/../fixtures/get/tracefile', function(err, data) { + fs.readFile(`${__dirname}/../fixtures/get/tracefile`, (err, data) => { if (err) { done(err); } trace = data.toString(); return done(); - }) - ); + })); - it("has parse() defined", () => assert.isFunction(parser.parse)); - - describe("parse(string) return", function() { + it('has parse() defined', () => assert.isFunction(parser.parse)); + describe('parse(string) return', () => { before(() => output = parser.parse(trace)); - it("is obejct", () => assert.isObject(output)); - - return describe("returned object", function() { + it('is obejct', () => assert.isObject(output)); - it("has key request", () => assert.include(Object.keys(output), "request")); + return describe('returned object', () => { + it('has key request', () => assert.include(Object.keys(output), 'request')); - it("has key response", () => assert.include(Object.keys(output), "response")); + it('has key response', () => assert.include(Object.keys(output), 'response')); - describe("parsed request", function() { - let request = ""; - before(() => request = output['request']); + describe('parsed request', () => { + let request = ''; + before(() => request = output.request); - it("contains multiple lines delimited by CRLF", function() { - const lines = request.split("\r\n"); + 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}`); }); - it("contains user agent string", function() { - const agentString = "curl/7.24.0 (x86_64-apple-darwin12.0) libcurl/7.24.0 OpenSSL/0.9.8x zlib/1.2.5"; + 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); }); - return it("does not contain double LF at the end", function() { - const outputChars = request.split(''); + return 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"); + let lastChars = ''; + lastChars = outputChars.pop() + lastChars; + lastChars = outputChars.pop() + lastChars; + return assert.notInclude(lastChars, '\n\n'); }); }); - return describe("parsed response", function() { - let response = ""; - before(() => response = output['response']); + return describe('parsed response', () => { + let response = ''; + before(() => response = output.response); - it("containt application/json", function() { - const string = "application/json"; + it('containt application/json', () => { + const string = 'application/json'; return assert.include(response, string); }); - return it("contains multiple lines delimited by CRLF", function() { - const lines = response.split("\r\n"); + return 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}`); }); }); }); }); - it("has parseToString() defined", () => assert.isFunction(parser.parseToString)); - - describe("parseToString(traceString) return", function() { + it('has parseToString() defined', () => assert.isFunction(parser.parseToString)); + describe('parseToString(traceString) return', () => { before(() => output = parser.parseToString(trace)); - it("should have trailing LF as last character to do not brake terminal", function() { + it('should have trailing LF as last character to do not brake terminal', () => { const outputChars = output.split(''); - let lastChars = ""; + let lastChars = ''; lastChars = outputChars.pop() + lastChars; lastChars = outputChars.pop() + lastChars; - return assert.include(lastChars, "\n"); + return assert.include(lastChars, '\n'); }); - it("should have Request ended by trailling LF", function() { + it('should have Request ended by trailling LF', () => { const request = []; - for (let line of Array.from(output.split('\r\n'))) { + for (const line of Array.from(output.split('\r\n'))) { if (/^> /.test(line)) { request.push(line); } } @@ -102,13 +104,13 @@ describe('parser module', function() { return assert.equal(lastLine.split('').pop(), '\n'); }); - it("should have all parsed Request lines leaded by '> '", function() { - const request = parser.parse(trace)['request']; + it("should have all parsed Request lines leaded by '> '", () => { + const request = parser.parse(trace).request; let counter = 0; return (() => { const result = []; - for (let line of Array.from(request.split("\r\n"))) { + 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.`)); @@ -117,13 +119,13 @@ describe('parser module', function() { })(); }); - return it("should have all parsed Response lines leaded by '< '", function() { - const response = parser.parse(trace)['response']; + return it("should have all parsed Response lines leaded by '< '", () => { + const response = parser.parse(trace).response; let counter = 0; return (() => { const result = []; - for (let line of Array.from(response.split("\r\n"))) { + 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.`)); @@ -133,48 +135,48 @@ describe('parser module', function() { }); }); - describe("parseBackRequestAndResponseFromString(parsedString)", function() { + describe('parseBackRequestAndResponseFromString(parsedString)', () => { let parsedObject = {}; - let parsedString = ""; + let parsedString = ''; - before(function() { + before(() => { parsedObject = parser.parse(trace); parsedString = parser.parseToString(trace); return output = parser.parseBackRequestAndResponseFromString(parsedString); }); - it("has parseBackRequestAndResponseFromString() defined", () => assert.isFunction(parser.parseBackRequestAndResponseFromString)); + it('has parseBackRequestAndResponseFromString() defined', () => assert.isFunction(parser.parseBackRequestAndResponseFromString)); - it("should return object", () => assert.isObject(output)); + it('should return object', () => assert.isObject(output)); - return describe("returned object", function() { - it("has key request", () => assert.include(Object.keys(output), "request")); + return describe('returned object', () => { + it('has key request', () => assert.include(Object.keys(output), 'request')); - it("has key response", () => assert.include(Object.keys(output), "response")); + it('has key response', () => assert.include(Object.keys(output), 'response')); - describe("parsed request", function() { - let request = ""; - before(() => request = output['request']); + describe('parsed request', () => { + let request = ''; + before(() => request = output.request); - it("is a string", () => assert.isString(request)); + it('is a string', () => assert.isString(request)); - return it("is equal to raw genuine request", () => assert.equal(request, parsedObject['request'])); - }); + return it('is equal to raw genuine request', () => assert.equal(request, parsedObject.request)); + }); - return describe("parsed response", function() { - let response = ""; - before(() => response = output['response']); + return describe('parsed response', () => { + let response = ''; + before(() => response = output.response); - it("is a string", () => assert.isString(response)); + it('is a string', () => assert.isString(response)); - return it("is equal to raw genuine response", () => assert.equal(response, parsedObject['response'])); + return it('is equal to raw genuine response', () => assert.equal(response, parsedObject.response)); + }); }); }); -}); - return describe("parseBack(parsedString) ", function() { - it("is a function", () => assert.isFunction(parser.parseBack)); + return describe('parseBack(parsedString) ', () => { + it('is a function', () => assert.isFunction(parser.parseBack)); - return it("is an alias for parseBackRequestAndResponseFromString", () => assert.equal(parser.parseBack, parser.parseBackRequestAndResponseFromString)); + return it('is an alias for parseBackRequestAndResponseFromString', () => assert.equal(parser.parseBack, parser.parseBackRequestAndResponseFromString)); }); }); From e2d58bcbd3659086349d211552da7751e8f9361c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rouven=20We=C3=9Fling?= Date: Sun, 11 Feb 2018 09:59:00 -0800 Subject: [PATCH 4/7] Enable tests to work on JS files. --- scripts/bdd | 2 +- scripts/test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/bdd b/scripts/bdd index 3003d78..a107060 100755 --- a/scripts/bdd +++ b/scripts/bdd @@ -1,2 +1,2 @@ #!/bin/sh -./node_modules/mocha/bin/mocha -w --reporter spec --compilers=coffee:coffeescript/register ./test/**/*-test.coffee +./node_modules/mocha/bin/mocha -w --reporter spec ./test/**/*-test.js diff --git a/scripts/test b/scripts/test index 72ca538..7b61f70 100755 --- a/scripts/test +++ b/scripts/test @@ -1,2 +1,2 @@ #!/bin/sh -./node_modules/mocha/bin/mocha --reporter spec --compilers=coffee:coffeescript/register ./test/**/*-test.coffee +./node_modules/mocha/bin/mocha --reporter spec ./test/**/*-test.js From 8715d793eba6c93273a11b27f5c54c8b559d49cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rouven=20We=C3=9Fling?= Date: Sun, 11 Feb 2018 10:08:46 -0800 Subject: [PATCH 5/7] Handle all decaffeinate suggestions --- test/integration/cli-test.js | 35 +++++++-------- test/integration/js-api-test.js | 12 ++--- test/unit/parser-test.js | 78 ++++++++++++++------------------- 3 files changed, 51 insertions(+), 74 deletions(-) diff --git a/test/integration/cli-test.js b/test/integration/cli-test.js index f23bf1f..eb7d3d3 100644 --- a/test/integration/cli-test.js +++ b/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')); }); }); diff --git a/test/integration/js-api-test.js b/test/integration/js-api-test.js index 5d1c23a..6c43929 100644 --- a/test/integration/js-api-test.js +++ b/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(); }); }); }))); diff --git a/test/unit/parser-test.js b/test/unit/parser-test.js index 0003326..d2182ee 100644 --- a/test/unit/parser-test.js +++ b/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)); }); }); From 3f3e77d2b1f5b0ec0096c06a6b3d5add113a9732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rouven=20We=C3=9Fling?= Date: Sun, 11 Feb 2018 11:54:24 -0800 Subject: [PATCH 6/7] Fix lint errors found by eslint. Adds some missing assertions that eslint found. --- test/integration/cli-test.js | 16 ++++------------ test/integration/js-api-test.js | 10 +--------- test/unit/parser-test.js | 24 ++++++++---------------- 3 files changed, 13 insertions(+), 37 deletions(-) diff --git a/test/integration/cli-test.js b/test/integration/cli-test.js index eb7d3d3..42a413b 100644 --- a/test/integration/cli-test.js +++ b/test/integration/cli-test.js @@ -1,9 +1,3 @@ -/* eslint-disable - no-return-assign, - no-unused-vars, -*/ -// TODO: This file was created by bulk-decaffeinate. -// Fix any style issues and re-enable lint. const fs = require('fs'); const { assert } = require('chai'); const { exec } = require('child_process'); @@ -29,12 +23,12 @@ describe('Command line', () => { done(); }); - 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', () => {}); + it('should return with exit code 0', () => assert.equal(exitStatus, 0)); it('should return parsed body to standard output', (done) => { const expectedOutputPath = './test/fixtures/get/expected-output'; @@ -63,12 +57,12 @@ describe('Command line', () => { done(); }); - 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', () => {}); + it('should return with exit code 0', () => assert.equal(exitStatus, 0)); it('should return parsed body in API Blueprint format to standard output', (done) => { const expectedOutputPath = './test/fixtures/post/expected-output.md'; @@ -80,14 +74,12 @@ describe('Command line', () => { }); describe('no input on stdin and no options', () => { - let stdout = ''; let stderr = ''; let exitStatus = ''; before((done) => { const cmd = './bin/curl-trace-parser'; const cli = exec(cmdPrefix + cmd, (error, out, err) => { - stdout = out; stderr = err; if (error) { exitStatus = error.code; diff --git a/test/integration/js-api-test.js b/test/integration/js-api-test.js index 6c43929..71ee136 100644 --- a/test/integration/js-api-test.js +++ b/test/integration/js-api-test.js @@ -1,14 +1,6 @@ -/* eslint-disable - no-shadow, - no-unused-vars, -*/ -// TODO: This file was created by bulk-decaffeinate. -// Fix any style issues and re-enable lint. - const fs = require('fs'); const { assert } = require('chai'); -const { exec } = require('child_process'); const parser = require('../../lib/parser'); describe('Javascript API', () => @@ -20,7 +12,7 @@ describe('Javascript API', () => fs.readFile(traceFilePath, 'utf8', (err, trace) => { const parsed = parser.parseToString(trace); - fs.readFile(expectedOutputPath, 'utf8', (err, expected) => { + fs.readFile(expectedOutputPath, 'utf8', (error, expected) => { assert.equal(parsed, expected); done(); }); diff --git a/test/unit/parser-test.js b/test/unit/parser-test.js index d2182ee..3155ff2 100644 --- a/test/unit/parser-test.js +++ b/test/unit/parser-test.js @@ -1,10 +1,3 @@ -/* eslint-disable - no-return-assign, - prefer-destructuring, -*/ -// TODO: This file was created by bulk-decaffeinate. -// Fix any style issues and re-enable lint. - const fs = require('fs'); const { assert } = require('chai'); const parser = require('../../lib/parser'); @@ -23,7 +16,7 @@ describe('parser module', () => { it('has parse() defined', () => assert.isFunction(parser.parse)); describe('parse(string) return', () => { - before(() => output = parser.parse(trace)); + before(() => { output = parser.parse(trace); }); it('is obejct', () => assert.isObject(output)); @@ -34,7 +27,7 @@ describe('parser module', () => { describe('parsed request', () => { let request = ''; - before(() => request = output.request); + before(() => { ({ request } = output); }); it('contains multiple lines delimited by CRLF', () => { const lines = request.split('\r\n'); @@ -46,7 +39,6 @@ describe('parser module', () => { assert.include(request, agentString); }); - it('does not contain double LF at the end', () => { const outputChars = request.split(''); @@ -59,7 +51,7 @@ describe('parser module', () => { describe('parsed response', () => { let response = ''; - before(() => response = output.response); + before(() => { ({ response } = output); }); it('containt application/json', () => { const string = 'application/json'; @@ -77,7 +69,7 @@ describe('parser module', () => { it('has parseToString() defined', () => assert.isFunction(parser.parseToString)); describe('parseToString(traceString) return', () => { - before(() => output = parser.parseToString(trace)); + before(() => { output = parser.parseToString(trace); }); it('should have trailing LF as last character to do not brake terminal', () => { const outputChars = output.split(''); @@ -99,7 +91,7 @@ describe('parser module', () => { }); it("should have all parsed Request lines leaded by '> '", () => { - const request = parser.parse(trace).request; + const { request } = parser.parse(trace); let counter = 0; for (const line of request.split('\r\n')) { @@ -110,7 +102,7 @@ describe('parser module', () => { }); it("should have all parsed Response lines leaded by '< '", () => { - const response = parser.parse(trace).response; + const { response } = parser.parse(trace); let counter = 0; for (const line of response.split('\r\n')) { @@ -142,7 +134,7 @@ describe('parser module', () => { describe('parsed request', () => { let request = ''; - before(() => request = output.request); + before(() => { ({ request } = output); }); it('is a string', () => assert.isString(request)); @@ -151,7 +143,7 @@ describe('parser module', () => { describe('parsed response', () => { let response = ''; - before(() => response = output.response); + before(() => { ({ response } = output); }); it('is a string', () => assert.isString(response)); From 86a9e71a7714a1d3dcc4c7146ce00c7e18b18900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rouven=20We=C3=9Fling?= Date: Tue, 24 Apr 2018 15:52:52 +0200 Subject: [PATCH 7/7] Remove the dev dependency on coffeescript Closes #25 --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 4492a12..a8edf88 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,6 @@ }, "devDependencies": { "chai": "4.1.2", - "coffeescript": "1.12.7", "mocha": "5.0.4" }, "keywords": [