{"body":"","patch":"diff --git a\/packages\/react-dom\/src\/__tests__\/ReactTestUtilsActUnmockedScheduler-test.js b\/packages\/react-dom\/src\/__tests__\/ReactTestUtilsActUnmockedScheduler-test.js\nindex a38d4c0698..d7ed05673c 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactTestUtilsActUnmockedScheduler-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactTestUtilsActUnmockedScheduler-test.js\n@@ -10,10 +10,11 @@\n \/\/ sanity tests to make sure act() works without a mocked scheduler\n \n let React;\n-let ReactDOM;\n+let ReactDOMClient;\n let act;\n let container;\n let yields;\n+let prevActGlobal;\n \n function clearLog() {\n try {\n@@ -23,32 +24,26 @@ function clearLog() {\n }\n }\n \n-function render(el, dom) {\n- ReactDOM.render(el, dom);\n-}\n-\n-function unmount(dom) {\n- ReactDOM.unmountComponentAtNode(dom);\n-}\n-\n beforeEach(() => {\n+ prevActGlobal = global.IS_REACT_ACT_ENVIRONMENT;\n+ global.IS_REACT_ACT_ENVIRONMENT = true;\n jest.resetModules();\n jest.unmock('scheduler');\n yields = [];\n React = require('react');\n- ReactDOM = require('react-dom');\n+ ReactDOMClient = require('react-dom\/client');\n act = React.unstable_act;\n container = document.createElement('div');\n document.body.appendChild(container);\n });\n \n afterEach(() => {\n- unmount(container);\n+ global.IS_REACT_ACT_ENVIRONMENT = prevActGlobal;\n document.body.removeChild(container);\n });\n \n \/\/ @gate __DEV__\n-it('can use act to flush effects', () => {\n+it('can use act to flush effects', async () => {\n function App() {\n React.useEffect(() => {\n yields.push(100);\n@@ -56,15 +51,16 @@ it('can use act to flush effects', () => {\n return null;\n }\n \n- act(() => {\n- render(, container);\n+ const root = ReactDOMClient.createRoot(container);\n+ await act(() => {\n+ root.render();\n });\n \n expect(clearLog()).toEqual([100]);\n });\n \n \/\/ @gate __DEV__\n-it('flushes effects on every call', () => {\n+it('flushes effects on every call', async () => {\n function App() {\n const [ctr, setCtr] = React.useState(0);\n React.useEffect(() => {\n@@ -77,8 +73,9 @@ it('flushes effects on every call', () => {\n );\n }\n \n- act(() => {\n- render(, container);\n+ const root = ReactDOMClient.createRoot(container);\n+ await act(() => {\n+ root.render();\n });\n \n expect(clearLog()).toEqual([0]);\n@@ -103,7 +100,7 @@ it('flushes effects on every call', () => {\n });\n \n \/\/ @gate __DEV__\n-it(\"should keep flushing effects until they're done\", () => {\n+it(\"should keep flushing effects until they're done\", async () => {\n function App() {\n const [ctr, setCtr] = React.useState(0);\n React.useEffect(() => {\n@@ -114,25 +111,27 @@ it(\"should keep flushing effects until they're done\", () => {\n return ctr;\n }\n \n- act(() => {\n- render(, container);\n+ const root = ReactDOMClient.createRoot(container);\n+ await act(() => {\n+ root.render();\n });\n \n expect(container.innerHTML).toEqual('5');\n });\n \n \/\/ @gate __DEV__\n-it('should flush effects only on exiting the outermost act', () => {\n+it('should flush effects only on exiting the outermost act', async () => {\n function App() {\n React.useEffect(() => {\n yields.push(0);\n });\n return null;\n }\n+ const root = ReactDOMClient.createRoot(container);\n \/\/ let's nest a couple of act() calls\n- act(() => {\n- act(() => {\n- render(, container);\n+ await act(async () => {\n+ await act(() => {\n+ root.render();\n });\n \/\/ the effect wouldn't have yielded yet because\n \/\/ we're still inside an act() scope\n@@ -150,7 +149,9 @@ it('can handle cascading promises', async () => {\n const [state, setState] = React.useState(0);\n async function ticker() {\n await null;\n- setState(x => x + 1);\n+ await act(() => {\n+ setState(x => x + 1);\n+ });\n }\n React.useEffect(() => {\n yields.push(state);\n@@ -159,8 +160,9 @@ it('can handle cascading promises', async () => {\n return state;\n }\n \n- await act(async () => {\n- render(, container);\n+ const root = ReactDOMClient.createRoot(container);\n+ await act(() => {\n+ root.render();\n });\n \/\/ all 5 ticks present and accounted for\n expect(clearLog()).toEqual([0, 1, 2, 3, 4]);\n","parents":["766eac46bb52bda28f87c11740214a4444ca881b"],"files":[{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactTestUtilsActUnmockedScheduler-test.js"}],"commit":{"authorEmail":"jackpope1@gmail.com","authoredAt":"2024-01-26T17:17:34-05:00","revision":"38997cf19ac5223a7c748ba975b40d649b9c4c52","authorName":"Jack Pope","shortRevision":"38997cf19a","subject":"Use createRoot in ReactTestUtilsActUnmockedScheduler-test (#28086)"}}

dillon1000/react

Files changed