From fc59f1ff469a556966d09c1912b14c7ab5cf8a65 Mon Sep 17 00:00:00 2001 From: Sebastian McKenzie Date: Tue, 6 Jan 2015 12:16:34 +1100 Subject: [PATCH] add closure around let scoping return tests --- .../for-break-continue-return/actual.js | 20 ++++---- .../for-break-continue-return/expected.js | 48 ++++++++++--------- .../for-return-undefined/actual.js | 10 ++-- .../for-return-undefined/expected.js | 24 +++++----- .../es6-let-scoping/for-return/actual.js | 10 ++-- .../es6-let-scoping/for-return/expected.js | 24 +++++----- 6 files changed, 74 insertions(+), 62 deletions(-) diff --git a/test/fixtures/transformation/es6-let-scoping/for-break-continue-return/actual.js b/test/fixtures/transformation/es6-let-scoping/for-break-continue-return/actual.js index 387d702154..cb38abee39 100644 --- a/test/fixtures/transformation/es6-let-scoping/for-break-continue-return/actual.js +++ b/test/fixtures/transformation/es6-let-scoping/for-break-continue-return/actual.js @@ -1,10 +1,12 @@ -for (let i in nums) { - fns.push(function () { return i; }); - if (i === 1) { - continue; - } else if (i === 2) { - break; - } else if (i === 3) { - return i; +(function () { + for (let i in nums) { + fns.push(function () { return i; }); + if (i === 1) { + continue; + } else if (i === 2) { + break; + } else if (i === 3) { + return i; + } } -} +})(); diff --git a/test/fixtures/transformation/es6-let-scoping/for-break-continue-return/expected.js b/test/fixtures/transformation/es6-let-scoping/for-break-continue-return/expected.js index ff74908db9..29f844e7d1 100644 --- a/test/fixtures/transformation/es6-let-scoping/for-break-continue-return/expected.js +++ b/test/fixtures/transformation/es6-let-scoping/for-break-continue-return/expected.js @@ -1,27 +1,29 @@ "use strict"; -_loop: for (var i in nums) { - var _ret = (function (i) { - fns.push(function () { - return i; - }); - if (i === 1) { - return "continue"; - } else if (i === 2) { - return "break"; - } else if (i === 3) { - return { - v: i - }; - } - })(i); +(function () { + _loop: for (var i in nums) { + var _ret = (function (i) { + fns.push(function () { + return i; + }); + if (i === 1) { + return "continue"; + } else if (i === 2) { + return "break"; + } else if (i === 3) { + return { + v: i + }; + } + })(i); - switch (_ret) { - case "break": - break _loop; - case "continue": - continue _loop; - default: - if (typeof _ret === "object") return _ret.v; + switch (_ret) { + case "break": + break _loop; + case "continue": + continue _loop; + default: + if (typeof _ret === "object") return _ret.v; + } } -} +})(); diff --git a/test/fixtures/transformation/es6-let-scoping/for-return-undefined/actual.js b/test/fixtures/transformation/es6-let-scoping/for-return-undefined/actual.js index b7613b4f31..526485919b 100644 --- a/test/fixtures/transformation/es6-let-scoping/for-return-undefined/actual.js +++ b/test/fixtures/transformation/es6-let-scoping/for-return-undefined/actual.js @@ -1,4 +1,6 @@ -for (let i in nums) { - fns.push(function () { return i; }); - return; -} +(function () { + for (let i in nums) { + fns.push(function () { return i; }); + return; + } +})(); diff --git a/test/fixtures/transformation/es6-let-scoping/for-return-undefined/expected.js b/test/fixtures/transformation/es6-let-scoping/for-return-undefined/expected.js index 4937ff43c2..6fb72fe444 100644 --- a/test/fixtures/transformation/es6-let-scoping/for-return-undefined/expected.js +++ b/test/fixtures/transformation/es6-let-scoping/for-return-undefined/expected.js @@ -1,14 +1,16 @@ "use strict"; -for (var i in nums) { - var _ret = (function (i) { - fns.push(function () { - return i; - }); - return { - v: undefined - }; - })(i); +(function () { + for (var i in nums) { + var _ret = (function (i) { + fns.push(function () { + return i; + }); + return { + v: undefined + }; + })(i); - if (typeof _ret === "object") return _ret.v; -} + if (typeof _ret === "object") return _ret.v; + } +})(); diff --git a/test/fixtures/transformation/es6-let-scoping/for-return/actual.js b/test/fixtures/transformation/es6-let-scoping/for-return/actual.js index 8c636baaca..339cdd507f 100644 --- a/test/fixtures/transformation/es6-let-scoping/for-return/actual.js +++ b/test/fixtures/transformation/es6-let-scoping/for-return/actual.js @@ -1,4 +1,6 @@ -for (let i in nums) { - fns.push(function () { return i; }); - return i; -} +(function () { + for (let i in nums) { + fns.push(function () { return i; }); + return i; + } +})(); diff --git a/test/fixtures/transformation/es6-let-scoping/for-return/expected.js b/test/fixtures/transformation/es6-let-scoping/for-return/expected.js index d26f70a201..fa088e1c12 100644 --- a/test/fixtures/transformation/es6-let-scoping/for-return/expected.js +++ b/test/fixtures/transformation/es6-let-scoping/for-return/expected.js @@ -1,14 +1,16 @@ "use strict"; -for (var i in nums) { - var _ret = (function (i) { - fns.push(function () { - return i; - }); - return { - v: i - }; - })(i); +(function () { + for (var i in nums) { + var _ret = (function (i) { + fns.push(function () { + return i; + }); + return { + v: i + }; + })(i); - if (typeof _ret === "object") return _ret.v; -} + if (typeof _ret === "object") return _ret.v; + } +})();