changed injection behaviour

jhnns · jhnns · commit d4eea33555f4 · 2012-06-03T21:01:29.000+02:00
diff --git a/lib/getInjectionSrc.js b/lib/getInjectionSrc.js
@@ -0,0 +1,28 @@
+"use strict"; // run code in ES5 strict mode
+
+var toSrc = require("toSrc");
+
+function getMonkeyPatchSrc(obj) {
+    function walkObj(obj, level) {
+        var key,
+            value,
+            src = "";
+
+        for (key in obj) {
+            if (obj.hasOwnProperty(key)) {
+                value = obj[key];
+                if (level === 0) {
+                    src += "var ";   // on the top level, we need a var statement to override variables
+                }
+                src += key + "=" + toSrc(value, 9999) + ";";
+            }
+        }
+
+
+        return src;
+    }
+
+    return walkObj(obj, 0);
+}
+
+module.exports = getMonkeyPatchSrc;
diff --git a/lib/getMonkeyPatchSrc.js b/lib/getMonkeyPatchSrc.js
diff --git a/lib/trick.js b/lib/trick.js
@@ -4,7 +4,7 @@ var Module = require("module"),
     nodeWrapper0 = Module.wrapper[0], // caching original wrapper
     nodeWrapper1 = Module.wrapper[1],
     getLeakingSrc = require("./getLeakingSrc.js"),
-    getMonkeyPatchSrc = require("./getMonkeyPatchSrc.js");
+    getInjectionSrc = require("./getInjectionSrc.js");
 
 function restoreOriginalWrappers() {
     Module.wrapper[0] = nodeWrapper0;
@@ -37,7 +37,7 @@ function trick(parentModule, filename, mocks, injections, leaks, cache) {
 
     // Prepare module for injection
     if (typeof injections === "object") {
-        Module.wrapper[0] = nodeWrapper0 + getMonkeyPatchSrc(injections);
+        Module.wrapper[0] = nodeWrapper0 + getInjectionSrc(injections);
     } else if (typeof injections === "string") {
         Module.wrapper[0] = nodeWrapper0 + injections;
     }
diff --git a/test/getInjectionSrc.test.js b/test/getInjectionSrc.test.js
@@ -0,0 +1,24 @@
+"use strict"; // run code in ES5 strict mode
+
+var expect = require("expect.js"),
+    getInjectionSrc = require("../lib/getInjectionSrc.js");
+
+describe("#getMonkeyPatchSrc", function () {
+    it("should return ''", function () {
+        var expectedSrc = "",
+            subject = {};
+
+        expect(getInjectionSrc(subject)).to.be(expectedSrc);
+    });
+    it("should return 'var process={\"argv\": [\"myArg1\", \"myArg2\"]};var console=456;'", function () {
+        var expectedSrc = "var process={\"argv\": [\"myArg1\", \"myArg2\"]};var console=456;",
+            subject = {
+                process: {
+                    argv: ["myArg1", "myArg2"]
+                },
+                console: 456
+            };
+
+        expect(getInjectionSrc(subject)).to.be(expectedSrc);
+    });
+});
diff --git a/test/getMonkeyPatchSrc.test.js b/test/getMonkeyPatchSrc.test.js
diff --git a/test/trick.test.js b/test/trick.test.js
@@ -57,8 +57,9 @@ describe("#trick", function () {
             };
 
         tricked = trick("./testModules/A/moduleA.js", null, injections);
-        expect(tricked.process).to.be(process); // the process object itself should not be changed
-        expect(tricked.process.argv).to.be.eql(injections.process.argv);
+        expect(tricked.process).not.to.be(process);
+        expect(process.argv).not.to.eql(injections.process.argv);
+        expect(tricked.process).to.eql(injections.process);
         expect(tricked.console).to.be(123);
     });
     it("should inject custom scripts", function () {
