Added fix for node 0.11.x tests

jhnns · jhnns · commit 4551fd830d5e · 2014-05-20T13:21:01.000+02:00
diff --git a/lib/getImportGlobalsSrc.js b/lib/getImportGlobalsSrc.js
@@ -14,15 +14,17 @@ function getImportGlobalsSrc(ignore) {
         globalObj = typeof global === "undefined"? window: global;
 
     ignore = ignore || [];
+    // global itself can't be overridden because it's the only reference to our real global objects
+    ignore.push("global");
 
-    for (key in globalObj) {
-        if (key !== "global" && ignore.indexOf(key) === -1) {   // we don't use hasOwnProperty here because in some browsers not all global objects will be enumerated
-            value = globalObj[key];
-            src += "var " + key + " = global." + key + "; ";
+    for (key in globalObj) { /* jshint forin: false */
+        if (ignore.indexOf(key) !== -1) {
+            continue;
         }
+        value = globalObj[key];
+        src += "var " + key + " = global." + key + "; ";
     }
 
-
     return src;
 }
 
diff --git a/test/getImportGlobalsSrc.test.js b/test/getImportGlobalsSrc.test.js
@@ -13,7 +13,12 @@ describe("getImportGlobalsSrc", function () {
 
         src = getImportGlobalsSrc();
         vm.runInNewContext(src, context);
-        actualGlobals = Object.keys(context);
+        actualGlobals = Object.keys(context).filter(function (key) {
+            // node v0.10 does not set a constructor property on the context
+            // node v0.11 does set a constructor property
+            // so just lets filter it, because it doesn't make sense to mock it anyway
+            return key !== "constructor";
+        });
         actualGlobals.sort();
         expectedGlobals.sort();
         expect(actualGlobals).to.eql(expectedGlobals);
@@ -28,12 +33,18 @@ describe("getImportGlobalsSrc", function () {
             actualGlobals,
             expectedGlobals = Object.keys(global);
 
-        src = getImportGlobalsSrc(ignore);
+        // getImportGlobalsSrc modifies the ignore array, so let's create a copy
+        src = getImportGlobalsSrc(ignore.slice(0));
         expectedGlobals = expectedGlobals.filter(function filterIgnoredVars(value) {
             return ignore.indexOf(value) === -1;
         });
         vm.runInNewContext(src, context);
-        actualGlobals = Object.keys(context);
+        actualGlobals = Object.keys(context).filter(function (key) {
+            // node v0.10 does not set a constructor property on the context
+            // node v0.11 does set a constructor property
+            // so just lets filter it, because it doesn't make sense to mock it anyway
+            return key !== "constructor";
+        });
         actualGlobals.sort();
         expectedGlobals.sort();
         expect(actualGlobals).to.eql(expectedGlobals);

Original file line number	Diff line number	Diff line change
`@@ -14,15 +14,17 @@ function getImportGlobalsSrc(ignore) {`
`14`	`14`	`globalObj = typeof global === "undefined"? window: global;`
`15`	`15`
`16`	`16`	`ignore = ignore \|\| [];`
	`17`	`+ // global itself can't be overridden because it's the only reference to our real global objects`
	`18`	`+ ignore.push("global");`
`17`	`19`
`18`		`- for (key in globalObj) {`
`19`		`- if (key !== "global" && ignore.indexOf(key) === -1) { // we don't use hasOwnProperty here because in some browsers not all global objects will be enumerated`
`20`		`- value = globalObj[key];`
`21`		`- src += "var " + key + " = global." + key + "; ";`
	`20`	`+ for (key in globalObj) { /* jshint forin: false */`
	`21`	`+ if (ignore.indexOf(key) !== -1) {`
	`22`	`+ continue;`
`22`	`23`	`}`
	`24`	`+ value = globalObj[key];`
	`25`	`+ src += "var " + key + " = global." + key + "; ";`
`23`	`26`	`}`
`24`	`27`
`25`		`-`
`26`	`28`	`return src;`
`27`	`29`	`}`
`28`	`30`