From d1187dde824b0fffd66d9614b1076bc10a1fd106 Mon Sep 17 00:00:00 2001 From: Sebastian McKenzie Date: Sun, 9 Nov 2014 18:21:42 +1100 Subject: [PATCH] fix up tests to work with the new code generator --- test/fixtures/bin/6to5/--blacklist/stdout.txt | 1 + test/fixtures/bin/6to5/--whitelist/stdout.txt | 2 +- .../out-files/lib/bar/bar.js | 7 ++----- .../out-files/lib/foo.js | 5 +++-- .../out-files/lib/bar/bar.js | 5 +---- .../out-files/lib/bar/bar.js.map | 2 +- .../dir --out-dir --source-maps/out-files/lib/foo.js | 3 ++- .../out-files/lib/foo.js.map | 2 +- .../bin/6to5/dir --out-dir/out-files/lib/bar/bar.js | 5 +---- .../bin/6to5/dir --out-dir/out-files/lib/foo.js | 3 ++- .../out-files/script2.js | 5 +++-- .../bin/6to5/filename --out-file/out-files/script2.js | 3 ++- .../out-files/script3.js | 11 +++++------ .../out-files/script3.js | 8 +++----- .../out-files/script3.js.map | 2 +- .../6to5/filenames --out-file/out-files/script3.js | 8 +++----- .../stdin --out-file --source-maps/out-files/test.js | 3 ++- .../out-files/test.js.map | 2 +- .../bin/6to5/stdin --out-file/out-files/script.js | 3 ++- .../bin/6to5/stdin --source-maps-inline/stdout.txt | 5 +++-- test/fixtures/bin/6to5/stdin/stdout.txt | 3 ++- .../transformation/let-scoping/deep-nested/exec.js | 3 --- 22 files changed, 42 insertions(+), 49 deletions(-) diff --git a/test/fixtures/bin/6to5/--blacklist/stdout.txt b/test/fixtures/bin/6to5/--blacklist/stdout.txt index 4f64e641b1..420f2b900e 100644 --- a/test/fixtures/bin/6to5/--blacklist/stdout.txt +++ b/test/fixtures/bin/6to5/--blacklist/stdout.txt @@ -1,2 +1,3 @@ "use strict"; + arr.map(x => x * MULTIPLIER); diff --git a/test/fixtures/bin/6to5/--whitelist/stdout.txt b/test/fixtures/bin/6to5/--whitelist/stdout.txt index bb8db60f68..4181a0bd94 100644 --- a/test/fixtures/bin/6to5/--whitelist/stdout.txt +++ b/test/fixtures/bin/6to5/--whitelist/stdout.txt @@ -1,4 +1,4 @@ let MULTIPLER = 5; -arr.map(function(x) { +arr.map(function (x) { return x * MULTIPLIER; }); diff --git a/test/fixtures/bin/6to5/dir --out-dir --source-maps-inline/out-files/lib/bar/bar.js b/test/fixtures/bin/6to5/dir --out-dir --source-maps-inline/out-files/lib/bar/bar.js index 19335839e3..9a3f332ee4 100644 --- a/test/fixtures/bin/6to5/dir --out-dir --source-maps-inline/out-files/lib/bar/bar.js +++ b/test/fixtures/bin/6to5/dir --out-dir --source-maps-inline/out-files/lib/bar/bar.js @@ -1,7 +1,4 @@ "use strict"; -var Test = function() { - var Test = function Test() {}; - return Test; -}(); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3JjL2Jhci9iYXIuanMiLCJzb3VyY2VzIjpbInNyYy9iYXIvYmFyLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0lBQU0sQ0FBQyxDQUFDLENBQUM7TUFBSCxDQUFDLENBQUMsQ0FBQyxhQUFILENBQUMsQ0FBQyxDQUFDO1NBQUgsQ0FBQyxDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJjbGFzcyBUZXN0IHtcblxufSJdfQ== +var Test = function Test() {}; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNyYy9iYXIvYmFyLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0lBQU0sSUFBSSxZQUFKLElBQUkiLCJmaWxlIjoic3JjL2Jhci9iYXIuanMiLCJzb3VyY2VzQ29udGVudCI6WyJjbGFzcyBUZXN0IHtcblxufSJdfQ== diff --git a/test/fixtures/bin/6to5/dir --out-dir --source-maps-inline/out-files/lib/foo.js b/test/fixtures/bin/6to5/dir --out-dir --source-maps-inline/out-files/lib/foo.js index 189b9f0309..86d5ad9c4c 100644 --- a/test/fixtures/bin/6to5/dir --out-dir --source-maps-inline/out-files/lib/foo.js +++ b/test/fixtures/bin/6to5/dir --out-dir --source-maps-inline/out-files/lib/foo.js @@ -1,5 +1,6 @@ "use strict"; -arr.map(function(x) { + +arr.map(function (x) { return x * MULTIPLIER; }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3JjL2Zvby5qcyIsInNvdXJjZXMiOlsic3JjL2Zvby5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxVQUFDO1NBQUssRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0NBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImFyci5tYXAoeCA9PiB4ICogTVVMVElQTElFUik7Il19 +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNyYy9mb28uanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxHQUFHLENBQUMsR0FBRyxDQUFDLFVBQUEsQ0FBQztTQUFJLENBQUMsR0FBRyxVQUFVO0NBQUEsQ0FBQyxDQUFDIiwiZmlsZSI6InNyYy9mb28uanMiLCJzb3VyY2VzQ29udGVudCI6WyJhcnIubWFwKHggPT4geCAqIE1VTFRJUExJRVIpOyJdfQ== diff --git a/test/fixtures/bin/6to5/dir --out-dir --source-maps/out-files/lib/bar/bar.js b/test/fixtures/bin/6to5/dir --out-dir --source-maps/out-files/lib/bar/bar.js index 3730bcb807..5f98760f68 100644 --- a/test/fixtures/bin/6to5/dir --out-dir --source-maps/out-files/lib/bar/bar.js +++ b/test/fixtures/bin/6to5/dir --out-dir --source-maps/out-files/lib/bar/bar.js @@ -1,6 +1,3 @@ "use strict"; -var Test = function() { - var Test = function Test() {}; - return Test; -}(); +var Test = function Test() {}; diff --git a/test/fixtures/bin/6to5/dir --out-dir --source-maps/out-files/lib/bar/bar.js.map b/test/fixtures/bin/6to5/dir --out-dir --source-maps/out-files/lib/bar/bar.js.map index c014dcbac1..84d0aa2ac1 100644 --- a/test/fixtures/bin/6to5/dir --out-dir --source-maps/out-files/lib/bar/bar.js.map +++ b/test/fixtures/bin/6to5/dir --out-dir --source-maps/out-files/lib/bar/bar.js.map @@ -1 +1 @@ -{"version":3,"file":"src/bar/bar.js","sources":["src/bar/bar.js"],"names":[],"mappings":";;IAAM,CAAC,CAAC,CAAC;MAAH,CAAC,CAAC,CAAC,aAAH,CAAC,CAAC,CAAC;SAAH,CAAC,CAAC,CAAC","sourcesContent":["class Test {\n\n}"]} +{"version":3,"sources":["src/bar/bar.js"],"names":[],"mappings":";;IAAM,IAAI,YAAJ,IAAI","file":"src/bar/bar.js","sourcesContent":["class Test {\n\n}"]} diff --git a/test/fixtures/bin/6to5/dir --out-dir --source-maps/out-files/lib/foo.js b/test/fixtures/bin/6to5/dir --out-dir --source-maps/out-files/lib/foo.js index 1c04e0dad5..ae4557e57b 100644 --- a/test/fixtures/bin/6to5/dir --out-dir --source-maps/out-files/lib/foo.js +++ b/test/fixtures/bin/6to5/dir --out-dir --source-maps/out-files/lib/foo.js @@ -1,4 +1,5 @@ "use strict"; -arr.map(function(x) { + +arr.map(function (x) { return x * MULTIPLIER; }); diff --git a/test/fixtures/bin/6to5/dir --out-dir --source-maps/out-files/lib/foo.js.map b/test/fixtures/bin/6to5/dir --out-dir --source-maps/out-files/lib/foo.js.map index fdea7f96d5..89de3bd5e5 100644 --- a/test/fixtures/bin/6to5/dir --out-dir --source-maps/out-files/lib/foo.js.map +++ b/test/fixtures/bin/6to5/dir --out-dir --source-maps/out-files/lib/foo.js.map @@ -1 +1 @@ -{"version":3,"file":"src/foo.js","sources":["src/foo.js"],"names":[],"mappings":";AAAA,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAC;SAAK,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAAC,CAAC","sourcesContent":["arr.map(x => x * MULTIPLIER);"]} +{"version":3,"sources":["src/foo.js"],"names":[],"mappings":";;AAAA,GAAG,CAAC,GAAG,CAAC,UAAA,CAAC;SAAI,CAAC,GAAG,UAAU;CAAA,CAAC,CAAC","file":"src/foo.js","sourcesContent":["arr.map(x => x * MULTIPLIER);"]} diff --git a/test/fixtures/bin/6to5/dir --out-dir/out-files/lib/bar/bar.js b/test/fixtures/bin/6to5/dir --out-dir/out-files/lib/bar/bar.js index 3730bcb807..5f98760f68 100644 --- a/test/fixtures/bin/6to5/dir --out-dir/out-files/lib/bar/bar.js +++ b/test/fixtures/bin/6to5/dir --out-dir/out-files/lib/bar/bar.js @@ -1,6 +1,3 @@ "use strict"; -var Test = function() { - var Test = function Test() {}; - return Test; -}(); +var Test = function Test() {}; diff --git a/test/fixtures/bin/6to5/dir --out-dir/out-files/lib/foo.js b/test/fixtures/bin/6to5/dir --out-dir/out-files/lib/foo.js index 1c04e0dad5..ae4557e57b 100644 --- a/test/fixtures/bin/6to5/dir --out-dir/out-files/lib/foo.js +++ b/test/fixtures/bin/6to5/dir --out-dir/out-files/lib/foo.js @@ -1,4 +1,5 @@ "use strict"; -arr.map(function(x) { + +arr.map(function (x) { return x * MULTIPLIER; }); diff --git a/test/fixtures/bin/6to5/filename --out-file --source-maps-inline/out-files/script2.js b/test/fixtures/bin/6to5/filename --out-file --source-maps-inline/out-files/script2.js index e89e3b4250..31da0b4f1a 100644 --- a/test/fixtures/bin/6to5/filename --out-file --source-maps-inline/out-files/script2.js +++ b/test/fixtures/bin/6to5/filename --out-file --source-maps-inline/out-files/script2.js @@ -1,6 +1,7 @@ "use strict"; -arr.map(function(x) { + +arr.map(function (x) { return x * MULTIPLIER; }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNjcmlwdC5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxVQUFDO1NBQUssRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0NBQUMsQ0FBQyIsImZpbGUiOiJzY3JpcHQyLmpzIiwic291cmNlc0NvbnRlbnQiOlsiYXJyLm1hcCh4ID0+IHggKiBNVUxUSVBMSUVSKTsiXX0= +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNjcmlwdC5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLEdBQUcsQ0FBQyxHQUFHLENBQUMsVUFBQSxDQUFDO1NBQUksQ0FBQyxHQUFHLFVBQVU7Q0FBQSxDQUFDLENBQUMiLCJmaWxlIjoic2NyaXB0Mi5qcyIsInNvdXJjZXNDb250ZW50IjpbImFyci5tYXAoeCA9PiB4ICogTVVMVElQTElFUik7Il19 diff --git a/test/fixtures/bin/6to5/filename --out-file/out-files/script2.js b/test/fixtures/bin/6to5/filename --out-file/out-files/script2.js index 1c04e0dad5..ae4557e57b 100644 --- a/test/fixtures/bin/6to5/filename --out-file/out-files/script2.js +++ b/test/fixtures/bin/6to5/filename --out-file/out-files/script2.js @@ -1,4 +1,5 @@ "use strict"; -arr.map(function(x) { + +arr.map(function (x) { return x * MULTIPLIER; }); 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 fa822fea2f..6523ba9228 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 @@ -1,12 +1,11 @@ "use strict"; -var Test = function() { - var Test = function Test() {}; - return Test; -}(); +var Test = function Test() {}; "use strict"; -arr.map(function(x) { + +arr.map(function (x) { return x * MULTIPLIER; }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNjcmlwdC5qcyIsInNjcmlwdDIuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7SUFBTSxDQUFDLENBQUMsQ0FBQztNQUFILENBQUMsQ0FBQyxDQUFDLGFBQUgsQ0FBQyxDQUFDLENBQUM7U0FBSCxDQUFDLENBQUMsQ0FBQzs7OztBQ0FULENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsVUFBQztTQUFLLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztDQUFDLENBQUMiLCJmaWxlIjoic2NyaXB0My5qcyIsInNvdXJjZXNDb250ZW50IjpbImNsYXNzIFRlc3Qge1xuXG59IiwiYXJyLm1hcCh4ID0+IHggKiBNVUxUSVBMSUVSKTsiXX0= +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNjcmlwdC5qcyIsInNjcmlwdDIuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7SUFBTSxJQUFJLFlBQUosSUFBSTs7OztBQ0FWLEdBQUcsQ0FBQyxHQUFHLENBQUMsVUFBQSxDQUFDO1NBQUksQ0FBQyxHQUFHLFVBQVU7Q0FBQSxDQUFDLENBQUMiLCJmaWxlIjoic2NyaXB0My5qcyIsInNvdXJjZXNDb250ZW50IjpbImNsYXNzIFRlc3Qge1xuXG59IiwiYXJyLm1hcCh4ID0+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 5f155d69d2..7421f83f81 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 @@ -1,10 +1,8 @@ "use strict"; -var Test = function() { - var Test = function Test() {}; - return Test; -}(); +var Test = function Test() {}; "use strict"; -arr.map(function(x) { + +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 b8d9064a8e..70c2329b98 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,IAAI,YAAJ,IAAI;;;;ACAV,GAAG,CAAC,GAAG,CAAC,UAAA,CAAC;SAAI,CAAC,GAAG,UAAU;CAAA,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 5f155d69d2..7421f83f81 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 @@ -1,10 +1,8 @@ "use strict"; -var Test = function() { - var Test = function Test() {}; - return Test; -}(); +var Test = function Test() {}; "use strict"; -arr.map(function(x) { + +arr.map(function (x) { return x * MULTIPLIER; }); diff --git a/test/fixtures/bin/6to5/stdin --out-file --source-maps/out-files/test.js b/test/fixtures/bin/6to5/stdin --out-file --source-maps/out-files/test.js index 471925e927..e136af8d90 100644 --- a/test/fixtures/bin/6to5/stdin --out-file --source-maps/out-files/test.js +++ b/test/fixtures/bin/6to5/stdin --out-file --source-maps/out-files/test.js @@ -1,4 +1,5 @@ "use strict"; -arr.map(function(x) { + +arr.map(function (x) { return x * x; }); diff --git a/test/fixtures/bin/6to5/stdin --out-file --source-maps/out-files/test.js.map b/test/fixtures/bin/6to5/stdin --out-file --source-maps/out-files/test.js.map index 81c63f2629..78347b03c3 100644 --- a/test/fixtures/bin/6to5/stdin --out-file --source-maps/out-files/test.js.map +++ b/test/fixtures/bin/6to5/stdin --out-file --source-maps/out-files/test.js.map @@ -1 +1 @@ -{"version":3,"sources":["stdin"],"names":[],"mappings":";AAAA,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAC;SAAK,EAAE,EAAE;CAAC,CAAC","file":"test.js","sourcesContent":["arr.map(x => x * x);"]} +{"version":3,"sources":["stdin"],"names":[],"mappings":";;AAAA,GAAG,CAAC,GAAG,CAAC,UAAA,CAAC;SAAI,CAAC,GAAG,CAAC;CAAA,CAAC,CAAC","file":"test.js","sourcesContent":["arr.map(x => x * x);"]} diff --git a/test/fixtures/bin/6to5/stdin --out-file/out-files/script.js b/test/fixtures/bin/6to5/stdin --out-file/out-files/script.js index 1c04e0dad5..ae4557e57b 100644 --- a/test/fixtures/bin/6to5/stdin --out-file/out-files/script.js +++ b/test/fixtures/bin/6to5/stdin --out-file/out-files/script.js @@ -1,4 +1,5 @@ "use strict"; -arr.map(function(x) { + +arr.map(function (x) { return x * MULTIPLIER; }); diff --git a/test/fixtures/bin/6to5/stdin --source-maps-inline/stdout.txt b/test/fixtures/bin/6to5/stdin --source-maps-inline/stdout.txt index bbb43402ff..b21594bbfc 100644 --- a/test/fixtures/bin/6to5/stdin --source-maps-inline/stdout.txt +++ b/test/fixtures/bin/6to5/stdin --source-maps-inline/stdout.txt @@ -1,6 +1,7 @@ "use strict"; -arr.map(function(x) { + +arr.map(function (x) { return x * x; }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInN0ZGluIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLFVBQUM7U0FBSyxFQUFFLEVBQUU7Q0FBQyxDQUFDIiwiZmlsZSI6InN0ZG91dCIsInNvdXJjZXNDb250ZW50IjpbImFyci5tYXAoeCA9PiB4ICogeCk7Il19 +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInN0ZGluIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsR0FBRyxDQUFDLEdBQUcsQ0FBQyxVQUFBLENBQUM7U0FBSSxDQUFDLEdBQUcsQ0FBQztDQUFBLENBQUMsQ0FBQyIsImZpbGUiOiJzdGRvdXQiLCJzb3VyY2VzQ29udGVudCI6WyJhcnIubWFwKHggPT4geCAqIHgpOyJdfQ== diff --git a/test/fixtures/bin/6to5/stdin/stdout.txt b/test/fixtures/bin/6to5/stdin/stdout.txt index 1c04e0dad5..ae4557e57b 100644 --- a/test/fixtures/bin/6to5/stdin/stdout.txt +++ b/test/fixtures/bin/6to5/stdin/stdout.txt @@ -1,4 +1,5 @@ "use strict"; -arr.map(function(x) { + +arr.map(function (x) { return x * MULTIPLIER; }); diff --git a/test/fixtures/transformation/let-scoping/deep-nested/exec.js b/test/fixtures/transformation/let-scoping/deep-nested/exec.js index 208aaf8c1e..6880f64525 100644 --- a/test/fixtures/transformation/let-scoping/deep-nested/exec.js +++ b/test/fixtures/transformation/let-scoping/deep-nested/exec.js @@ -6,7 +6,4 @@ var a = 'var a'; let d = 'let d'; assert.equal(d, 'let d'); } - assert.throws(function () { - d; - }, /d is not defined/); }