{"body":"","parents":["388b03dd1244199a00601171256662057c3f5997"],"patch":"diff --git a\/src\/__tests__\/inspectedElementContext-test.js b\/src\/__tests__\/inspectedElementContext-test.js\nindex 7467a73c3b..939a4b3b0c 100644\n--- a\/src\/__tests__\/inspectedElementContext-test.js\n+++ b\/src\/__tests__\/inspectedElementContext-test.js\n@@ -8,7 +8,6 @@ import type Store from 'src\/devtools\/store';\n describe('InspectedElementContext', () => {\n let React;\n let ReactDOM;\n- let act;\n let TestRenderer: ReactTestRenderer;\n let bridge: Bridge;\n let store: Store;\n@@ -20,18 +19,6 @@ describe('InspectedElementContext', () => {\n let StoreContext;\n let TreeContextController;\n \n- \/\/ a version of actAsync that *doesn't* recursively flush timers\n- async function actAsync(cb: () => *): Promise {\n- \/\/ $FlowFixMe Flow doesn't know about \"await act()\" yet\n- await act(async () => {\n- await cb();\n- });\n- \/\/ $FlowFixMe Flow doesn't know about \"await act()\" yet\n- await act(async () => {\n- jest.runOnlyPendingTimers();\n- });\n- }\n-\n beforeEach(() => {\n utils = require('.\/utils');\n utils.beforeEachProfiling();\n@@ -42,7 +29,6 @@ describe('InspectedElementContext', () => {\n \n React = require('react');\n ReactDOM = require('react-dom');\n- act = require('react-dom\/test-utils').act;\n TestRenderer = utils.requireTestRenderer();\n \n BridgeContext = require('src\/devtools\/views\/context').BridgeContext;\n@@ -81,7 +67,9 @@ describe('InspectedElementContext', () => {\n };\n \n const container = document.createElement('div');\n- utils.act(() => ReactDOM.render(, container));\n+ await utils.actAsync(() =>\n+ ReactDOM.render(, container)\n+ );\n expect(store).toMatchSnapshot('1: mount');\n \n const example = ((store.getElementAtIndex(0): any): Element);\n@@ -98,17 +86,19 @@ describe('InspectedElementContext', () => {\n return null;\n }\n \n- await actAsync(() =>\n- TestRenderer.create(\n- \n- \n- \n- <\/React.Suspense>\n- <\/Contexts>\n- )\n+ await utils.actAsync(\n+ () =>\n+ TestRenderer.create(\n+ \n+ \n+ \n+ <\/React.Suspense>\n+ <\/Contexts>\n+ ),\n+ false\n );\n expect(didFinish).toBe(true);\n \n@@ -119,7 +109,10 @@ describe('InspectedElementContext', () => {\n const Example = () => null;\n \n const container = document.createElement('div');\n- utils.act(() => ReactDOM.render(, container));\n+ await utils.actAsync(\n+ () => ReactDOM.render(, container),\n+ false\n+ );\n expect(store).toMatchSnapshot('1: mount');\n \n const example = ((store.getElementAtIndex(0): any): Element);\n@@ -132,8 +125,10 @@ describe('InspectedElementContext', () => {\n return null;\n }\n \n- await actAsync(() =>\n- TestRenderer.create(\n+ let renderer;\n+\n+ await utils.actAsync(() => {\n+ renderer = TestRenderer.create(\n {\n \n <\/React.Suspense>\n <\/Contexts>\n- )\n- );\n+ );\n+ }, false);\n expect(inspectedElement).toMatchSnapshot('2: initial render');\n \n- await actAsync(() =>\n- ReactDOM.render(, container)\n+ await utils.actAsync(\n+ () => ReactDOM.render(, container),\n+ false\n );\n \n inspectedElement = null;\n- await actAsync(() =>\n- TestRenderer.create(\n- \n- \n- \n- <\/React.Suspense>\n- <\/Contexts>\n- )\n+ await utils.actAsync(\n+ () =>\n+ renderer.update(\n+ \n+ \n+ \n+ <\/React.Suspense>\n+ <\/Contexts>\n+ ),\n+ false\n );\n expect(inspectedElement).toMatchSnapshot('2: updated state');\n \n@@ -179,7 +177,7 @@ describe('InspectedElementContext', () => {\n });\n \n const container = document.createElement('div');\n- utils.act(() =>\n+ await utils.actAsync(() =>\n ReactDOM.render(\n \n \n@@ -202,7 +200,7 @@ describe('InspectedElementContext', () => {\n targetRenderCount = 0;\n \n let renderer;\n- await actAsync(\n+ await utils.actAsync(\n () =>\n (renderer = TestRenderer.create(\n {\n \n <\/React.Suspense>\n <\/Contexts>\n- ))\n+ )),\n+ false\n );\n expect(targetRenderCount).toBe(1);\n expect(inspectedElement).toMatchSnapshot('2: initial render');\n@@ -222,27 +221,34 @@ describe('InspectedElementContext', () => {\n \n targetRenderCount = 0;\n inspectedElement = null;\n- await actAsync(() =>\n- renderer.update(\n- \n- \n- \n- <\/React.Suspense>\n- <\/Contexts>\n- )\n+ await utils.actAsync(\n+ () =>\n+ renderer.update(\n+ \n+ \n+ \n+ <\/React.Suspense>\n+ <\/Contexts>\n+ ),\n+ false\n );\n expect(targetRenderCount).toBe(0);\n expect(inspectedElement).toEqual(initialInspectedElement);\n \n targetRenderCount = 0;\n \n- await actAsync(() =>\n- ReactDOM.render(\n- \n- \n- <\/Wrapper>,\n- container\n- )\n+ await utils.actAsync(\n+ () =>\n+ ReactDOM.render(\n+ \n+ \n+ <\/Wrapper>,\n+ container\n+ ),\n+ false\n );\n \n \/\/ Target should have been rendered once (by ReactDOM) and once by DevTools for inspection.\ndiff --git a\/src\/__tests__\/profilingCharts-test.js b\/src\/__tests__\/profilingCharts-test.js\nindex 8e9248bb97..d83f8b5a0f 100644\n--- a\/src\/__tests__\/profilingCharts-test.js\n+++ b\/src\/__tests__\/profilingCharts-test.js\n@@ -88,6 +88,7 @@ describe('profiling charts', () => {\n \n for (let commitIndex = 0; commitIndex < 2; commitIndex++) {\n renderFinished = false;\n+\n utils.act(() => {\n TestRenderer.create(\n \n@@ -161,6 +162,7 @@ describe('profiling charts', () => {\n \n for (let commitIndex = 0; commitIndex < 2; commitIndex++) {\n renderFinished = false;\n+\n utils.act(() => {\n TestRenderer.create(\n \n@@ -225,6 +227,7 @@ describe('profiling charts', () => {\n \n for (let commitIndex = 0; commitIndex < 2; commitIndex++) {\n renderFinished = false;\n+\n utils.act(() => {\n TestRenderer.create(\n \ndiff --git a\/src\/__tests__\/utils.js b\/src\/__tests__\/utils.js\nindex e62d16ed57..061a307e7f 100644\n--- a\/src\/__tests__\/utils.js\n+++ b\/src\/__tests__\/utils.js\n@@ -19,17 +19,28 @@ export function act(callback: Function): void {\n });\n }\n \n-export async function actAsync(cb: () => *): Promise {\n+export async function actAsync(\n+ cb: () => *,\n+ recursivelyFlush: boolean = true\n+): Promise {\n const TestUtils = require('react-dom\/test-utils');\n \n \/\/ $FlowFixMe Flow doens't know about \"await act()\" yet\n await TestUtils.act(async () => {\n await cb();\n });\n- while (jest.getTimerCount() > 0) {\n- \/\/ $FlowFixMe Flow doens't know about \"await act()\" yet\n+\n+ if (recursivelyFlush) {\n+ while (jest.getTimerCount() > 0) {\n+ \/\/ $FlowFixMe Flow doens't know about \"await act()\" yet\n+ await TestUtils.act(async () => {\n+ jest.runAllTimers();\n+ });\n+ }\n+ } else {\n+ \/\/ $FlowFixMe Flow doesn't know about \"await act()\" yet\n await TestUtils.act(async () => {\n- jest.runAllTimers();\n+ jest.runOnlyPendingTimers();\n });\n }\n }\n","commit":{"authoredAt":"2019-05-28T13:57:05-07:00","authorEmail":"bvaughn@fb.com","revision":"5429f651b478a0e9860af83ab962984af21b4b19","authorName":"Brian Vaughn","subject":"Tweaks","shortRevision":"5429f651b4"},"files":[{"status":"M","path":"src\/__tests__\/inspectedElementContext-test.js"},{"status":"M","path":"src\/__tests__\/profilingCharts-test.js"},{"status":"M","path":"src\/__tests__\/utils.js"}]}

dillon1000/react

Files changed