Remove getJestRuntime from ModuleLoader; expose it for tests as `__…

…getJestRuntimeForTest`.
cpojer · Nov 16, 2015 · e1faf1b · e1faf1b
1 parent 5f82cc7
commit e1faf1b
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 31 deletions.
diff --git a/src/HasteModuleLoader/HasteModuleLoader.js b/src/HasteModuleLoader/HasteModuleLoader.js
@@ -793,10 +793,6 @@ class Loader {
     }
   }
 
-  getJestRuntime(dir) {
-    return this._createRuntimeFor(dir);
-  }
-
   _createRuntimeFor(currPath) {
     const runtime = {
       addMatchers: matchers => {
@@ -849,23 +845,7 @@ class Loader {
       },
 
       resetModuleRegistry: () => {
-        var envGlobal = this._environment.global;
-        Object.keys(envGlobal).forEach(key => {
-          const globalMock = envGlobal[key];
-          if (
-            (typeof globalMock === 'object' && globalMock !== null) ||
-            typeof globalMock === 'function'
-          ) {
-            globalMock._isMockFunction && globalMock.mockClear();
-          }
-        });
-
-        if (envGlobal.mockClearTimers) {
-          envGlobal.mockClearTimers();
-        }
-
         this.resetModuleRegistry();
-
         return runtime;
       },
 
@@ -891,6 +871,27 @@ class Loader {
   resetModuleRegistry() {
     this._mockRegistry = {};
     this._moduleRegistry = {};
+
+    if (this._environment && this._environment.global) {
+      var envGlobal = this._environment.global;
+      Object.keys(envGlobal).forEach(key => {
+        const globalMock = envGlobal[key];
+        if (
+          (typeof globalMock === 'object' && globalMock !== null) ||
+          typeof globalMock === 'function'
+        ) {
+          globalMock._isMockFunction && globalMock.mockClear();
+        }
+      });
+
+      if (envGlobal.mockClearTimers) {
+        envGlobal.mockClearTimers();
+      }
+    }
+  }
+
+  __getJestRuntimeForTest(dir) {
+    return this._createRuntimeFor(dir);
   }
 }
 

diff --git a/src/HasteModuleLoader/__tests__/HasteModuleLoader-genMockFromModule-test.js b/src/HasteModuleLoader/__tests__/HasteModuleLoader-genMockFromModule-test.js
@@ -56,10 +56,10 @@ describe('nodeHasteModuleLoader', function() {
           var regularModule = testRequire('RegularModule');
           var origModuleStateValue = regularModule.getModuleStateValue();
 
-          loader.getJestRuntime().dontMock('RegularModule');
+          loader.__getJestRuntimeForTest().dontMock('RegularModule');
 
           // Generate a mock for a module with side effects
-          loader.getJestRuntime().genMockFromModule(
+          loader.__getJestRuntimeForTest().genMockFromModule(
             'ModuleWithSideEffects'
           );
 

diff --git a/src/HasteModuleLoader/__tests__/HasteModuleLoader-getTestEnvData-test.js b/src/HasteModuleLoader/__tests__/HasteModuleLoader-getTestEnvData-test.js
@@ -45,14 +45,14 @@ describe('HasteModuleLoader', function() {
 
   pit('passes config data through to jest.envData', function() {
     return buildLoader().then(function(loader) {
-      var envData = loader.getJestRuntime().getTestEnvData();
+      var envData = loader.__getJestRuntimeForTest().getTestEnvData();
       expect(envData).toEqual(config.testEnvData);
     });
   });
 
   pit('freezes jest.envData object', function() {
     return buildLoader().then(function(loader) {
-      var envData = loader.getJestRuntime().getTestEnvData();
+      var envData = loader.__getJestRuntimeForTest().getTestEnvData();
       expect(Object.isFrozen(envData)).toBe(true);
     });
   });

diff --git a/src/HasteModuleLoader/__tests__/HasteModuleLoader-requireModule-test.js b/src/HasteModuleLoader/__tests__/HasteModuleLoader-requireModule-test.js
@@ -179,7 +179,8 @@ describe('HasteModuleLoader', function() {
           'marked with .dontMock()',
           function() {
             return buildLoader().then(function(loader) {
-              loader.getJestRuntime(__filename).dontMock('ManuallyMocked');
+              loader.__getJestRuntimeForTest(__filename)
+                .dontMock('ManuallyMocked');
               var exports = loader.requireModule(__filename, 'ManuallyMocked');
               expect(exports.isManualMockModule).toBe(false);
             });

diff --git a/src/HasteModuleLoader/__tests__/HasteModuleLoader-requireModuleOrMock-test.js b/src/HasteModuleLoader/__tests__/HasteModuleLoader-requireModuleOrMock-test.js
@@ -59,7 +59,7 @@ describe('HasteModuleLoader', function() {
 
     pit('doesnt mock modules when explicitly dontMock()ed', function() {
       return buildLoader().then(function(loader) {
-        loader.getJestRuntime().dontMock('RegularModule');
+        loader.__getJestRuntimeForTest().dontMock('RegularModule');
         var exports = loader.requireModuleOrMock(null, 'RegularModule');
         expect(exports.isRealModule).toBe(true);
       });
@@ -70,7 +70,7 @@ describe('HasteModuleLoader', function() {
       'denormalized module name',
       function() {
         return buildLoader().then(function(loader) {
-          loader.getJestRuntime(__filename)
+          loader.__getJestRuntimeForTest(__filename)
             .dontMock('./test_root/RegularModule');
           var exports = loader.requireModuleOrMock(__filename, 'RegularModule');
           expect(exports.isRealModule).toBe(true);
@@ -80,7 +80,7 @@ describe('HasteModuleLoader', function() {
 
     pit('doesnt mock modules when autoMockOff() has been called', function() {
       return buildLoader().then(function(loader) {
-        loader.getJestRuntime().autoMockOff();
+        loader.__getJestRuntimeForTest().autoMockOff();
         var exports = loader.requireModuleOrMock(null, 'RegularModule');
         expect(exports.isRealModule).toBe(true);
       });
@@ -98,7 +98,7 @@ describe('HasteModuleLoader', function() {
       'available',
       function() {
         return buildLoader().then(function(loader) {
-          loader.getJestRuntime(__filename).autoMockOff();
+          loader.__getJestRuntimeForTest().autoMockOff();
           var exports = loader.requireModuleOrMock(
             __filename,
             'ManuallyMocked'
@@ -110,7 +110,6 @@ describe('HasteModuleLoader', function() {
 
     pit('resolves mapped module names and unmocks them by default', function() {
       return buildLoader().then(function(loader) {
-        loader.getJestRuntime(__filename);
         var exports =
           loader.requireModuleOrMock(__filename, 'image!not-really-a-module');
         expect(exports.isGlobalImageStub).toBe(true);

diff --git a/src/jasmineTestRunner/jasmineTestRunner.js b/src/jasmineTestRunner/jasmineTestRunner.js
@@ -230,7 +230,7 @@ function jasmineTestRunner(config, environment, moduleLoader, testPath) {
     });
 
     if (!config.persistModuleRegistryBetweenSpecs) {
-      moduleLoader.getJestRuntime().resetModuleRegistry();
+      moduleLoader.resetModuleRegistry();
     }
   });