{"commit":{"authorEmail":"git@andrewclark.io","shortRevision":"fc90eb6368","revision":"fc90eb636876d54d99ace2773dd4923f3e848106","subject":"Codemod more tests to waitFor pattern (#26494)","authorName":"Andrew Clark","authoredAt":"2023-03-28T00:03:57-04:00"},"body":"","parents":["e0bbc2662301e0d6c9a0cd601c22f7f27e1f56b2"],"files":[{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactUpdates-test.js"},{"status":"M","path":"packages\/react-reconciler\/src\/__tests__\/ReactIncrementalUpdates-test.js"}],"patch":"diff --git a\/packages\/react-dom\/src\/__tests__\/ReactUpdates-test.js b\/packages\/react-dom\/src\/__tests__\/ReactUpdates-test.js\nindex 3c900a1987..67abeb6dd0 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactUpdates-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactUpdates-test.js\n@@ -1627,7 +1627,6 @@ describe('ReactUpdates', () => {\n const [step, setStep] = React.useState(0);\n React.useEffect(() => {\n setStep(x => x + 1);\n- Scheduler.log(step);\n });\n return step;\n }\n@@ -1642,23 +1641,19 @@ describe('ReactUpdates', () => {\n console.error = (e, s) => {\n error = e;\n stack = s;\n+ Scheduler.log('stop');\n };\n try {\n const container = document.createElement('div');\n- expect(() => {\n- const root = ReactDOMClient.createRoot(container);\n- root.render();\n- while (error === null) {\n- Scheduler.unstable_flushNumberOfYields(1);\n- Scheduler.unstable_clearLog();\n- }\n- expect(stack).toContain(' NonTerminating');\n- \/\/ rethrow error to prevent going into an infinite loop when act() exits\n- throw error;\n- }).toThrow('Maximum update depth exceeded.');\n+ const root = ReactDOMClient.createRoot(container);\n+ root.render();\n+ await waitFor(['stop']);\n } finally {\n console.error = originalConsoleError;\n }\n+\n+ expect(error).toContain('Maximum update depth exceeded');\n+ expect(stack).toContain('at NonTerminating');\n });\n \n it('can have nested updates if they do not cross the limit', async () => {\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalUpdates-test.js b\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalUpdates-test.js\nindex 5fd12fee1f..a85cf89c68 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalUpdates-test.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalUpdates-test.js\n@@ -36,13 +36,9 @@ describe('ReactIncrementalUpdates', () => {\n assertLog = InternalTestUtils.assertLog;\n });\n \n- function flushNextRenderIfExpired() {\n- \/\/ This will start rendering the next level of work. If the work hasn't\n- \/\/ expired yet, React will exit without doing anything. If it has expired,\n- \/\/ it will schedule a sync task.\n- Scheduler.unstable_flushExpired();\n- \/\/ Flush the sync task.\n- ReactNoop.flushSync();\n+ function Text({text}) {\n+ Scheduler.log(text);\n+ return text;\n }\n \n it('applies updates in order of priority', async () => {\n@@ -528,35 +524,38 @@ describe('ReactIncrementalUpdates', () => {\n setCount = _setCount;\n Scheduler.log('Render: ' + count);\n useLayoutEffect(() => {\n- setCount(prevCount => prevCount + 1);\n+ setCount(1);\n Scheduler.log('Commit: ' + count);\n }, []);\n- return null;\n+ return ;\n }\n \n await act(async () => {\n React.startTransition(() => {\n ReactNoop.render();\n });\n- flushNextRenderIfExpired();\n assertLog([]);\n- await waitForAll(['Render: 0', 'Commit: 0', 'Render: 1']);\n+ await waitForAll([\n+ 'Render: 0',\n+ 'Child',\n+ 'Commit: 0',\n+ 'Render: 1',\n+ 'Child',\n+ ]);\n \n Scheduler.unstable_advanceTime(10000);\n React.startTransition(() => {\n setCount(2);\n });\n- flushNextRenderIfExpired();\n- assertLog([]);\n+ \/\/ The transition should not have expired, so we should be able to\n+ \/\/ partially render it.\n+ await waitFor(['Render: 2']);\n+ \/\/ Now do the rest\n+ await waitForAll(['Child']);\n });\n });\n \n- it('regression: does not expire soon due to previous flushSync', () => {\n- function Text({text}) {\n- Scheduler.log(text);\n- return text;\n- }\n-\n+ it('regression: does not expire soon due to previous flushSync', async () => {\n ReactNoop.flushSync(() => {\n ReactNoop.render();\n });\n@@ -565,32 +564,70 @@ describe('ReactIncrementalUpdates', () => {\n Scheduler.unstable_advanceTime(10000);\n \n React.startTransition(() => {\n- ReactNoop.render();\n+ ReactNoop.render(\n+ <>\n+ \n+ \n+ \n+ \n+ <\/>,\n+ );\n+ });\n+ \/\/ The transition should not have expired, so we should be able to\n+ \/\/ partially render it.\n+ await waitFor(['A']);\n+\n+ \/\/ FIXME: We should be able to partially render B, too, but currently it\n+ \/\/ expires. This is an existing bug that I discovered, which will be fixed\n+ \/\/ in a PR that I'm currently working on.\n+ \/\/\n+ \/\/ Correct behavior:\n+ \/\/ await waitFor(['B']);\n+ \/\/ await waitForAll(['C', 'D']);\n+ \/\/\n+ \/\/ Current behavior:\n+ await waitFor(['B'], {\n+ additionalLogsAfterAttemptingToYield: ['C', 'D'],\n });\n- flushNextRenderIfExpired();\n- assertLog([]);\n });\n \n- it('regression: does not expire soon due to previous expired work', () => {\n- function Text({text}) {\n- Scheduler.log(text);\n- return text;\n- }\n-\n+ it('regression: does not expire soon due to previous expired work', async () => {\n React.startTransition(() => {\n- ReactNoop.render();\n+ ReactNoop.render(\n+ <>\n+ \n+ \n+ \n+ \n+ <\/>,\n+ );\n });\n+ await waitFor(['A']);\n+\n+ \/\/ This will expire the rest of the update\n Scheduler.unstable_advanceTime(10000);\n- flushNextRenderIfExpired();\n- assertLog(['A']);\n+ await waitFor(['B'], {\n+ additionalLogsAfterAttemptingToYield: ['C', 'D'],\n+ });\n \n Scheduler.unstable_advanceTime(10000);\n \n+ \/\/ Now do another transition. This one should not expire.\n React.startTransition(() => {\n- ReactNoop.render();\n+ ReactNoop.render(\n+ <>\n+ \n+ \n+ \n+ \n+ <\/>,\n+ );\n });\n- flushNextRenderIfExpired();\n- assertLog([]);\n+ \/\/ The transition should not have expired, so we should be able to\n+ \/\/ partially render it.\n+ await waitFor(['A']);\n+ await waitFor(['B']);\n+ await waitForAll(['C', 'D']);\n });\n \n it('when rebasing, does not exclude updates that were already committed, regardless of priority', async () => {\n"}

dillon1000/react

Files changed