{"patch":"diff --git a\/packages\/react-dom\/src\/__tests__\/ReactCompositeComponent-test.js b\/packages\/react-dom\/src\/__tests__\/ReactCompositeComponent-test.js\nindex e098c93ca7..4630f9ddbc 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactCompositeComponent-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactCompositeComponent-test.js\n@@ -913,15 +913,13 @@ describe('ReactCompositeComponent', () => {\n await act(() => {\n root.render();\n });\n+\n+ assertLog(['A componentWillMount', 'A render', 'A componentDidMount']);\n await act(() => {\n root.render();\n });\n \n assertLog([\n- 'A componentWillMount',\n- 'A render',\n- 'A componentDidMount',\n-\n 'B componentWillMount',\n 'B render',\n 'A componentWillUnmount',\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMFizzDeferredValue-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMFizzDeferredValue-test.js\nindex 0b3335dfba..fbfb00df87 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMFizzDeferredValue-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMFizzDeferredValue-test.js\n@@ -111,9 +111,11 @@ describe('ReactDOMFizzForm', () => {\n await readIntoContainer(stream);\n expect(container.textContent).toEqual('Loading...');\n \n+ assertLog(['Loading...']);\n \/\/ After hydration, it's updated to the final value\n await act(() => ReactDOMClient.hydrateRoot(container, ));\n expect(container.textContent).toEqual('Final');\n+ assertLog(['Loading...', 'Final']);\n },\n );\n \ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMNativeEventHeuristic-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMNativeEventHeuristic-test.js\nindex 6b445f9cf8..13b754ecf0 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMNativeEventHeuristic-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMNativeEventHeuristic-test.js\n@@ -297,6 +297,7 @@ describe('ReactDOMNativeEventHeuristic-test', () => {\n });\n expect(container.textContent).toEqual('not hovered');\n \n+ assertLog(['not hovered']);\n await act(async () => {\n \/\/ Note: React does not use native mouseenter\/mouseleave events\n \/\/ but we should still correctly determine their priority.\n@@ -308,7 +309,7 @@ describe('ReactDOMNativeEventHeuristic-test', () => {\n dispatchAndSetCurrentEvent(target.current, mouseEnterEvent);\n \n \/\/ Since mouse end is not discrete, should not have updated yet\n- assertLog(['not hovered']);\n+ assertLog([]);\n expect(container.textContent).toEqual('not hovered');\n \n await waitFor(['hovered']);\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMRoot-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMRoot-test.js\nindex 45f6fc095c..f36f45a1e2 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMRoot-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMRoot-test.js\n@@ -342,12 +342,13 @@ describe('ReactDOMRoot', () => {\n root.render();\n });\n \n+ assertLog(['a']);\n expect(container.textContent).toEqual('a');\n \n await act(async () => {\n root.render();\n \n- assertLog(['a']);\n+ assertLog([]);\n expect(container.textContent).toEqual('a');\n \n await waitFor(['b']);\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMSuspensePlaceholder-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMSuspensePlaceholder-test.js\nindex 69789ad482..61047322f9 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMSuspensePlaceholder-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMSuspensePlaceholder-test.js\n@@ -17,6 +17,7 @@ let Suspense;\n let Scheduler;\n let act;\n let textCache;\n+let assertLog;\n \n describe('ReactDOMSuspensePlaceholder', () => {\n let container;\n@@ -31,6 +32,7 @@ describe('ReactDOMSuspensePlaceholder', () => {\n ReactDOMClient = require('react-dom\/client');\n Scheduler = require('scheduler');\n act = require('internal-test-utils').act;\n+ assertLog = require('internal-test-utils').assertLog;\n Suspense = React.Suspense;\n container = document.createElement('div');\n document.body.appendChild(container);\n@@ -157,11 +159,11 @@ describe('ReactDOMSuspensePlaceholder', () => {\n });\n \n expect(container.textContent).toEqual('Loading...');\n-\n+ assertLog(['A', 'Suspend! [B]', 'Loading...']);\n await act(() => {\n resolveText('B');\n });\n-\n+ assertLog(['A', 'B', 'C']);\n expect(container.textContent).toEqual('ABC');\n });\n \ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactEmptyComponent-test.js b\/packages\/react-dom\/src\/__tests__\/ReactEmptyComponent-test.js\nindex 0cb47904b6..de22540c54 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactEmptyComponent-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactEmptyComponent-test.js\n@@ -115,17 +115,14 @@ describe('ReactEmptyComponent', () => {\n root1.render(instance1);\n });\n \n+ assertLog(['mount undefined', 'update DIV']);\n+\n const root2 = ReactDOMClient.createRoot(container2);\n await act(() => {\n root2.render(instance2);\n });\n \n- assertLog([\n- 'mount undefined',\n- 'update DIV',\n- 'mount DIV',\n- 'update undefined',\n- ]);\n+ assertLog(['mount DIV', 'update undefined']);\n });\n \n it('should be able to switch in a list of children', async () => {\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactUpdaters-test.internal.js b\/packages\/react-reconciler\/src\/__tests__\/ReactUpdaters-test.internal.js\nindex a14e29daaf..3f7fcd28ae 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactUpdaters-test.internal.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactUpdaters-test.internal.js\n@@ -112,11 +112,13 @@ describe('updaters', () => {\n root.render();\n });\n expect(allSchedulerTags).toEqual([[HostRoot]]);\n+ assertLog(['onCommitRoot']);\n \n await act(() => {\n root.render();\n });\n expect(allSchedulerTags).toEqual([[HostRoot], [HostRoot]]);\n+ assertLog(['onCommitRoot']);\n });\n \n it('should report a function component as the scheduler for a hooks update', async () => {\n@@ -148,12 +150,13 @@ describe('updaters', () => {\n expect(scheduleForA).not.toBeNull();\n expect(scheduleForB).not.toBeNull();\n expect(allSchedulerTypes).toEqual([[null]]);\n+ assertLog(['onCommitRoot']);\n \n await act(() => {\n scheduleForA();\n });\n expect(allSchedulerTypes).toEqual([[null], [SchedulingComponentA]]);\n-\n+ assertLog(['onCommitRoot']);\n await act(() => {\n scheduleForB();\n });\n@@ -162,6 +165,7 @@ describe('updaters', () => {\n [SchedulingComponentA],\n [SchedulingComponentB],\n ]);\n+ assertLog(['onCommitRoot']);\n });\n \n it('should report a class component as the scheduler for a setState update', async () => {\n@@ -180,7 +184,7 @@ describe('updaters', () => {\n root.render();\n });\n expect(allSchedulerTypes).toEqual([[null]]);\n-\n+ assertLog(['onCommitRoot']);\n expect(instance).not.toBeNull();\n await act(() => {\n instance.setState({});\ndiff --git a\/packages\/use-subscription\/src\/__tests__\/useSubscription-test.js b\/packages\/use-subscription\/src\/__tests__\/useSubscription-test.js\nindex aff10a7967..d54d806354 100644\n--- a\/packages\/use-subscription\/src\/__tests__\/useSubscription-test.js\n+++ b\/packages\/use-subscription\/src\/__tests__\/useSubscription-test.js\n@@ -338,6 +338,8 @@ describe('useSubscription', () => {\n observableB.next('b-3');\n });\n \n+ assertLog(['Grandchild: b-0', 'Child: b-3', 'Grandchild: b-3']);\n+\n \/\/ Update again\n await act(() => root.render());\n \n@@ -345,13 +347,7 @@ describe('useSubscription', () => {\n \/\/ We expect the last emitted update to be rendered (because of the commit phase value check)\n \/\/ But the intermediate ones should be ignored,\n \/\/ And the final rendered output should be the higher-priority observable.\n- assertLog([\n- 'Grandchild: b-0',\n- 'Child: b-3',\n- 'Grandchild: b-3',\n- 'Child: a-0',\n- 'Grandchild: a-0',\n- ]);\n+ assertLog(['Child: a-0', 'Grandchild: a-0']);\n expect(log).toEqual([\n 'Parent.componentDidMount',\n 'Parent.componentDidUpdate',\ndiff --git a\/packages\/use-sync-external-store\/src\/__tests__\/useSyncExternalStoreShared-test.js b\/packages\/use-sync-external-store\/src\/__tests__\/useSyncExternalStoreShared-test.js\nindex b8f66d15c8..e01ef57c10 100644\n--- a\/packages\/use-sync-external-store\/src\/__tests__\/useSyncExternalStoreShared-test.js\n+++ b\/packages\/use-sync-external-store\/src\/__tests__\/useSyncExternalStoreShared-test.js\n@@ -660,14 +660,17 @@ describe('Shared useSyncExternalStore behavior (shim and built-in)', () => {\n \/\/ Object.is algorithm to compare values.\n await act(() => root.render());\n expect(container.textContent).toEqual('NaN');\n+ assertLog([NaN]);\n \n \/\/ Update to real number\n await act(() => store.set(123));\n expect(container.textContent).toEqual('123');\n+ assertLog([123]);\n \n \/\/ Update back to NaN\n await act(() => store.set('not a number'));\n expect(container.textContent).toEqual('NaN');\n+ assertLog([NaN]);\n });\n \n describe('extra features implemented in user-space', () => {\n@@ -968,6 +971,7 @@ describe('Shared useSyncExternalStore behavior (shim and built-in)', () => {\n ),\n );\n \n+ assertLog(['A']);\n expect(container.textContent).toEqual('A');\n \n if (__DEV__ && gate(flags => flags.enableUseSyncExternalStoreShim)) {\n@@ -1017,6 +1021,7 @@ describe('Shared useSyncExternalStore behavior (shim and built-in)', () => {\n ),\n );\n \n+ assertLog(['A']);\n expect(container.textContent).toEqual('A');\n \n if (__DEV__ && gate(flags => flags.enableUseSyncExternalStoreShim)) {\n","parents":["ed3c65caf042f75fe2fdc2a5e568a9624c6175fb"],"files":[{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactCompositeComponent-test.js"},{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactDOMFizzDeferredValue-test.js"},{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactDOMNativeEventHeuristic-test.js"},{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactDOMRoot-test.js"},{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactDOMSuspensePlaceholder-test.js"},{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactEmptyComponent-test.js"},{"status":"M","path":"packages\/react-reconciler\/src\/__tests__\/ReactUpdaters-test.internal.js"},{"status":"M","path":"packages\/use-subscription\/src\/__tests__\/useSubscription-test.js"},{"status":"M","path":"packages\/use-sync-external-store\/src\/__tests__\/useSyncExternalStoreShared-test.js"}],"commit":{"shortRevision":"42eff4bc78","authorName":"Ricky","authorEmail":"rickhanlonii@gmail.com","authoredAt":"2024-04-10T10:33:41-04:00","subject":"[tests] Fix assertions not flushed before act (#28745)","revision":"42eff4bc78a3636953c55096ca0b220c611a74cc"},"body":"Fixes some easy cases blocking\r\nhttps:\/\/github.com\/facebook\/react\/pull\/28737, I'll follow up with more\r\ncomplex\/interesting cases in other PRs."}

dillon1000/react

Files changed