Move testLib into dedicated folder inside root folder

14 files changed, 20 insertions, 15 deletions

diff --git a/.istanbul.yml b/.istanbul.yml
index 21bf908..be3e16e 100644
--- a/.istanbul.yml
+++ b/.istanbul.yml
@@ -1,7 +1,9 @@
 instrumentation:
-    # These functions will be stringified and evaled again. Thus it's difficult to include them into the test coverage
     excludes: [
+        # These functions will be stringified and evaled again. Thus it's difficult to include them into the test coverage
         'lib/__get__.js',
         'lib/__set__.js',
-        'lib/__with__.js'
-        ]
\ No newline at end of file
+        'lib/__with__.js',
+        # Ignore shared test cases. These are just in the lib folder because they should
+        'testLib/*'
+        ]
diff --git a/lib/testModules/node_modules/rewire/package.json b/lib/testModules/node_modules/rewire/package.json
deleted file mode 100644
index d8927cd..0000000
--- a/lib/testModules/node_modules/rewire/package.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "main": "../../../../lib/index.js"
-}
\ No newline at end of file
diff --git a/test/rewire.test.js b/test/rewire.test.js
index 900e0fc..ecf3cc9 100644
--- a/test/rewire.test.js
+++ b/test/rewire.test.js
@@ -10,20 +10,20 @@ var rewire;
 
 describe("rewire", function () {
     before(function () {
-        var fakeNodeModules = path.resolve(__dirname, "testModules/fake_node_modules");
+        var fakeNodeModules = path.resolve(__dirname, "../testLib/fake_node_modules");
 
         if (fs.existsSync(fakeNodeModules)) {
-            fs.renameSync(fakeNodeModules, path.resolve(__dirname, "testModules/node_modules"));
+            fs.renameSync(fakeNodeModules, path.resolve(__dirname, "../testLib/node_modules"));
         }
     });
     it("should pass all shared test cases", function () {
-        require("../lib/testModules/sharedTestCases.js");
+        require("../testLib/sharedTestCases.js");
     });
     it("should also work with CoffeeScript", function () {
         var coffeeModule;
 
         rewire = require("../");
-        coffeeModule = rewire("../lib/testModules/module.coffee");
+        coffeeModule = rewire("../testLib/module.coffee");
         coffeeModule.__set__("fs", {
             readFileSync: function () {
                 return "It works!";
diff --git a/lib/testModules/debuggerModule.js b/testLib/debuggerModule.js
index 9d2b7df..9d2b7df 100644
--- a/lib/testModules/debuggerModule.js
+++ b/testLib/debuggerModule.js
diff --git a/lib/testModules/emptyModule.js b/testLib/emptyModule.js
index 8b82a74..8b82a74 100644
--- a/lib/testModules/emptyModule.js
+++ b/testLib/emptyModule.js
diff --git a/lib/testModules/implicitGlobal.js b/testLib/implicitGlobal.js
index 3048742..3048742 100644
--- a/lib/testModules/implicitGlobal.js
+++ b/testLib/implicitGlobal.js
diff --git a/lib/testModules/module.coffee b/testLib/module.coffee
index 5487878..5487878 100644
--- a/lib/testModules/module.coffee
+++ b/testLib/module.coffee
diff --git a/lib/testModules/moduleA.js b/testLib/moduleA.js
index b9dce87..b9dce87 100644
--- a/lib/testModules/moduleA.js
+++ b/testLib/moduleA.js
diff --git a/lib/testModules/moduleB.js b/testLib/moduleB.js
index 62b2d3f..62b2d3f 100644
--- a/lib/testModules/moduleB.js
+++ b/testLib/moduleB.js
diff --git a/testLib/node_modules/rewire/package.json b/testLib/node_modules/rewire/package.json
new file mode 100644
index 0000000..ea0fba5
--- /dev/null
+++ b/testLib/node_modules/rewire/package.json
@@ -0,0 +1,3 @@
+{
+    "main": "../../../lib/index.js"
+}
diff --git a/lib/testModules/sharedTestCases.js b/testLib/sharedTestCases.js
index ccbafa3..9fb83ed 100644
--- a/lib/testModules/sharedTestCases.js
+++ b/testLib/sharedTestCases.js
@@ -9,9 +9,9 @@
 
 var expect = require("expect.js"),
     rewire = require("rewire"),
-    __set__Src = require("../../lib/__set__.js").toString(),
-    __get__Src = require("../../lib/__get__.js").toString(),
-    __with__Src = require("../../lib/__with__.js").toString();
+    __set__Src = require("../lib/__set__.js").toString(),
+    __get__Src = require("../lib/__get__.js").toString(),
+    __with__Src = require("../lib/__with__.js").toString();
 
 function checkForTypeError(err) {
     expect(err.constructor).to.be(TypeError);
@@ -23,7 +23,7 @@ describe("rewire " + (typeof testEnv === "undefined"? "(node)": "(" + testEnv +
         rewire("./moduleA.js").getFilename();
         require("./moduleA.js").getFilename();
         expect(rewire("./moduleA.js").getFilename()).to.eql(require("./moduleA.js").getFilename());
-        expect(rewire("../testModules/someOtherModule.js").filename).to.eql(require("../testModules/someOtherModule.js").filename);
+        expect(rewire("../testLib/someOtherModule.js").filename).to.eql(require("../testLib/someOtherModule.js").filename);
     });
 
     it("should return a fresh instance of the module", function () {
@@ -69,7 +69,7 @@ describe("rewire " + (typeof testEnv === "undefined"? "(node)": "(" + testEnv +
 
     ["__get__", "__set__", "__with__"].forEach(function(funcName) {
         it("should provide " + funcName + " as a non-enumerable property", function () {
-            expect(Object.keys(rewire("./moduleA.js")).indexOf(funcName)).to.be(-1)
+            expect(Object.keys(rewire("./moduleA.js")).indexOf(funcName)).to.be(-1);
         });
 
         it("should provide " + funcName + " as a writable property", function () {
@@ -240,6 +240,9 @@ describe("rewire " + (typeof testEnv === "undefined"? "(node)": "(" + testEnv +
     it("should not modify line numbers in stack traces", function () {
         var throwError = rewire("./throwError.js");
 
+        if (process.env.running_under_istanbul === "1") {
+            return;
+        }
         try {
             throwError();
         } catch (err) {
diff --git a/lib/testModules/someOtherModule.js b/testLib/someOtherModule.js
index da38f4c..da38f4c 100644
--- a/lib/testModules/someOtherModule.js
+++ b/testLib/someOtherModule.js
diff --git a/lib/testModules/strictModule.js b/testLib/strictModule.js
index 5d6e387..5d6e387 100644
--- a/lib/testModules/strictModule.js
+++ b/testLib/strictModule.js
diff --git a/lib/testModules/throwError.js b/testLib/throwError.js
index 9bdf68b..9bdf68b 100644
--- a/lib/testModules/throwError.js
+++ b/testLib/throwError.js