diff --git a/packages/react-devtools-shared/src/__tests__/bridge-test.js b/packages/react-devtools-shared/src/__tests__/bridge-test.js index 1eb56c5362235..fe265e326c982 100644 --- a/packages/react-devtools-shared/src/__tests__/bridge-test.js +++ b/packages/react-devtools-shared/src/__tests__/bridge-test.js @@ -26,7 +26,7 @@ describe('Bridge', () => { // Check that we're wired up correctly. bridge.send('reloadAppForProfiling'); - jest.runOnlyPendingTimers(); + jest.runAllTimers(); expect(wall.send).toHaveBeenCalledWith('reloadAppForProfiling'); // Should flush pending messages and then shut down. @@ -34,7 +34,7 @@ describe('Bridge', () => { bridge.send('update', '1'); bridge.send('update', '2'); bridge.shutdown(); - jest.runOnlyPendingTimers(); + jest.runAllTimers(); expect(wall.send).toHaveBeenCalledWith('update', '1'); expect(wall.send).toHaveBeenCalledWith('update', '2'); expect(wall.send).toHaveBeenCalledWith('shutdown'); @@ -44,7 +44,7 @@ describe('Bridge', () => { jest.spyOn(console, 'warn').mockImplementation(() => {}); wall.send.mockClear(); bridge.send('should not send'); - jest.runOnlyPendingTimers(); + jest.runAllTimers(); expect(wall.send).not.toHaveBeenCalled(); expect(console.warn).toHaveBeenCalledWith( 'Cannot send message "should not send" through a Bridge that has been shutdown.', diff --git a/packages/react-devtools-shared/src/__tests__/legacy/editing-test.js b/packages/react-devtools-shared/src/__tests__/legacy/editing-test.js index e51a78ec6e269..c6da4b5eccdb3 100644 --- a/packages/react-devtools-shared/src/__tests__/legacy/editing-test.js +++ b/packages/react-devtools-shared/src/__tests__/legacy/editing-test.js @@ -20,7 +20,7 @@ describe('editing interface', () => { const act = (callback: Function) => { callback(); - jest.runOnlyPendingTimers(); // Flush Bridge operations + jest.runAllTimers(); // Flush Bridge operations }; const flushPendingUpdates = () => { diff --git a/packages/react-devtools-shared/src/__tests__/legacy/inspectElement-test.js b/packages/react-devtools-shared/src/__tests__/legacy/inspectElement-test.js index 34eab04985a7d..cf1ce1ffa3e38 100644 --- a/packages/react-devtools-shared/src/__tests__/legacy/inspectElement-test.js +++ b/packages/react-devtools-shared/src/__tests__/legacy/inspectElement-test.js @@ -21,7 +21,7 @@ describe('InspectedElementContext', () => { const act = (callback: Function) => { callback(); - jest.runOnlyPendingTimers(); // Flush Bridge operations + jest.runAllTimers(); // Flush Bridge operations }; async function read( diff --git a/packages/react-devtools-shared/src/__tests__/legacy/storeLegacy-v15-test.js b/packages/react-devtools-shared/src/__tests__/legacy/storeLegacy-v15-test.js index a550291fe5d20..e4ef6612ecbd8 100644 --- a/packages/react-devtools-shared/src/__tests__/legacy/storeLegacy-v15-test.js +++ b/packages/react-devtools-shared/src/__tests__/legacy/storeLegacy-v15-test.js @@ -13,7 +13,7 @@ describe('Store (legacy)', () => { let store; const act = (callback: Function) => { callback(); - jest.runOnlyPendingTimers(); // Flush Bridge operations + jest.runAllTimers(); // Flush Bridge operations }; beforeEach(() => { store = global.store; diff --git a/packages/react-devtools-shared/src/__tests__/store-test.js b/packages/react-devtools-shared/src/__tests__/store-test.js index 6f3ee2ca6985b..93c7048b2bc5b 100644 --- a/packages/react-devtools-shared/src/__tests__/store-test.js +++ b/packages/react-devtools-shared/src/__tests__/store-test.js @@ -1978,7 +1978,7 @@ describe('Store', () => { clearErrorsAndWarnings({bridge, store}); // flush events to the renderer - jest.runOnlyPendingTimers(); + jest.runAllTimers(); expect(store).toMatchInlineSnapshot(` [root] @@ -2022,7 +2022,7 @@ describe('Store', () => { clearWarningsForElement({bridge, id, rendererID}); // Flush events to the renderer. - jest.runOnlyPendingTimers(); + jest.runAllTimers(); expect(store).toMatchInlineSnapshot(` ✕ 2, ⚠ 1 @@ -2067,7 +2067,7 @@ describe('Store', () => { clearErrorsForElement({bridge, id, rendererID}); // Flush events to the renderer. - jest.runOnlyPendingTimers(); + jest.runAllTimers(); expect(store).toMatchInlineSnapshot(` ✕ 1, ⚠ 2 diff --git a/packages/react-devtools-shared/src/__tests__/treeContext-test.js b/packages/react-devtools-shared/src/__tests__/treeContext-test.js index efcd70aad7dd6..fa2031c6b5c8d 100644 --- a/packages/react-devtools-shared/src/__tests__/treeContext-test.js +++ b/packages/react-devtools-shared/src/__tests__/treeContext-test.js @@ -1421,21 +1421,21 @@ describe('TreeListContext', () => { function clearAllErrors() { utils.act(() => clearErrorsAndWarningsAPI({bridge, store})); // flush events to the renderer - jest.runOnlyPendingTimers(); + jest.runAllTimers(); } function clearErrorsForElement(id) { const rendererID = store.getRendererIDForElement(id); utils.act(() => clearErrorsForElementAPI({bridge, id, rendererID})); // flush events to the renderer - jest.runOnlyPendingTimers(); + jest.runAllTimers(); } function clearWarningsForElement(id) { const rendererID = store.getRendererIDForElement(id); utils.act(() => clearWarningsForElementAPI({bridge, id, rendererID})); // flush events to the renderer - jest.runOnlyPendingTimers(); + jest.runAllTimers(); } function selectNextErrorOrWarning() { @@ -2358,7 +2358,7 @@ describe('TreeListContext', () => { ); utils.act(() => TestRenderer.create()); - jest.runOnlyPendingTimers(); + jest.runAllTimers(); expect(state).toMatchInlineSnapshot(` [root] diff --git a/packages/react-devtools-shared/src/__tests__/utils.js b/packages/react-devtools-shared/src/__tests__/utils.js index b832c3237ad1c..c22ac6e05dc11 100644 --- a/packages/react-devtools-shared/src/__tests__/utils.js +++ b/packages/react-devtools-shared/src/__tests__/utils.js @@ -81,11 +81,10 @@ export function act( if (recursivelyFlush) { // Flush Bridge operations - // We have always one pending timer running that resets the Owner Stack limit. - while (jest.getTimerCount() > 1) { + while (jest.getTimerCount() > 0) { actDOM(() => { actTestRenderer(() => { - jest.runOnlyPendingTimers(); + jest.runAllTimers(); }); }); } @@ -108,11 +107,10 @@ export async function actAsync( }); if (recursivelyFlush) { - // We have always one pending timer running that resets the Owner Stack limit. - while (jest.getTimerCount() > 1) { + while (jest.getTimerCount() > 0) { await actDOM(async () => { await actTestRenderer(async () => { - jest.runOnlyPendingTimers(); + jest.runAllTimers(); }); }); } diff --git a/packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js b/packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js index 2bf5d7752bc02..5b44d9e02e855 100644 --- a/packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js @@ -2881,7 +2881,7 @@ describe('ReactDOMFizzServer', () => { root.render(); }); await waitForAll([]); - jest.runOnlyPendingTimers(); + jest.runAllTimers(); const clientFallback2 = container.getElementsByTagName('p')[0]; expect(clientFallback2).toBe(serverFallback); @@ -2987,7 +2987,7 @@ describe('ReactDOMFizzServer', () => { // actually force it to re-render on the client and throw away the server one. root.render(); await waitForAll([]); - jest.runOnlyPendingTimers(); + jest.runAllTimers(); assertLog([ 'onRecoverableError: The server could not finish this Suspense boundary, ' + 'likely due to an error during server rendering. ' + @@ -6414,7 +6414,7 @@ describe('ReactDOMFizzServer', () => { ref.current.dispatchEvent( new window.MouseEvent('click', {bubbles: true}), ); - await jest.runOnlyPendingTimers(); + await jest.runAllTimers(); expect(getVisibleChildren(container)).toEqual(); }); diff --git a/packages/react-dom/src/__tests__/ReactDOMFizzServerNode-test.js b/packages/react-dom/src/__tests__/ReactDOMFizzServerNode-test.js index 20bd75bcd76a9..e97b4a29a7497 100644 --- a/packages/react-dom/src/__tests__/ReactDOMFizzServerNode-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMFizzServerNode-test.js @@ -144,14 +144,14 @@ describe('ReactDOMFizzServerNode', () => { }, }, ); - await jest.runOnlyPendingTimers(); + await jest.runAllTimers(); expect(output.result).toBe(''); expect(isCompleteCalls).toBe(0); // Resolve the loading. hasLoaded = true; await resolve(); - await jest.runOnlyPendingTimers(); + await jest.runAllTimers(); expect(output.result).toBe(''); expect(isCompleteCalls).toBe(1); @@ -354,7 +354,7 @@ describe('ReactDOMFizzServerNode', () => { const theReason = new Error('uh oh'); abort(theReason); - jest.runOnlyPendingTimers(); + jest.runAllTimers(); await completed; @@ -632,7 +632,7 @@ describe('ReactDOMFizzServerNode', () => { writable.end(); - await jest.runOnlyPendingTimers(); + await jest.runAllTimers(); hasLoaded = true; resolve(); diff --git a/packages/react-dom/src/__tests__/ReactDOMFizzStaticBrowser-test.js b/packages/react-dom/src/__tests__/ReactDOMFizzStaticBrowser-test.js index 90b13224cf93e..f973a5ed4d6e0 100644 --- a/packages/react-dom/src/__tests__/ReactDOMFizzStaticBrowser-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMFizzStaticBrowser-test.js @@ -225,7 +225,7 @@ describe('ReactDOMFizzStaticBrowser', () => { ), ); - await jest.runOnlyPendingTimers(); + await jest.runAllTimers(); // Resolve the loading. hasLoaded = true; @@ -354,7 +354,7 @@ describe('ReactDOMFizzStaticBrowser', () => { ), ); - await jest.runOnlyPendingTimers(); + await jest.runAllTimers(); const theReason = new Error('aborted for reasons'); controller.abort(theReason); @@ -387,7 +387,7 @@ describe('ReactDOMFizzStaticBrowser', () => { ), ); - await jest.runOnlyPendingTimers(); + await jest.runAllTimers(); const theReason = new Error('aborted for reasons'); controller.abort(theReason); @@ -1377,7 +1377,7 @@ describe('ReactDOMFizzStaticBrowser', () => { ), ); - await jest.runOnlyPendingTimers(); + await jest.runAllTimers(); expect(getVisibleChildren(container)).toEqual(
Loading...
); diff --git a/packages/react-dom/src/__tests__/ReactDOMFizzStaticNode-test.js b/packages/react-dom/src/__tests__/ReactDOMFizzStaticNode-test.js index f439dda9a768f..12ac4de34d684 100644 --- a/packages/react-dom/src/__tests__/ReactDOMFizzStaticNode-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMFizzStaticNode-test.js @@ -103,7 +103,7 @@ describe('ReactDOMFizzStaticNode', () => { , ); - await jest.runOnlyPendingTimers(); + await jest.runAllTimers(); // Resolve the loading. hasLoaded = true; @@ -199,7 +199,7 @@ describe('ReactDOMFizzStaticNode', () => { }, ); - await jest.runOnlyPendingTimers(); + await jest.runAllTimers(); controller.abort(); @@ -228,7 +228,7 @@ describe('ReactDOMFizzStaticNode', () => { }, ); - await jest.runOnlyPendingTimers(); + await jest.runAllTimers(); const theReason = new Error('aborted for reasons'); controller.abort(theReason); @@ -259,7 +259,7 @@ describe('ReactDOMFizzStaticNode', () => { }, ); - await jest.runOnlyPendingTimers(); + await jest.runAllTimers(); const theReason = new Error('aborted for reasons'); controller.abort(theReason); @@ -422,7 +422,7 @@ describe('ReactDOMFizzStaticNode', () => { }, }); - await jest.runOnlyPendingTimers(); + await jest.runAllTimers(); controller.abort('foobar'); @@ -464,7 +464,7 @@ describe('ReactDOMFizzStaticNode', () => { }, }); - await jest.runOnlyPendingTimers(); + await jest.runAllTimers(); controller.abort(new Error('uh oh')); diff --git a/packages/react-dom/src/__tests__/ReactDOMServerPartialHydration-test.internal.js b/packages/react-dom/src/__tests__/ReactDOMServerPartialHydration-test.internal.js index 15bd557b0d0a5..5900a2f448590 100644 --- a/packages/react-dom/src/__tests__/ReactDOMServerPartialHydration-test.internal.js +++ b/packages/react-dom/src/__tests__/ReactDOMServerPartialHydration-test.internal.js @@ -314,7 +314,7 @@ describe('ReactDOMServerPartialHydration', () => { }, }); await waitForAll(['Suspend']); - jest.runOnlyPendingTimers(); + jest.runAllTimers(); // Unchanged expect(container.innerHTML).toBe( @@ -407,7 +407,7 @@ describe('ReactDOMServerPartialHydration', () => { }, }); await waitForAll(['Suspend']); - jest.runOnlyPendingTimers(); + jest.runAllTimers(); // !! Unchanged, continue showing server content while suspended. expect(container.innerHTML).toBe( @@ -425,7 +425,7 @@ describe('ReactDOMServerPartialHydration', () => { 'Component', "onRecoverableError: Hydration failed because the server rendered HTML didn't match the client.", ]); - jest.runOnlyPendingTimers(); + jest.runAllTimers(); // Client rendered - suspense comment nodes removed. expect(container.innerHTML).toBe('Hello
Mismatch
'); @@ -491,7 +491,7 @@ describe('ReactDOMServerPartialHydration', () => { }, }); await waitForAll(['Suspend']); - jest.runOnlyPendingTimers(); + jest.runAllTimers(); // !! Unchanged, continue showing server content while suspended. expect(container.innerHTML).toBe( @@ -509,7 +509,7 @@ describe('ReactDOMServerPartialHydration', () => { 'Component', "onRecoverableError: Hydration failed because the server rendered HTML didn't match the client.", ]); - jest.runOnlyPendingTimers(); + jest.runAllTimers(); // Client rendered - suspense comment nodes removed expect(container.innerHTML).toBe('
Mismatch
'); @@ -585,7 +585,7 @@ describe('ReactDOMServerPartialHydration', () => { }, }); await waitForAll(['Component', 'Suspend']); - jest.runOnlyPendingTimers(); + jest.runAllTimers(); // !! Unchanged, continue showing server content while suspended. expect(container.innerHTML).toBe( @@ -603,7 +603,7 @@ describe('ReactDOMServerPartialHydration', () => { 'Hello', "onRecoverableError: Hydration failed because the server rendered HTML didn't match the client.", ]); - jest.runOnlyPendingTimers(); + jest.runAllTimers(); // Client rendered - suspense comment nodes removed expect(container.innerHTML).toBe( @@ -687,7 +687,7 @@ describe('ReactDOMServerPartialHydration', () => { 'Fallback', "onRecoverableError: Hydration failed because the server rendered HTML didn't match the client.", ]); - jest.runOnlyPendingTimers(); + jest.runAllTimers(); // !! Client switches to suspense fallback. expect(container.innerHTML).toBe('Loading...'); @@ -696,7 +696,7 @@ describe('ReactDOMServerPartialHydration', () => { resolve(); await promise; await waitForAll(['Component', 'Hello']); - jest.runOnlyPendingTimers(); + jest.runAllTimers(); // Client rendered - suspense comment nodes removed expect(container.innerHTML).toBe( @@ -768,7 +768,7 @@ describe('ReactDOMServerPartialHydration', () => { 'Fallback', "onRecoverableError: Hydration failed because the server rendered HTML didn't match the client.", ]); - jest.runOnlyPendingTimers(); + jest.runAllTimers(); // !! Client switches to suspense fallback. expect(container.innerHTML).toBe('Loading...'); @@ -777,7 +777,7 @@ describe('ReactDOMServerPartialHydration', () => { resolve(); await promise; await waitForAll(['Component', 'Hello']); - jest.runOnlyPendingTimers(); + jest.runAllTimers(); // Client rendered - suspense comment nodes removed expect(container.innerHTML).toBe('
'); @@ -848,7 +848,7 @@ describe('ReactDOMServerPartialHydration', () => { 'Fallback', "onRecoverableError: Hydration failed because the server rendered HTML didn't match the client.", ]); - jest.runOnlyPendingTimers(); + jest.runAllTimers(); // !! Client switches to suspense fallback. expect(container.innerHTML).toBe('Loading...'); @@ -861,7 +861,7 @@ describe('ReactDOMServerPartialHydration', () => { 'Component', 'Hello', ]); - jest.runOnlyPendingTimers(); + jest.runAllTimers(); // Client rendered - suspense comment nodes removed expect(container.innerHTML).toBe('
Mismatch
Hello'); @@ -934,7 +934,7 @@ describe('ReactDOMServerPartialHydration', () => { 'Fallback', "onRecoverableError: Hydration failed because the server rendered HTML didn't match the client.", ]); - jest.runOnlyPendingTimers(); + jest.runAllTimers(); // !! Client switches to suspense fallback. expect(container.innerHTML).toBe('Loading...'); @@ -947,7 +947,7 @@ describe('ReactDOMServerPartialHydration', () => { 'Component', 'Hello', ]); - jest.runOnlyPendingTimers(); + jest.runAllTimers(); // Client rendered - suspense comment nodes removed. expect(container.innerHTML).toBe( @@ -2167,7 +2167,7 @@ describe('ReactDOMServerPartialHydration', () => { 'an error during server rendering.', ]); } - jest.runOnlyPendingTimers(); + jest.runAllTimers(); expect(container.textContent).toBe('Hello'); @@ -2709,7 +2709,7 @@ describe('ReactDOMServerPartialHydration', () => { 'an error during server rendering.', ]); } - jest.runOnlyPendingTimers(); + jest.runAllTimers(); expect(ref.current).toBe(span); expect(span.parentNode).not.toBe(null); diff --git a/packages/react-dom/src/__tests__/ReactDOMServerSelectiveHydration-test.internal.js b/packages/react-dom/src/__tests__/ReactDOMServerSelectiveHydration-test.internal.js index 190caf009545e..cbc4b5256c185 100644 --- a/packages/react-dom/src/__tests__/ReactDOMServerSelectiveHydration-test.internal.js +++ b/packages/react-dom/src/__tests__/ReactDOMServerSelectiveHydration-test.internal.js @@ -1008,7 +1008,7 @@ describe('ReactDOMServerSelectiveHydration', () => { dispatchClickEvent(innerDiv); await act(() => { - jest.runOnlyPendingTimers(); + jest.runAllTimers(); Scheduler.unstable_flushAllWithoutAsserting(); OuterScheduler.unstable_flushAllWithoutAsserting(); InnerScheduler.unstable_flushAllWithoutAsserting(); diff --git a/packages/react-dom/src/__tests__/ReactErrorLoggingRecovery-test.js b/packages/react-dom/src/__tests__/ReactErrorLoggingRecovery-test.js index c9a977cf31bfc..d2392b9503153 100644 --- a/packages/react-dom/src/__tests__/ReactErrorLoggingRecovery-test.js +++ b/packages/react-dom/src/__tests__/ReactErrorLoggingRecovery-test.js @@ -68,7 +68,7 @@ describe('ReactErrorLoggingRecovery', () => { root.render(); }); - expect(() => jest.runOnlyPendingTimers()).toThrow(''); + expect(() => jest.runAllTimers()).toThrow(''); await fakeAct(() => { root.render(Hello); diff --git a/packages/react-dom/src/__tests__/ReactTestUtilsAct-test.js b/packages/react-dom/src/__tests__/ReactTestUtilsAct-test.js index 4631d9043258d..64ccc387d75a3 100644 --- a/packages/react-dom/src/__tests__/ReactTestUtilsAct-test.js +++ b/packages/react-dom/src/__tests__/ReactTestUtilsAct-test.js @@ -347,7 +347,7 @@ function runActTests(render, unmount, rerender) { render(, container); }); act(() => { - jest.runOnlyPendingTimers(); + jest.runAllTimers(); }); expect(container.innerHTML).toBe('1'); @@ -370,7 +370,7 @@ function runActTests(render, unmount, rerender) { render(, container); }); await act(async () => { - jest.runOnlyPendingTimers(); + jest.runAllTimers(); }); expect(container.innerHTML).toBe('1'); @@ -417,13 +417,13 @@ function runActTests(render, unmount, rerender) { act(() => { render(, container); // Since effects haven't been flushed yet, this does not advance the timer - jest.runOnlyPendingTimers(); + jest.runAllTimers(); }); expect(container.innerHTML).toBe('1'); act(() => { - jest.runOnlyPendingTimers(); + jest.runAllTimers(); }); expect(container.innerHTML).toBe('2'); diff --git a/packages/react-dom/src/events/__tests__/DOMPluginEventSystem-test.internal.js b/packages/react-dom/src/events/__tests__/DOMPluginEventSystem-test.internal.js index 04cc4e389b012..5c9f8e7ce388d 100644 --- a/packages/react-dom/src/events/__tests__/DOMPluginEventSystem-test.internal.js +++ b/packages/react-dom/src/events/__tests__/DOMPluginEventSystem-test.internal.js @@ -2710,7 +2710,7 @@ describe('DOMPluginEventSystem', () => { await act(() => { root.render(); }); - jest.runOnlyPendingTimers(); + jest.runAllTimers(); const inner = innerRef.current; const target = createEventTarget(inner); @@ -2722,7 +2722,7 @@ describe('DOMPluginEventSystem', () => { await act(() => { root.render(); }); - jest.runOnlyPendingTimers(); + jest.runAllTimers(); expect(onBeforeBlur).toHaveBeenCalledTimes(1); expect(onAfterBlur).toHaveBeenCalledTimes(1); @@ -2796,7 +2796,7 @@ describe('DOMPluginEventSystem', () => { await act(() => { root.render(); }); - jest.runOnlyPendingTimers(); + jest.runAllTimers(); const inner = innerRef.current; const target = createEventTarget(inner); @@ -2807,7 +2807,7 @@ describe('DOMPluginEventSystem', () => { await act(() => { root.render(); }); - jest.runOnlyPendingTimers(); + jest.runAllTimers(); expect(onBeforeBlur).toHaveBeenCalledTimes(1); resolve(); diff --git a/packages/react-reconciler/src/__tests__/ReactConfigurableErrorLogging-test.js b/packages/react-reconciler/src/__tests__/ReactConfigurableErrorLogging-test.js index cc2711d470041..4cdde5ce64636 100644 --- a/packages/react-reconciler/src/__tests__/ReactConfigurableErrorLogging-test.js +++ b/packages/react-reconciler/src/__tests__/ReactConfigurableErrorLogging-test.js @@ -188,7 +188,7 @@ describe('ReactConfigurableErrorLogging', () => { // The error thrown in caughtError should be rethrown with a clean stack expect(() => { - jest.runOnlyPendingTimers(); + jest.runAllTimers(); }).toThrow('onCaughtError error'); }); diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorLogging-test.js b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorLogging-test.js index 73336503518e1..3dde9c75bf038 100644 --- a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorLogging-test.js +++ b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorLogging-test.js @@ -209,7 +209,7 @@ describe('ReactIncrementalErrorLogging', () => { } // The error thrown in logCapturedError should be rethrown with a clean stack expect(() => { - jest.runOnlyPendingTimers(); + jest.runAllTimers(); }).toThrow('logCapturedError error'); }); diff --git a/packages/react-reconciler/src/__tests__/ReactSiblingPrerendering-test.js b/packages/react-reconciler/src/__tests__/ReactSiblingPrerendering-test.js index b21f3e64a749e..ceb32160976e0 100644 --- a/packages/react-reconciler/src/__tests__/ReactSiblingPrerendering-test.js +++ b/packages/react-reconciler/src/__tests__/ReactSiblingPrerendering-test.js @@ -393,7 +393,7 @@ describe('ReactSiblingPrerendering', () => { expect(root).toMatchRenderedOutput(
Loading outer...
); // Fire the timer to commit the outer fallback. - jest.runOnlyPendingTimers(); + jest.runAllTimers(); expect(root).toMatchRenderedOutput(
A
@@ -471,7 +471,7 @@ describe('ReactSiblingPrerendering', () => { // block the inner Suspense fallback from appearing. await waitForPaint(['A', 'Suspend! [B]', 'Loading inner...']); // (Since this is a retry, the commit phase is throttled by a timer.) - jest.runOnlyPendingTimers(); + jest.runAllTimers(); // The inner fallback is now visible. expect(root).toMatchRenderedOutput( <> diff --git a/packages/react-server-dom-fb/src/__tests__/ReactDOMServerFB-test.internal.js b/packages/react-server-dom-fb/src/__tests__/ReactDOMServerFB-test.internal.js index c867083137a27..35b41cbd230d0 100644 --- a/packages/react-server-dom-fb/src/__tests__/ReactDOMServerFB-test.internal.js +++ b/packages/react-server-dom-fb/src/__tests__/ReactDOMServerFB-test.internal.js @@ -85,12 +85,12 @@ describe('ReactDOMServerFB', () => { }, }, ); - await jest.runOnlyPendingTimers(); + await jest.runAllTimers(); // Resolve the loading. hasLoaded = true; await resolve(); - await jest.runOnlyPendingTimers(); + await jest.runAllTimers(); const result = readResult(stream); expect(result).toMatchInlineSnapshot(`"
Done
"`); diff --git a/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js b/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js index 43d3aa43419c0..f3fa444fc1528 100644 --- a/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js +++ b/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js @@ -1992,10 +1992,7 @@ describe('ReactFlightDOMBrowser', () => { hasLoaded = true; resolve(); - // We have always one pending timer running that resets the Owner Stack limit. - while (jest.getTimerCount() > 1) { - await jest.runOnlyPendingTimers(); - } + await jest.runAllTimers(); expect(rendered).toBe(false); diff --git a/packages/use-subscription/src/__tests__/useSubscription-test.js b/packages/use-subscription/src/__tests__/useSubscription-test.js index e1b3a772a3f45..6642ab35afb1f 100644 --- a/packages/use-subscription/src/__tests__/useSubscription-test.js +++ b/packages/use-subscription/src/__tests__/useSubscription-test.js @@ -588,7 +588,7 @@ describe('useSubscription', () => { await waitForAll(['render:first:B', 'render:second:B']); // No more pending updates - jest.runOnlyPendingTimers(); + jest.runAllTimers(); // Partial update "B" -> "C" // Interrupt with a second mutation "C" -> "D". @@ -604,7 +604,7 @@ describe('useSubscription', () => { await waitForAll(['render:first:D', 'render:second:D']); // No more pending updates - jest.runOnlyPendingTimers(); + jest.runAllTimers(); }); }); });