Upgrade jest APIs to match www (#8536)

sophiebits · web-flow · commit efaa26eb5016 · 2016-12-21T19:07:40.000-08:00
D4298654, D4298713
diff --git a/src/addons/transitions/__tests__/ReactCSSTransitionGroup-test.js b/src/addons/transitions/__tests__/ReactCSSTransitionGroup-test.js
@@ -23,7 +23,7 @@ describe('ReactCSSTransitionGroup', () => {
   var container;
 
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
     React = require('React');
     ReactDOM = require('ReactDOM');
     ReactCSSTransitionGroup = require('ReactCSSTransitionGroup');
diff --git a/src/isomorphic/children/__tests__/ReactChildren-test.js b/src/isomorphic/children/__tests__/ReactChildren-test.js
@@ -16,7 +16,7 @@ describe('ReactChildren', () => {
   var ReactFragment;
 
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
     React = require('React');
     ReactFragment = require('ReactFragment');
   });
diff --git a/src/isomorphic/classic/__tests__/ReactContextValidator-test.js b/src/isomorphic/classic/__tests__/ReactContextValidator-test.js
@@ -27,7 +27,7 @@ describe('ReactContextValidator', () => {
   }
 
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
 
     React = require('React');
     ReactDOM = require('ReactDOM');
diff --git a/src/isomorphic/classic/element/__tests__/ReactElement-test.js b/src/isomorphic/classic/element/__tests__/ReactElement-test.js
@@ -21,7 +21,7 @@ describe('ReactElement', () => {
   var originalSymbol;
 
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
 
     // Delete the native Symbol if we have one to ensure we test the
     // unpolyfilled environment.
@@ -500,7 +500,7 @@ describe('ReactElement', () => {
       return OTHER_SYMBOL;
     };
 
-    jest.resetModuleRegistry();
+    jest.resetModules();
 
     React = require('React');
 
@@ -533,7 +533,7 @@ describe('comparing jsx vs .createFactory() vs .createElement()', () => {
   var Child;
 
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
     React = require('React');
     ReactDOM = require('ReactDOM');
     ReactTestUtils = require('ReactTestUtils');
diff --git a/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js b/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js
@@ -26,7 +26,7 @@ describe('ReactElementValidator', () => {
   var ComponentClass;
 
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
 
     React = require('React');
     ReactDOM = require('ReactDOM');
diff --git a/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js b/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js
@@ -837,7 +837,7 @@ describe('ReactPropTypes', () => {
 
   describe('Custom validator', () => {
     beforeEach(() => {
-      jest.resetModuleRegistry();
+      jest.resetModules();
     });
 
     it('should have been called with the right params', () => {
diff --git a/src/isomorphic/classic/types/__tests__/ReactPropTypesProduction-test.js b/src/isomorphic/classic/types/__tests__/ReactPropTypesProduction-test.js
@@ -26,7 +26,7 @@ describe('ReactPropTypesProduction', function() {
       env: Object.assign({}, process.env, {NODE_ENV: 'production'}),
     };
 
-    jest.resetModuleRegistry();
+    jest.resetModules();
     PropTypes = require('ReactPropTypes');
     React = require('React');
     ReactPropTypeLocations = require('ReactPropTypeLocations');
@@ -200,7 +200,7 @@ describe('ReactPropTypesProduction', function() {
 
   describe('Custom validator', function() {
     beforeEach(function() {
-      jest.resetModuleRegistry();
+      jest.resetModules();
     });
 
     it('should not have been called', function() {
diff --git a/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js b/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js
@@ -19,7 +19,7 @@ describe('ReactJSXElement', () => {
   var Component;
 
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
 
     React = require('React');
     ReactDOM = require('ReactDOM');
diff --git a/src/isomorphic/modern/element/__tests__/ReactJSXElementValidator-test.js b/src/isomorphic/modern/element/__tests__/ReactJSXElementValidator-test.js
@@ -23,7 +23,7 @@ describe('ReactJSXElementValidator', () => {
   var RequiredPropComponent;
 
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
 
     React = require('React');
     ReactDOM = require('ReactDOM');
diff --git a/src/renderers/dom/__tests__/ReactDOMProduction-test.js b/src/renderers/dom/__tests__/ReactDOMProduction-test.js
@@ -25,7 +25,7 @@ describe('ReactDOMProduction', () => {
       env: Object.assign({}, process.env, {NODE_ENV: 'production'}),
     };
 
-    jest.resetModuleRegistry();
+    jest.resetModules();
     React = require('React');
     ReactDOM = require('ReactDOM');
   });
diff --git a/src/renderers/dom/shared/__tests__/CSSProperty-test.js b/src/renderers/dom/shared/__tests__/CSSProperty-test.js
@@ -15,7 +15,7 @@ describe('CSSProperty', () => {
   var CSSProperty;
 
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
     CSSProperty = require('CSSProperty');
   });
 
diff --git a/src/renderers/dom/shared/__tests__/CSSPropertyOperations-test.js b/src/renderers/dom/shared/__tests__/CSSPropertyOperations-test.js
@@ -19,7 +19,7 @@ describe('CSSPropertyOperations', () => {
   var CSSPropertyOperations;
 
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
     CSSPropertyOperations = require('CSSPropertyOperations');
   });
 
diff --git a/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js b/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js
@@ -17,7 +17,7 @@ describe('DOMPropertyOperations', () => {
   var ReactDOMComponentTree;
 
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
     var ReactDOMInjection = require('ReactDOMInjection');
     ReactDOMInjection.inject();
 
diff --git a/src/renderers/dom/shared/__tests__/ReactBrowserEventEmitter-test.js b/src/renderers/dom/shared/__tests__/ReactBrowserEventEmitter-test.js
@@ -57,7 +57,7 @@ function registerSimpleTestHandler() {
 
 describe('ReactBrowserEventEmitter', () => {
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
     LISTENER.mockClear();
     EventListener = require('EventListener');
     EventPluginHub = require('EventPluginHub');
diff --git a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
@@ -25,7 +25,7 @@ describe('ReactDOMComponent', () => {
   }
 
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
     React = require('React');
     ReactDOM = require('ReactDOM');
     ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
@@ -1212,7 +1212,7 @@ describe('ReactDOMComponent', () => {
     it('should warn about the `onScroll` issue when unsupported (IE8)', () => {
       // Mock this here so we can mimic IE8 support. We require isEventSupported
       // before React so it's pre-mocked before React would require it.
-      jest.resetModuleRegistry()
+      jest.resetModules()
         .mock('isEventSupported');
       var isEventSupported = require('isEventSupported');
       isEventSupported.mockReturnValueOnce(false);
diff --git a/src/renderers/dom/shared/__tests__/ReactDOMInvalidARIAHook-test.js b/src/renderers/dom/shared/__tests__/ReactDOMInvalidARIAHook-test.js
@@ -17,7 +17,7 @@ describe('ReactDOMInvalidARIAHook', () => {
   var mountComponent;
 
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
     React = require('React');
     ReactTestUtils = require('ReactTestUtils');
 
diff --git a/src/renderers/dom/shared/__tests__/ReactEventIndependence-test.js b/src/renderers/dom/shared/__tests__/ReactEventIndependence-test.js
@@ -17,7 +17,7 @@ var ReactTestUtils;
 
 describe('ReactEventIndependence', () => {
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
 
     React = require('React');
     ReactDOM = require('ReactDOM');
diff --git a/src/renderers/dom/shared/__tests__/ReactEventListener-test.js b/src/renderers/dom/shared/__tests__/ReactEventListener-test.js
@@ -23,7 +23,7 @@ describe('ReactEventListener', () => {
   var handleTopLevel;
 
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
     React = require('React');
     ReactDOM = require('ReactDOM');
     ReactDOMComponentTree = require('ReactDOMComponentTree');
diff --git a/src/renderers/dom/shared/__tests__/ReactMount-test.js b/src/renderers/dom/shared/__tests__/ReactMount-test.js
@@ -20,7 +20,7 @@ var WebComponents;
 
 describe('ReactMount', () => {
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
 
     React = require('React');
     ReactDOM = require('ReactDOM');
@@ -230,7 +230,7 @@ describe('ReactMount', () => {
   });
 
   it('should warn if the unmounted node was rendered by another copy of React', () => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
     var ReactDOMOther = require('ReactDOM');
     var container = document.createElement('div');
 
diff --git a/src/renderers/dom/shared/__tests__/ReactRenderDocument-test.js b/src/renderers/dom/shared/__tests__/ReactRenderDocument-test.js
@@ -28,7 +28,7 @@ var UNMOUNT_INVARIANT_MESSAGE =
 
 describe('rendering React components at document', () => {
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
 
     React = require('React');
     ReactDOM = require('ReactDOM');
diff --git a/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js b/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
@@ -25,7 +25,7 @@ var ROOT_ATTRIBUTE_NAME;
 
 describe('ReactDOMServer', () => {
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
     React = require('React');
     ReactDOM = require('ReactDOM');
     ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
diff --git a/src/renderers/dom/shared/__tests__/validateDOMNesting-test.js b/src/renderers/dom/shared/__tests__/validateDOMNesting-test.js
@@ -47,7 +47,7 @@ function isTagStackValid(stack) {
 
 describe('ReactContextValidator', () => {
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
 
     validateDOMNesting = require('validateDOMNesting');
   });
diff --git a/src/renderers/dom/shared/eventPlugins/__tests__/BeforeInputEventPlugin-test.js b/src/renderers/dom/shared/eventPlugins/__tests__/BeforeInputEventPlugin-test.js
@@ -40,7 +40,7 @@ describe('BeforeInputEventPlugin', function() {
 
   function initialize(simulator) {
     // Need to delete cached modules before executing simulator
-    jest.resetModuleRegistry();
+    jest.resetModules();
 
     // Initialize variables in the scope of BeforeInputEventPlugin
     simulator();
diff --git a/src/renderers/dom/shared/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js b/src/renderers/dom/shared/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js
@@ -18,7 +18,7 @@ var ReactDOMComponentTree;
 
 describe('EnterLeaveEventPlugin', () => {
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
 
     EnterLeaveEventPlugin = require('EnterLeaveEventPlugin');
     React = require('React');
diff --git a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
@@ -30,7 +30,7 @@ describe('ReactDOMInput', () => {
   }
 
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
     React = require('React');
     ReactDOM = require('ReactDOM');
     ReactDOMServer = require('ReactDOMServer');
diff --git a/src/renderers/native/__tests__/ReactNativeEvents-test.js b/src/renderers/native/__tests__/ReactNativeEvents-test.js
@@ -19,7 +19,7 @@ var UIManager;
 var createReactNativeComponentClass;
 
 beforeEach(() => {
-  jest.resetModuleRegistry();
+  jest.resetModules();
 
   RCTEventEmitter = require('RCTEventEmitter');
   React = require('React');
diff --git a/src/renderers/shared/__tests__/ReactDebugTool-test.js b/src/renderers/shared/__tests__/ReactDebugTool-test.js
@@ -15,7 +15,7 @@ describe('ReactDebugTool', () => {
   var ReactDebugTool;
 
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
     ReactDebugTool = require('ReactDebugTool');
   });
 
diff --git a/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js b/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js
@@ -17,7 +17,7 @@ var ReactCoroutine;
 
 describe('ReactCoroutine', () => {
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
     React = require('React');
     ReactNoop = require('ReactNoop');
     ReactCoroutine = require('ReactCoroutine');
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js b/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js
@@ -16,7 +16,7 @@ var ReactNoop;
 
 describe('ReactIncremental', () => {
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
     React = require('React');
     ReactNoop = require('ReactNoop');
   });
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js
@@ -16,7 +16,7 @@ var ReactNoop;
 
 describe('ReactIncrementalErrorHandling', () => {
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
     React = require('React');
     ReactNoop = require('ReactNoop');
   });
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js
@@ -16,7 +16,7 @@ var ReactNoop;
 
 describe('ReactIncrementalReflection', () => {
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
     React = require('React');
     ReactNoop = require('ReactNoop');
   });
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalScheduling-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalScheduling-test.js
@@ -16,7 +16,7 @@ var ReactNoop;
 
 describe('ReactIncrementalScheduling', () => {
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
     React = require('React');
     ReactNoop = require('ReactNoop');
   });
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js
@@ -16,7 +16,7 @@ var ReactNoop;
 
 describe('ReactIncrementalSideEffects', () => {
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
     React = require('React');
     ReactNoop = require('ReactNoop');
   });
diff --git a/src/renderers/shared/fiber/__tests__/ReactTopLevelFragment-test.js b/src/renderers/shared/fiber/__tests__/ReactTopLevelFragment-test.js
@@ -18,7 +18,7 @@ var ReactNoop;
 // probably move to one of the other test files once it is official.
 describe('ReactTopLevelFragment', function() {
   beforeEach(function() {
-    jest.resetModuleRegistry();
+    jest.resetModules();
     React = require('React');
     ReactNoop = require('ReactNoop');
   });
diff --git a/src/renderers/shared/fiber/__tests__/ReactTopLevelText-test.js b/src/renderers/shared/fiber/__tests__/ReactTopLevelText-test.js
@@ -18,7 +18,7 @@ var ReactNoop;
 // probably move to one of the other test files once it is official.
 describe('ReactTopLevelText', () => {
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
     React = require('React');
     ReactNoop = require('ReactNoop');
   });
diff --git a/src/renderers/shared/hooks/__tests__/ReactComponentTreeHook-test.js b/src/renderers/shared/hooks/__tests__/ReactComponentTreeHook-test.js
@@ -20,7 +20,7 @@ describe('ReactComponentTreeHook', () => {
   var ReactComponentTreeTestUtils;
 
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
 
     React = require('React');
     ReactDOM = require('ReactDOM');
@@ -1884,7 +1884,7 @@ describe('ReactComponentTreeHook', () => {
       global.Set = undefined;
       Array.from = undefined;
 
-      jest.resetModuleRegistry();
+      jest.resetModules();
 
       React = require('React');
       ReactDOM = require('ReactDOM');
diff --git a/src/renderers/shared/hooks/__tests__/ReactComponentTreeHook-test.native.js b/src/renderers/shared/hooks/__tests__/ReactComponentTreeHook-test.native.js
@@ -23,7 +23,7 @@ describe('ReactComponentTreeHook', () => {
   var Text;
 
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
 
     React = require('React');
     ReactNative = require('ReactNative');
diff --git a/src/renderers/shared/hooks/__tests__/ReactHostOperationHistoryHook-test.js b/src/renderers/shared/hooks/__tests__/ReactHostOperationHistoryHook-test.js
@@ -20,7 +20,7 @@ describe('ReactHostOperationHistoryHook', () => {
   var ReactHostOperationHistoryHook;
 
   beforeEach(() => {
-    jest.resetModuleRegistry();
+    jest.resetModules();
 
     React = require('React');
     ReactPerf = require('ReactPerf');
diff --git a/src/renderers/shared/shared/__tests__/ReactChildReconciler-test.js b/src/renderers/shared/shared/__tests__/ReactChildReconciler-test.js
diff --git a/src/renderers/shared/shared/__tests__/ReactComponentLifeCycle-test.js b/src/renderers/shared/shared/__tests__/ReactComponentLifeCycle-test.js
diff --git a/src/renderers/shared/shared/__tests__/ReactCompositeComponent-test.js b/src/renderers/shared/shared/__tests__/ReactCompositeComponent-test.js
diff --git a/src/renderers/shared/shared/__tests__/ReactEmptyComponent-test.js b/src/renderers/shared/shared/__tests__/ReactEmptyComponent-test.js
diff --git a/src/renderers/shared/shared/__tests__/ReactIdentity-test.js b/src/renderers/shared/shared/__tests__/ReactIdentity-test.js
diff --git a/src/renderers/shared/shared/__tests__/ReactMultiChild-test.js b/src/renderers/shared/shared/__tests__/ReactMultiChild-test.js
diff --git a/src/renderers/shared/shared/__tests__/ReactMultiChildReconcile-test.js b/src/renderers/shared/shared/__tests__/ReactMultiChildReconcile-test.js
diff --git a/src/renderers/shared/shared/__tests__/ReactStateSetters-test.js b/src/renderers/shared/shared/__tests__/ReactStateSetters-test.js
diff --git a/src/renderers/shared/shared/__tests__/refs-destruction-test.js b/src/renderers/shared/shared/__tests__/refs-destruction-test.js
diff --git a/src/renderers/shared/shared/__tests__/refs-test.js b/src/renderers/shared/shared/__tests__/refs-test.js
diff --git a/src/renderers/shared/shared/event/__tests__/EventPluginHub-test.js b/src/renderers/shared/shared/event/__tests__/EventPluginHub-test.js
diff --git a/src/renderers/shared/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js b/src/renderers/shared/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js
diff --git a/src/renderers/shared/stack/reconciler/__tests__/Transaction-test.js b/src/renderers/shared/stack/reconciler/__tests__/Transaction-test.js
diff --git a/src/renderers/shared/utils/__tests__/ReactErrorUtils-test.js b/src/renderers/shared/utils/__tests__/ReactErrorUtils-test.js
diff --git a/src/shared/utils/__tests__/KeyEscapeUtils-test.js b/src/shared/utils/__tests__/KeyEscapeUtils-test.js
diff --git a/src/shared/utils/__tests__/reactProdInvariant-test.js b/src/shared/utils/__tests__/reactProdInvariant-test.js

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ describe('ReactContextValidator', () => {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`beforeEach(() => {`
`30`		`- jest.resetModuleRegistry();`
	`30`	`+ jest.resetModules();`
`31`	`31`
`32`	`32`	`React = require('React');`
`33`	`33`	`ReactDOM = require('ReactDOM');`