From 6332e725fe6f54dc9a3fdc2b4cecf428f9ce5506 Mon Sep 17 00:00:00 2001 From: Sebastian McKenzie Date: Mon, 3 Nov 2014 12:34:00 +1100 Subject: [PATCH] update bin tests to match updated use strict behaviour --- test/bin.js | 7 ++++--- .../out-files/script3.js | 3 ++- .../out-files/script3.js | 1 + .../out-files/script3.js.map | 2 +- .../bin/6to5/filenames --out-file/out-files/script3.js | 1 + 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/test/bin.js b/test/bin.js index 3183d3c6ef..ab88957b33 100644 --- a/test/bin.js +++ b/test/bin.js @@ -4,6 +4,7 @@ var rimraf = require("rimraf"); var mkdirp = require("mkdirp"); var child = require("child_process"); var path = require("path"); +var chai = require("chai"); var fs = require("fs"); var _ = require("lodash"); @@ -42,7 +43,7 @@ var assertTest = function (stdout, stderr, opts) { if (opts.stderrContains) { assert.ok(_.contains(stderr, expectStderr), "stderr " + JSON.stringify(stderr) + " didn't contain " + JSON.stringify(expectStderr)); } else { - assert.equal(stderr, expectStderr, "stderr didn't match"); + chai.expect(stderr).to.equal(expectStderr, "stderr didn't match"); } } else if (stderr) { throw new Error("stderr: " + JSON.stringify(stderr)); @@ -55,7 +56,7 @@ var assertTest = function (stdout, stderr, opts) { if (opts.stdoutContains) { assert.ok(_.contains(stdout, expectStdout), "stdout " + JSON.stringify(stdout) + " didn't contain " + JSON.stringify(expectStdout)); } else { - assert.equal(stdout, expectStdout, "stdout didn't match"); + chai.expect(stdout).to.equal(expectStdout, "stdout didn't match"); } } else if (stdout) { throw new Error("stdout: " + JSON.stringify(stdout)); @@ -63,7 +64,7 @@ var assertTest = function (stdout, stderr, opts) { _.each(opts.outFiles, function (expect, filename) { var actual = readFile(filename); - assert.equal(actual, expect, "out-file " + filename); + chai.expect(actual).to.equal(expect, "out-file " + filename); }); }; diff --git a/test/fixtures/bin/6to5/filenames --out-file --source-maps-inline/out-files/script3.js b/test/fixtures/bin/6to5/filenames --out-file --source-maps-inline/out-files/script3.js index 6e0fa4b40a..fa822fea2f 100644 --- a/test/fixtures/bin/6to5/filenames --out-file --source-maps-inline/out-files/script3.js +++ b/test/fixtures/bin/6to5/filenames --out-file --source-maps-inline/out-files/script3.js @@ -4,8 +4,9 @@ var Test = function() { var Test = function Test() {}; return Test; }(); +"use strict"; arr.map(function(x) { return x * MULTIPLIER; }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNjcmlwdC5qcyIsInNjcmlwdDIuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7SUFBTSxDQUFDLENBQUMsQ0FBQztNQUFILENBQUMsQ0FBQyxDQUFDLGFBQUgsQ0FBQyxDQUFDLENBQUM7U0FBSCxDQUFDLENBQUMsQ0FBQzs7O0FDQVQsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxVQUFDO1NBQUssRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0NBQUMsQ0FBQyIsImZpbGUiOiJzY3JpcHQzLmpzIiwic291cmNlc0NvbnRlbnQiOlsiY2xhc3MgVGVzdCB7XG5cbn0iLCJhcnIubWFwKHggPT4geCAqIE1VTFRJUExJRVIpOyJdfQ== +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNjcmlwdC5qcyIsInNjcmlwdDIuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7SUFBTSxDQUFDLENBQUMsQ0FBQztNQUFILENBQUMsQ0FBQyxDQUFDLGFBQUgsQ0FBQyxDQUFDLENBQUM7U0FBSCxDQUFDLENBQUMsQ0FBQzs7OztBQ0FULENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsVUFBQztTQUFLLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztDQUFDLENBQUMiLCJmaWxlIjoic2NyaXB0My5qcyIsInNvdXJjZXNDb250ZW50IjpbImNsYXNzIFRlc3Qge1xuXG59IiwiYXJyLm1hcCh4ID0+IHggKiBNVUxUSVBMSUVSKTsiXX0= diff --git a/test/fixtures/bin/6to5/filenames --out-file --source-maps/out-files/script3.js b/test/fixtures/bin/6to5/filenames --out-file --source-maps/out-files/script3.js index 9504a5acfb..5f155d69d2 100644 --- a/test/fixtures/bin/6to5/filenames --out-file --source-maps/out-files/script3.js +++ b/test/fixtures/bin/6to5/filenames --out-file --source-maps/out-files/script3.js @@ -4,6 +4,7 @@ var Test = function() { var Test = function Test() {}; return Test; }(); +"use strict"; arr.map(function(x) { return x * MULTIPLIER; }); diff --git a/test/fixtures/bin/6to5/filenames --out-file --source-maps/out-files/script3.js.map b/test/fixtures/bin/6to5/filenames --out-file --source-maps/out-files/script3.js.map index cd028d5e0f..b8d9064a8e 100644 --- a/test/fixtures/bin/6to5/filenames --out-file --source-maps/out-files/script3.js.map +++ b/test/fixtures/bin/6to5/filenames --out-file --source-maps/out-files/script3.js.map @@ -1 +1 @@ -{"version":3,"sources":["script.js","script2.js"],"names":[],"mappings":";;IAAM,CAAC,CAAC,CAAC;MAAH,CAAC,CAAC,CAAC,aAAH,CAAC,CAAC,CAAC;SAAH,CAAC,CAAC,CAAC;;;ACAT,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAC;SAAK,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAAC,CAAC","file":"script3.js","sourcesContent":["class Test {\n\n}","arr.map(x => x * MULTIPLIER);"]} +{"version":3,"sources":["script.js","script2.js"],"names":[],"mappings":";;IAAM,CAAC,CAAC,CAAC;MAAH,CAAC,CAAC,CAAC,aAAH,CAAC,CAAC,CAAC;SAAH,CAAC,CAAC,CAAC;;;;ACAT,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAC;SAAK,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAAC,CAAC","file":"script3.js","sourcesContent":["class Test {\n\n}","arr.map(x => x * MULTIPLIER);"]} diff --git a/test/fixtures/bin/6to5/filenames --out-file/out-files/script3.js b/test/fixtures/bin/6to5/filenames --out-file/out-files/script3.js index 9504a5acfb..5f155d69d2 100644 --- a/test/fixtures/bin/6to5/filenames --out-file/out-files/script3.js +++ b/test/fixtures/bin/6to5/filenames --out-file/out-files/script3.js @@ -4,6 +4,7 @@ var Test = function() { var Test = function Test() {}; return Test; }(); +"use strict"; arr.map(function(x) { return x * MULTIPLIER; });