Merge 460dfd1 into 6ffd4d1

lib/moduleEnv.js

@@ -42,7 +42,7 @@ var moduleWrapper0 = Module.wrapper[0],
     // However, since most projects have a seperate linting step which catches these const re-assignment
     // errors anyway, it's probably still a reasonable trade-off.
     // Test the regular expresssion at https://regex101.com/r/dvnZPv/2 and also check out testLib/constModule.js.
-    matchConst = /(^|\s|\}|;)const(\/\*|\s)/gm,
+    matchConst = /(^|\s|\}|;)const(\/\*|\s|{)/gm,
     nodeRequire,
     currentModule;
 

testLib/constModule.js

@@ -9,6 +9,7 @@ const
 g = "g";
 const/*wtf this is valid*/h = "h";
 const /*and this is also*/i = "i";
+const{k} = {k: "k"};
 
 exports.a = function () {
     return a;
@@ -40,3 +41,6 @@ exports.i = function () {
 exports.j = function () {
     return j;
 };
+exports.k = function () {
+    return k;
+};

testLib/sharedTestCases.js

@@ -388,10 +388,13 @@ module.exports = function () {
 
     it("should be possible to set a const variable", function () {
         var constModule = rewire("./constModule");
+        var varNames = Object.keys(constModule);
 
-        "abcdefghij".split("").forEach(letter => {
-            constModule.__set__(letter, "this has been changed"); // should not throw
-            expect(constModule[letter]()).to.equal("this has been changed");
+        expect(varNames.length).to.be.greaterThan(0);
+
+        varNames.forEach(varName => {
+            constModule.__set__(varName, "this has been changed"); // should not throw
+            expect(constModule[varName]()).to.equal("this has been changed");
         });
     });