Revert "[Tests] Reset modules by default"

packages/react-art/src/__tests__/ReactART-test.js

@@ -22,11 +22,21 @@ import Circle from 'react-art/Circle';
 import Rectangle from 'react-art/Rectangle';
 import Wedge from 'react-art/Wedge';
 
-let ReactDOMClient;
-let act;
-let ReactTestRenderer;
-let ReactNoop;
-let Scheduler;
+// Isolate DOM renderer.
+jest.resetModules();
+
+const ReactDOMClient = require('react-dom/client');
+const act = require('internal-test-utils').act;
+
+// Isolate test renderer.
+jest.resetModules();
+const ReactTestRenderer = require('react-test-renderer');
+
+// Isolate the noop renderer
+jest.resetModules();
+const ReactNoop = require('react-noop-renderer');
+const Scheduler = require('scheduler');
+
 let Group;
 let Shape;
 let Surface;
@@ -63,21 +73,6 @@ describe('ReactART', () => {
   let container;
 
   beforeEach(() => {
-    // Isolate DOM renderer.
-    jest.resetModules();
-
-    ReactDOMClient = require('react-dom/client');
-    act = require('internal-test-utils').act;
-
-    // Isolate test renderer.
-    jest.resetModules();
-    ReactTestRenderer = require('react-test-renderer');
-
-    // Isolate the noop renderer
-    jest.resetModules();
-    ReactNoop = require('react-noop-renderer');
-    Scheduler = require('scheduler');
-
     container = document.createElement('div');
     document.body.appendChild(container);
 

packages/react-client/src/__tests__/ReactFlight-test.js

@@ -42,6 +42,7 @@ let assertLog;
 
 describe('ReactFlight', () => {
   beforeEach(() => {
+    jest.resetModules();
     jest.mock('react', () => require('react/react.react-server'));
     ReactServer = require('react');
     ReactNoopFlightServer = require('react-noop-renderer/flight-server');

packages/react-debug-tools/src/__tests__/ReactDevToolsHooksIntegration-test.js

@@ -34,6 +34,8 @@ describe('React hooks DevTools integration', () => {
       onCommitFiberUnmount: () => {},
     };
 
+    jest.resetModules();
+
     React = require('react');
     ReactDebugTools = require('react-debug-tools');
     ReactTestRenderer = require('react-test-renderer');

packages/react-debug-tools/src/__tests__/ReactHooksInspection-test.js

@@ -15,6 +15,7 @@ let ReactDebugTools;
 
 describe('ReactHooksInspection', () => {
   beforeEach(() => {
+    jest.resetModules();
     React = require('react');
     ReactDebugTools = require('react-debug-tools');
   });

packages/react-debug-tools/src/__tests__/ReactHooksInspectionIntegration-test.js

@@ -19,6 +19,7 @@ let useMemoCache;
 
 describe('ReactHooksInspectionIntegration', () => {
   beforeEach(() => {
+    jest.resetModules();
     React = require('react');
     ReactTestRenderer = require('react-test-renderer');
     ReactDOM = require('react-dom');

packages/react-devtools-shared/src/__tests__/console-test.js

@@ -924,6 +924,8 @@ describe('console', () => {
 
 describe('console error', () => {
   beforeEach(() => {
+    jest.resetModules();
+
     const Console = require('react-devtools-shared/src/backend/console');
     patchConsole = Console.patch;
     unpatchConsole = Console.unpatch;

packages/react-devtools-shared/src/hooks/__tests__/parseHookNames-test.js

@@ -48,6 +48,8 @@ describe('parseHookNames', () => {
   let parseHookNames;
 
   beforeEach(() => {
+    jest.resetModules();
+
     jest.mock('source-map-support', () => {
       console.trace('source-map-support');
     });

packages/react-dom/src/__tests__/DOMPropertyOperations-test.js

@@ -21,6 +21,7 @@ describe('DOMPropertyOperations', () => {
   let act;
 
   beforeEach(() => {
+    jest.resetModules();
     React = require('react');
     ReactDOMClient = require('react-dom/client');
     ({act} = require('internal-test-utils'));

packages/react-dom/src/__tests__/InvalidEventListeners-test.js

@@ -18,6 +18,7 @@ describe('InvalidEventListeners', () => {
   let container;
 
   beforeEach(() => {
+    jest.resetModules();
     React = require('react');
     ReactDOMClient = require('react-dom/client');
     act = require('internal-test-utils').act;

packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.js

@@ -45,6 +45,7 @@ let container;
 // It should probably be rewritten but we're keeping it for some extra coverage.
 describe('ReactBrowserEventEmitter', () => {
   beforeEach(() => {
+    jest.resetModules();
     LISTENER.mockClear();
 
     React = require('react');

packages/react-dom/src/__tests__/ReactChildReconciler-test.js

@@ -18,6 +18,8 @@ let act;
 
 describe('ReactChildReconciler', () => {
   beforeEach(() => {
+    jest.resetModules();
+
     React = require('react');
     ReactDOMClient = require('react-dom/client');
     act = require('internal-test-utils').act;

packages/react-dom/src/__tests__/ReactComponent-test.js

@@ -17,6 +17,8 @@ let act;
 
 describe('ReactComponent', () => {
   beforeEach(() => {
+    jest.resetModules();
+
     React = require('react');
     ReactDOM = require('react-dom');
     ReactDOMClient = require('react-dom/client');

packages/react-dom/src/__tests__/ReactComponentLifeCycle-test.js

@@ -90,6 +90,8 @@ function getLifeCycleState(instance): ComponentLifeCycle {
  */
 describe('ReactComponentLifeCycle', () => {
   beforeEach(() => {
+    jest.resetModules();
+
     act = require('internal-test-utils').act;
 
     React = require('react');

packages/react-dom/src/__tests__/ReactCompositeComponent-test.js

@@ -63,6 +63,7 @@ describe('ReactCompositeComponent', () => {
   }
 
   beforeEach(() => {
+    jest.resetModules();
     React = require('react');
     ReactDOM = require('react-dom');
     ReactDOMClient = require('react-dom/client');

packages/react-dom/src/__tests__/ReactCompositeComponentState-test.js

@@ -520,82 +520,78 @@ describe('ReactCompositeComponent-state', () => {
     assertLog([
       'render -- step: 3, extra: false',
       'callback -- step: 3, extra: false',
+
+      // A second time for the retry.
+      'render -- step: 3, extra: false',
+      'callback -- step: 3, extra: false',
     ]);
   });
 
-  // @gate !disableModulePatternComponents
-  it('should support stateful module pattern components', async () => {
-    function Child() {
-      return {
-        state: {
-          count: 123,
-        },
-        render() {
-          return <div>{`count:${this.state.count}`}</div>;
-        },
-      };
-    }
-
-    const el = document.createElement('div');
-    const root = ReactDOMClient.createRoot(el);
-    expect(() => {
-      ReactDOM.flushSync(() => {
-        root.render(<Child />);
-      });
-    }).toErrorDev(
-      'Warning: The <Child /> component appears to be a function component that returns a class instance. ' +
-        'Change Child to a class that extends React.Component instead. ' +
-        "If you can't use a class try assigning the prototype on the function as a workaround. " +
-        '`Child.prototype = React.Component.prototype`. ' +
-        "Don't use an arrow function since it cannot be called with `new` by React.",
-    );
+  if (!require('shared/ReactFeatureFlags').disableModulePatternComponents) {
+    it('should support stateful module pattern components', async () => {
+      function Child() {
+        return {
+          state: {
+            count: 123,
+          },
+          render() {
+            return <div>{`count:${this.state.count}`}</div>;
+          },
+        };
+      }
+
+      const el = document.createElement('div');
+      const root = ReactDOMClient.createRoot(el);
+      expect(() => {
+        ReactDOM.flushSync(() => {
+          root.render(<Child />);
+        });
+      }).toErrorDev(
+        'Warning: The <Child /> component appears to be a function component that returns a class instance. ' +
+          'Change Child to a class that extends React.Component instead. ' +
+          "If you can't use a class try assigning the prototype on the function as a workaround. " +
+          '`Child.prototype = React.Component.prototype`. ' +
+          "Don't use an arrow function since it cannot be called with `new` by React.",
+      );
 
-    expect(el.textContent).toBe('count:123');
-  });
+      expect(el.textContent).toBe('count:123');
+    });
 
-  // @gate !disableModulePatternComponents
-  it('should support getDerivedStateFromProps for module pattern components', async () => {
-    function Child() {
-      return {
-        state: {
-          count: 1,
-        },
-        render() {
-          return <div>{`count:${this.state.count}`}</div>;
-        },
-      };
-    }
-    Child.getDerivedStateFromProps = (props, prevState) => {
-      return {
-        count: prevState.count + props.incrementBy,
+    it('should support getDerivedStateFromProps for module pattern components', async () => {
+      function Child() {
+        return {
+          state: {
+            count: 1,
+          },
+          render() {
+            return <div>{`count:${this.state.count}`}</div>;
+          },
+        };
+      }
+      Child.getDerivedStateFromProps = (props, prevState) => {
+        return {
+          count: prevState.count + props.incrementBy,
+        };
       };
-    };
 
-    const el = document.createElement('div');
-    const root = ReactDOMClient.createRoot(el);
-    expect(() => {
-      ReactDOM.flushSync(() => {
+      const el = document.createElement('div');
+      const root = ReactDOMClient.createRoot(el);
+      await act(() => {
         root.render(<Child incrementBy={0} />);
       });
-    }).toErrorDev(
-      'Warning: The <Child /> component appears to be a function component that returns a class instance. ' +
-        'Change Child to a class that extends React.Component instead. ' +
-        "If you can't use a class try assigning the prototype on the function as a workaround. " +
-        '`Child.prototype = React.Component.prototype`. ' +
-        "Don't use an arrow function since it cannot be called with `new` by React.",
-    );
 
-    expect(el.textContent).toBe('count:1');
-    await act(() => {
-      root.render(<Child incrementBy={2} />);
-    });
-    expect(el.textContent).toBe('count:3');
+      expect(el.textContent).toBe('count:1');
+      await act(() => {
+        root.render(<Child incrementBy={2} />);
+      });
+      expect(el.textContent).toBe('count:3');
 
-    await act(() => {
-      root.render(<Child incrementBy={1} />);
+      await act(() => {
+        root.render(<Child incrementBy={1} />);
+      });
+      expect(el.textContent).toBe('count:4');
     });
-    expect(el.textContent).toBe('count:4');
-  });
+  }
 
   it('should not support setState in componentWillUnmount', async () => {
     let subscription;

packages/react-dom/src/__tests__/ReactDOM-test.js

@@ -19,6 +19,7 @@ let act;
 
 describe('ReactDOM', () => {
   beforeEach(() => {
+    jest.resetModules();
     React = require('react');
     ReactDOM = require('react-dom');
     ReactDOMClient = require('react-dom/client');

packages/react-dom/src/__tests__/ReactDOMAttribute-test.js

@@ -15,6 +15,7 @@ describe('ReactDOM unknown attribute', () => {
   let act;
 
   beforeEach(() => {
+    jest.resetModules();
     React = require('react');
     ReactDOMClient = require('react-dom/client');
     act = require('internal-test-utils').act;

packages/react-dom/src/__tests__/ReactDOMComponent-test.js

@@ -20,6 +20,7 @@ describe('ReactDOMComponent', () => {
   let act;
 
   beforeEach(() => {
+    jest.resetModules();
     React = require('react');
     ReactDOM = require('react-dom');
     ReactDOMClient = require('react-dom/client');

packages/react-dom/src/__tests__/ReactDOMConsoleErrorReporting-test.js

@@ -19,6 +19,7 @@ describe('ReactDOMConsoleErrorReporting', () => {
   let waitForThrow;
 
   beforeEach(() => {
+    jest.resetModules();
     act = require('internal-test-utils').act;
     React = require('react');
     ReactDOMClient = require('react-dom/client');

packages/react-dom/src/__tests__/ReactDOMConsoleErrorReportingLegacy-test.js

@@ -19,6 +19,7 @@ describe('ReactDOMConsoleErrorReporting', () => {
   let waitForThrow;
 
   beforeEach(() => {
+    jest.resetModules();
     act = require('internal-test-utils').act;
     React = require('react');
     ReactDOM = require('react-dom');

packages/react-dom/src/__tests__/ReactDOMEventListener-test.js

@@ -18,6 +18,7 @@ describe('ReactDOMEventListener', () => {
   let simulateEventDispatch;
 
   beforeEach(() => {
+    jest.resetModules();
     React = require('react');
     ReactDOM = require('react-dom');
     ReactDOMClient = require('react-dom/client');

packages/react-dom/src/__tests__/ReactDOMEventPropagation-test.js

@@ -18,6 +18,7 @@ describe('ReactDOMEventListener', () => {
 
   beforeEach(() => {
     window.TextEvent = function () {};
+    jest.resetModules();
     jest.isolateModules(() => {
       React = require('react');
       act = require('internal-test-utils').act;

packages/react-dom/src/__tests__/ReactDOMFiber-test.js

@@ -22,6 +22,7 @@ describe('ReactDOMFiber', () => {
   let container;
 
   beforeEach(() => {
+    jest.resetModules();
     React = require('react');
     ReactDOM = require('react-dom');
     PropTypes = require('prop-types');

packages/react-dom/src/__tests__/ReactDOMFizzDeferredValue-test.js

@@ -32,6 +32,7 @@ let Suspense;
 
 describe('ReactDOMFizzForm', () => {
   beforeEach(() => {
+    jest.resetModules();
     React = require('react');
     Scheduler = require('scheduler');
     ReactDOMServer = require('react-dom/server.browser');

packages/react-dom/src/__tests__/ReactDOMFizzForm-test.js

@@ -27,6 +27,7 @@ let useFormState;
 
 describe('ReactDOMFizzForm', () => {
   beforeEach(() => {
+    jest.resetModules();
     React = require('react');
     ReactDOMServer = require('react-dom/server.browser');
     ReactDOMClient = require('react-dom/client');

packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js

@@ -49,6 +49,7 @@ let streamingContainer;
 
 describe('ReactDOMFizzServer', () => {
   beforeEach(() => {
+    jest.resetModules();
     JSDOM = require('jsdom').JSDOM;
 
     const jsdom = new JSDOM(

packages/react-dom/src/__tests__/ReactDOMFizzServerBrowser-test.js

@@ -20,6 +20,7 @@ let Suspense;
 
 describe('ReactDOMFizzServerBrowser', () => {
   beforeEach(() => {
+    jest.resetModules();
     React = require('react');
     ReactDOMFizzServer = require('react-dom/server.browser');
     Suspense = React.Suspense;