Removing automatically reset modules between test run

Reviewed By: bestander

Differential Revision: D3886125

fbshipit-source-id: c8f47c3466add1e2c89649a1c6f47b01f0d7a89e

Libraries/Animated/src/__tests__/Animated-test.js

@@ -17,6 +17,10 @@ jest
   .setMock('React', {Component: class {}});
 
 var Animated = require('Animated');
+describe('Animated tests', () => {
+  beforeEach(() => {
+    jest.resetModules();
+  });
 
   describe('Animated', () => {
 
@@ -216,7 +220,6 @@ describe('Animated Sequence', () => {
     });
   });
 
-
   describe('Animated Parallel', () => {
 
     it('works with an empty parallel', () => {
@@ -582,3 +585,4 @@ describe('Animated Diff Clamp', () => {
       }
     });
   });
+});

local-cli/link/__tests__/getProjectDependencies.spec.js

@@ -1,3 +1,12 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
 'use strict';
 
 jest.autoMockOff();
@@ -6,7 +15,9 @@ const getProjectDependencies = require('../getProjectDependencies');
 const path = require('path');
 
 describe('getProjectDependencies', () => {
-
+  beforeEach(() => {
+    jest.resetModules();
+  });
   it('should return an array of project dependencies', () => {
     jest.setMock(
       path.join(process.cwd(), './package.json'),

local-cli/link/__tests__/link.spec.js

@@ -21,6 +21,7 @@ jest.setMock(
 
 describe('link', () => {
   beforeEach(() => {
+    jest.resetModules();
     delete require.cache[require.resolve('../link')];
     log.level = 'silent';
   });

package.json

@@ -17,7 +17,6 @@
       "jestSupport/env.js"
     ],
     "timers": "fake",
-    "resetModules": true,
     "moduleNameMapper": {
       "^image![a-zA-Z0-9$_-]+$": "GlobalImageStub",
       "^[./a-zA-Z0-9$_-]+\\.png$": "RelativeImageStub"

packager/react-packager/src/JSTransformer/worker/__tests__/worker-test.js

@@ -21,6 +21,7 @@ describe('code transformation worker:', () => {
 
   let extractDependencies, transform;
   beforeEach(() => {
+    jest.resetModules();
     ({transformCode} = require('..'));
     extractDependencies =
       require('../extract-dependencies').mockReturnValue({});
@@ -58,7 +59,10 @@ describe('code transformation worker:', () => {
     });
   });
 
-  it('removes the leading assignment to `module.exports` before passing on the result if the file is a JSON file, even if minified', done => {
+  it(
+    'removes the leading assignment to `module.exports` before passing ' +
+    'on the result if the file is a JSON file, even if minified',
+    done => {
       const result = {
         code: 'p.exports={a:1,b:2}',
       };
@@ -69,7 +73,8 @@ describe('code transformation worker:', () => {
         expect(data.code).toBe('{a:1,b:2}');
         done();
       });
-  });
+    }
+  );
 
   it('removes shebang when present', done => {
     const shebang = '#!/usr/bin/env node';
@@ -110,7 +115,10 @@ describe('code transformation worker:', () => {
       });
     });
 
-    it('uses `dependencies` and `dependencyOffsets` provided by `extractDependencies` for the result', done => {
+    it(
+      'uses `dependencies` and `dependencyOffsets` ' +
+      'provided by `extractDependencies` for the result',
+      done => {
         const dependencyData = {
           dependencies: ['arbitrary', 'list', 'of', 'dependencies'],
           dependencyOffsets: [12,  119, 185, 328, 471],
@@ -121,24 +129,37 @@ describe('code transformation worker:', () => {
           expect(data).toEqual(objectContaining(dependencyData));
           done();
         });
-    });
+      }
+    );
 
     it('does not extract requires if files are marked as "extern"', done => {
-      transformCode(transform, 'filename', 'code', {extern: true}, (_, {dependencies, dependencyOffsets}) => {
+      transformCode(
+        transform,
+        'filename',
+        'code',
+        {extern: true},
+        (_, {dependencies, dependencyOffsets}) => {
           expect(extractDependencies).not.toBeCalled();
           expect(dependencies).toEqual([]);
           expect(dependencyOffsets).toEqual([]);
           done();
-      });
+        }
+      );
     });
 
     it('does not extract requires of JSON files', done => {
-      transformCode(transform, 'arbitrary.json', '{"arbitrary":"json"}', {}, (_, {dependencies, dependencyOffsets}) => {
+      transformCode(
+        transform,
+        'arbitrary.json',
+        '{"arbitrary":"json"}',
+        {},
+        (_, {dependencies, dependencyOffsets}) => {
           expect(extractDependencies).not.toBeCalled();
           expect(dependencies).toEqual([]);
           expect(dependencyOffsets).toEqual([]);
           done();
-      });
+        }
+      );
     });
   });
 

packager/react-packager/src/Server/__tests__/Server-test.js

@@ -26,6 +26,7 @@ let FileWatcher;
 describe('processRequest', () => {
   let SourceMapConsumer, Bundler, Server, AssetServer, Promise;
   beforeEach(() => {
+    jest.resetModules();
     SourceMapConsumer = require('source-map').SourceMapConsumer;
     Bundler = require('../../Bundler');
     Server = require('../');
@@ -253,7 +254,10 @@ describe('processRequest', () => {
       jest.runAllTicks();
     });
 
-    it('does not rebuild the bundles that contain a file when that file is changed, even when hot loading is enabled', () => {
+    it(
+      'does not rebuild the bundles that contain a file ' +
+      'when that file is changed, even when hot loading is enabled',
+      () => {
         const bundleFunc = jest.fn();
         bundleFunc
           .mockReturnValueOnce(
@@ -382,7 +386,10 @@ describe('processRequest', () => {
 
       server.processRequest(req, res);
       jest.runAllTimers();
-      expect(AssetServer.prototype.get).toBeCalledWith('imgs/主页/logo.png', undefined);
+      expect(AssetServer.prototype.get).toBeCalledWith(
+        'imgs/\u{4E3B}\u{9875}/logo.png',
+        undefined
+      );
       expect(res.setHeader).toBeCalledWith('Cache-Control', 'max-age=31536000');
       expect(res.end).toBeCalledWith('i am image');
     });

packager/react-packager/src/node-haste/FileWatcher/__tests__/FileWatcher-test.js

@@ -22,6 +22,7 @@ describe('FileWatcher', () => {
   let config;
 
   beforeEach(() => {
+    jest.resetModules();
     const sane = require('sane');
     WatchmanWatcher = sane.WatchmanWatcher;
     WatchmanWatcher.prototype.once.mockImplementation(

packager/react-packager/src/node-haste/__tests__/DependencyGraph-test.js

@@ -40,6 +40,8 @@ describe('DependencyGraph', function() {
   }
 
   beforeEach(function() {
+    jest.resetModules();
+
     Module = require('../Module');
     const fileWatcher = {
       on: function() {
@@ -245,7 +247,7 @@ describe('DependencyGraph', function() {
         ...defaults,
         roots: [root],
       });
-      return getOrderedDependenciesAsJSON(dgraph, '/root/index.js', null, false).then(function(deps) {
+      return getOrderedDependenciesAsJSON(dgraph, '/root/index.js', null, false).then((deps) => {
         expect(deps)
           .toEqual([
             {
@@ -1918,7 +1920,7 @@ describe('DependencyGraph', function() {
         });
       });
 
-      pit('should support browser mapping of a package to a file ("' + fieldName + '")', function() {
+      pit('should support browser mapping of a package to a file ("' + fieldName + '")', () => {
         var root = '/root';
         setMockFileSystem({
           'root': {
@@ -2337,7 +2339,8 @@ describe('DependencyGraph', function() {
                 'node-package-c': 'rn-package-c',
               },
             }),
-            'index.js': 'require("node-package-a"); require("node-package-b"); require("node-package-c");',
+            'index.js':
+              'require("node-package-a"); require("node-package-b"); require("node-package-c");',
             'node_modules': {
               'node-package-a': {
                 'package.json': JSON.stringify({
@@ -2510,7 +2513,9 @@ describe('DependencyGraph', function() {
       });
     });
 
-    pit('should only use `extraNodeModules` after checking all possible filesystem locations', () => {
+    pit(
+      'should only use `extraNodeModules` after checking all possible filesystem locations',
+      () => {
         const root = '/root';
         setMockFileSystem({
           [root.slice(1)]: {
@@ -2553,7 +2558,8 @@ describe('DependencyGraph', function() {
               },
             ]);
         });
-    });
+      }
+    );
 
     pit('should be able to resolve paths within `extraNodeModules`', () => {
       const root = '/root';

packager/react-packager/src/node-haste/__tests__/fastpath-test.js

@@ -1,3 +1,12 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
 // Copyright Joyent, Inc. and other Node contributors.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
@@ -50,6 +59,7 @@ describe('fast-path', () => {
   };
 
   beforeEach(function() {
+    jest.resetModules();
     process.platform = 'linux';
   });