enable for all jest environments/renderers; pass (most) tests.

packages/react-art/src/ReactARTHostConfig.js

@@ -424,5 +424,3 @@ export function unhideInstance(instance, props) {
 export function unhideTextInstance(textInstance, text): void {
   // Noop
 }
-
-export const shouldWarnForUnbatchedSetState = false;

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

@@ -13,12 +13,14 @@
 let React;
 let ReactTestRenderer;
 let ReactDebugTools;
+let act;
 
-describe('ReactHooksInspectionIntergration', () => {
+describe('ReactHooksInspectionIntegration', () => {
   beforeEach(() => {
     jest.resetModules();
     React = require('react');
     ReactTestRenderer = require('react-test-renderer');
+    act = ReactTestRenderer.act;
     ReactDebugTools = require('react-debug-tools');
   });
 
@@ -47,7 +49,7 @@ describe('ReactHooksInspectionIntergration', () => {
       onMouseUp: setStateB,
     } = renderer.root.findByType('div').props;
 
-    setStateA('Hi');
+    act(() => setStateA('Hi'));
 
     childFiber = renderer.root.findByType(Foo)._currentFiber();
     tree = ReactDebugTools.inspectHooksOfFiber(childFiber);
@@ -57,7 +59,7 @@ describe('ReactHooksInspectionIntergration', () => {
       {name: 'State', value: 'world', subHooks: []},
     ]);
 
-    setStateB('world!');
+    act(() => setStateB('world!'));
 
     childFiber = renderer.root.findByType(Foo)._currentFiber();
     tree = ReactDebugTools.inspectHooksOfFiber(childFiber);
@@ -120,7 +122,7 @@ describe('ReactHooksInspectionIntergration', () => {
       {name: 'Callback', value: updateStates, subHooks: []},
     ]);
 
-    updateStates();
+    act(updateStates);
 
     childFiber = renderer.root.findByType(Foo)._currentFiber();
     tree = ReactDebugTools.inspectHooksOfFiber(childFiber);
@@ -132,7 +134,7 @@ describe('ReactHooksInspectionIntergration', () => {
       {name: 'LayoutEffect', value: effect, subHooks: []},
       {name: 'Effect', value: effect, subHooks: []},
       {name: 'ImperativeHandle', value: outsideRef.current, subHooks: []},
-      {name: 'Memo', value: 'Ab', subHooks: []},
+      {name: 'Memo', value: 'AB', subHooks: []},
       {name: 'Callback', value: updateStates, subHooks: []},
     ]);
   });

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

@@ -15,6 +15,7 @@ let Suspense;
 let ReactCache;
 let ReactTestUtils;
 let TextResource;
+let act;
 
 describe('ReactDOMSuspensePlaceholder', () => {
   let container;
@@ -25,6 +26,7 @@ describe('ReactDOMSuspensePlaceholder', () => {
     ReactDOM = require('react-dom');
     ReactCache = require('react-cache');
     ReactTestUtils = require('react-dom/test-utils');
+    act = ReactTestUtils.act;
     Suspense = React.Suspense;
     container = document.createElement('div');
     document.body.appendChild(container);
@@ -144,16 +146,12 @@ describe('ReactDOMSuspensePlaceholder', () => {
         );
       }
 
-      ReactTestUtils.act(() => {
-        ReactDOM.render(<App />, container);
-      });
+      act(() => ReactDOM.render(<App />, container));
       expect(container.innerHTML).toEqual(
         '<span style="display: none;">Sibling</span><span style="display: none;"></span>Loading...',
       );
 
-      ReactTestUtils.act(() => {
-        setIsVisible(true);
-      });
+      act(() => setIsVisible(true));
       expect(container.innerHTML).toEqual(
         '<span style="display: none;">Sibling</span><span style="display: none;"></span>Loading...',
       );

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

@@ -14,6 +14,7 @@ let React;
 let ReactDOM;
 let ReactDOMServer;
 let ReactTestUtils;
+let act;
 
 function getTestDocument(markup) {
   const doc = document.implementation.createHTMLDocument('');
@@ -33,6 +34,7 @@ describe('ReactTestUtils', () => {
     ReactDOM = require('react-dom');
     ReactDOMServer = require('react-dom/server');
     ReactTestUtils = require('react-dom/test-utils');
+    act = ReactTestUtils.act;
   });
 
   it('Simulate should have locally attached media events', () => {
@@ -526,7 +528,7 @@ describe('ReactTestUtils', () => {
 
     try {
       let called = false;
-      ReactTestUtils.act(() => {
+      act(() => {
         ReactDOM.render(
           <App
             callback={() => {
@@ -543,6 +545,51 @@ describe('ReactTestUtils', () => {
     }
   });
 
+  it('flushes effects on every call', () => {
+    function App(props) {
+      let [ctr, setCtr] = React.useState(0);
+      React.useEffect(() => {
+        props.callback(ctr);
+      });
+      return (
+        <button id="button" onClick={() => setCtr(x => x + 1)}>
+          click me!
+        </button>
+      );
+    }
+
+    const container = document.createElement('div');
+    document.body.appendChild(container);
+    let calledCtr = 0;
+    act(() =>
+      ReactDOM.render(
+        <App
+          callback={val => {
+            calledCtr = val;
+          }}
+        />,
+        container,
+      ),
+    );
+    const button = document.getElementById('button');
+    function click() {
+      button.dispatchEvent(new MouseEvent('click', {bubbles: true}));
+    }
+
+    act(() => {
+      click();
+      click();
+      click();
+    });
+    expect(calledCtr).toBe(3);
+    act(click);
+    expect(calledCtr).toBe(4);
+    act(click);
+    expect(calledCtr).toBe(5);
+
+    document.body.removeChild(container);
+  });
+
   it('can use act to batch effects on updates too', () => {
     function App() {
       let [ctr, setCtr] = React.useState(0);
@@ -555,19 +602,15 @@ describe('ReactTestUtils', () => {
     const container = document.createElement('div');
     document.body.appendChild(container);
     let button;
-    ReactTestUtils.act(() => {
-      ReactDOM.render(<App />, container);
-    });
+    act(() => ReactDOM.render(<App />, container));
     button = document.getElementById('button');
     expect(button.innerHTML).toBe('0');
-    ReactTestUtils.act(() => {
-      button.dispatchEvent(new MouseEvent('click', {bubbles: true}));
-    });
+    act(() => button.dispatchEvent(new MouseEvent('click', {bubbles: true})));
     expect(button.innerHTML).toBe('1');
     document.body.removeChild(container);
   });
 
-  it('detects setState being called outside of .act()', () => {
+  it('detects setState being called outside of act(...)', () => {
     let setValueRef = null;
     function App() {
       let [value, setValue] = React.useState(0);
@@ -581,15 +624,15 @@ describe('ReactTestUtils', () => {
     const container = document.createElement('div');
     document.body.appendChild(container);
     let button;
-    ReactTestUtils.act(() => {
+    act(() => {
       ReactDOM.render(<App />, container);
       button = container.querySelector('#button');
       button.dispatchEvent(new MouseEvent('click', {bubbles: true}));
     });
     expect(button.innerHTML).toBe('2');
     expect(() => setValueRef(1)).toWarnDev(
       [
-        'It looks like you are in a test environment, trying to set state outside of TestUtils.act(...).',
+        'It looks like you are in a test environment, trying to set state outside of an act(...) call.',
       ],
       {withoutStack: 1},
     );
@@ -609,10 +652,8 @@ describe('ReactTestUtils', () => {
     }
     const container = document.createElement('div');
 
-    ReactTestUtils.act(() => {
-      ReactTestUtils.act(() => {
-        ReactDOM.render(<App />, container);
-      });
+    act(() => {
+      act(() => ReactDOM.render(<App />, container));
       jest.advanceTimersByTime(250);
     });
 

packages/react-dom/src/client/ReactDOMHostConfig.js

@@ -39,7 +39,6 @@ import {
   DOCUMENT_FRAGMENT_NODE,
 } from '../shared/HTMLNodeType';
 import dangerousStyleValue from '../shared/dangerousStyleValue';
-import {canUseDOM} from 'shared/ExecutionEnvironment';
 
 import type {DOMContainer} from './ReactDOM';
 
@@ -648,20 +647,3 @@ export function didNotFindHydratableTextInstance(
     warnForInsertedHydratedText(parentInstance, text);
   }
 }
-
-// in a dom-like test environment, we want to warn if dispatchAction()
-// is called outside of a batchedUpdates/TestUtils.act(...) call.
-let ensureBatchedDispatchedActions = false;
-
-if (__DEV__) {
-  if (
-    canUseDOM &&
-    (navigator.userAgent.indexOf('Node.js') >= 0 ||
-      navigator.userAgent.indexOf('jsdom') >= 0)
-    // we should probably add puppeteer-like environments here too
-  ) {
-    ensureBatchedDispatchedActions = true;
-  }
-}
-
-export const shouldWarnForUnbatchedSetState = ensureBatchedDispatchedActions;

packages/react-dom/src/test-utils/ReactTestUtils.js

@@ -145,8 +145,7 @@ function validateClassInstance(inst, methodName) {
   );
 }
 
-// stub elements used by act() when flushing effects
-let actElement = <div />;
+// stub element used by act() when flushing effects
 let actContainerElement = document.createElement('div');
 
 /**
@@ -387,7 +386,7 @@ const ReactTestUtils = {
 
   act<X>(callback: () => X): X {
     let result = ReactDOM.unstable_batchedUpdates(callback);
-    ReactDOM.render(actElement, actContainerElement);
+    ReactDOM.render(<div />, actContainerElement);
     return result;
   },
 };

packages/react-native-renderer/src/ReactFabricHostConfig.js

@@ -436,5 +436,3 @@ export function replaceContainerChildren(
   container: Container,
   newChildren: ChildSet,
 ): void {}
-
-export const shouldWarnForUnbatchedSetState = false;

packages/react-native-renderer/src/ReactNativeHostConfig.js

@@ -486,5 +486,3 @@ export function unhideTextInstance(
 ): void {
   throw new Error('Not yet implemented.');
 }
-
-export const shouldWarnForUnbatchedSetState = false;

packages/react-noop-renderer/src/createReactNoop.js

@@ -848,6 +848,12 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
 
     interactiveUpdates: NoopRenderer.interactiveUpdates,
 
+    // maybe this should exist only in the test file
+    act<X>(callback: void => X): X {
+      return NoopRenderer.batchedUpdates(callback);
+      // flush updates?
+    },
+
     flushSync(fn: () => mixed) {
       yieldedValues = [];
       NoopRenderer.flushSync(fn);

packages/react-reconciler/src/ReactFiberHooks.js

@@ -36,7 +36,6 @@ import {
   requestCurrentTime,
 } from './ReactFiberScheduler';
 
-import {shouldWarnForUnbatchedSetState} from './ReactFiberHostConfig';
 import invariant from 'shared/invariant';
 import warning from 'shared/warning';
 import getComponentName from 'shared/getComponentName';
@@ -1005,6 +1004,19 @@ function updateMemo<T>(
   return nextValue;
 }
 
+// in a test-like environment, we want to warn if dispatchAction()
+// is called outside of a batchedUpdates/TestUtils.act(...) call.
+let shouldWarnForUnbatchedSetState = false;
+
+if (__DEV__) {
+  // jest isnt' a 'global', it's just exposed to tests via a wrapped function
+  // further, this isn't a test file, so flow doesn't recognize the symbol. So...
+  // $FlowExpectedError - because requirements don't give a damn about your type sigs.
+  if ('undefined' !== typeof jest) {
+    shouldWarnForUnbatchedSetState = true;
+  }
+}
+
 function dispatchAction<S, A>(
   fiber: Fiber,
   queue: UpdateQueue<S, A>,

packages/react-reconciler/src/ReactFiberScheduler.js

@@ -1799,9 +1799,9 @@ export function ensureBatchingAndScheduleWork(
       warningWithoutStack(
         false,
         'It looks like you are in a test environment, trying to ' +
-          'set state outside of TestUtils.act(...). ' +
+          'set state outside of an act(...) call. ' +
           'This could lead to unexpected ui while testing. Use ' +
-          'ReactTestUtils.act(...) to batch your updates and remove this warning.',
+          'act(...) to batch your updates and remove this warning.',
       );
     }
   }