{"patch":"diff --git a\/packages\/react-native-renderer\/src\/__tests__\/ReactFabric-test.internal.js b\/packages\/react-native-renderer\/src\/__tests__\/ReactFabric-test.internal.js\nindex b77ed9903a..a935da5e4d 100644\n--- a\/packages\/react-native-renderer\/src\/__tests__\/ReactFabric-test.internal.js\n+++ b\/packages\/react-native-renderer\/src\/__tests__\/ReactFabric-test.internal.js\n@@ -16,7 +16,6 @@ let createReactNativeComponentClass;\n let UIManager;\n let StrictMode;\n let TextInputState;\n-let act;\n \n const SET_NATIVE_PROPS_NOT_SUPPORTED_MESSAGE =\n 'Warning: setNativeProps is not currently supported in Fabric';\n@@ -48,9 +47,6 @@ describe('ReactFabric', () => {\n .ReactNativeViewConfigRegistry.register;\n TextInputState = require('react-native\/Libraries\/ReactPrivate\/ReactNativePrivateInterface')\n .TextInputState;\n-\n- const ReactTestRenderer = require('react-test-renderer');\n- act = ReactTestRenderer.act;\n });\n \n it('should be able to create and render a native component', () => {\n@@ -59,9 +55,7 @@ describe('ReactFabric', () => {\n uiViewClassName: 'RCTView',\n }));\n \n- act(() => {\n- ReactFabric.render(, 1);\n- });\n+ ReactFabric.render(, 1);\n expect(nativeFabricUIManager.createNode).toBeCalled();\n expect(nativeFabricUIManager.appendChild).not.toBeCalled();\n expect(nativeFabricUIManager.completeRoot).toBeCalled();\n@@ -77,15 +71,11 @@ describe('ReactFabric', () => {\n \n nativeFabricUIManager.createNode.mockReturnValue(firstNode);\n \n- act(() => {\n- ReactFabric.render(, 11);\n- });\n+ ReactFabric.render(, 11);\n \n expect(nativeFabricUIManager.createNode).toHaveBeenCalledTimes(1);\n \n- act(() => {\n- ReactFabric.render(, 11);\n- });\n+ ReactFabric.render(, 11);\n \n expect(nativeFabricUIManager.createNode).toHaveBeenCalledTimes(1);\n expect(nativeFabricUIManager.cloneNodeWithNewProps).toHaveBeenCalledTimes(\n@@ -107,9 +97,7 @@ describe('ReactFabric', () => {\n uiViewClassName: 'RCTText',\n }));\n \n- act(() => {\n- ReactFabric.render(1<\/Text>, 11);\n- });\n+ ReactFabric.render(1<\/Text>, 11);\n expect(nativeFabricUIManager.cloneNode).not.toBeCalled();\n expect(nativeFabricUIManager.cloneNodeWithNewChildren).not.toBeCalled();\n expect(nativeFabricUIManager.cloneNodeWithNewProps).not.toBeCalled();\n@@ -118,9 +106,7 @@ describe('ReactFabric', () => {\n ).not.toBeCalled();\n \n \/\/ If no properties have changed, we shouldn't call cloneNode.\n- act(() => {\n- ReactFabric.render(1<\/Text>, 11);\n- });\n+ ReactFabric.render(1<\/Text>, 11);\n expect(nativeFabricUIManager.cloneNode).not.toBeCalled();\n expect(nativeFabricUIManager.cloneNodeWithNewChildren).not.toBeCalled();\n expect(nativeFabricUIManager.cloneNodeWithNewProps).not.toBeCalled();\n@@ -129,9 +115,7 @@ describe('ReactFabric', () => {\n ).not.toBeCalled();\n \n \/\/ Only call cloneNode for the changed property (and not for text).\n- act(() => {\n- ReactFabric.render(1<\/Text>, 11);\n- });\n+ ReactFabric.render(1<\/Text>, 11);\n expect(nativeFabricUIManager.cloneNode).not.toBeCalled();\n expect(nativeFabricUIManager.cloneNodeWithNewChildren).not.toBeCalled();\n expect(nativeFabricUIManager.cloneNodeWithNewProps).toHaveBeenCalledTimes(\n@@ -142,9 +126,7 @@ describe('ReactFabric', () => {\n ).not.toBeCalled();\n \n \/\/ Only call cloneNode for the changed text (and no other properties).\n- act(() => {\n- ReactFabric.render(2<\/Text>, 11);\n- });\n+ ReactFabric.render(2<\/Text>, 11);\n expect(nativeFabricUIManager.cloneNode).not.toBeCalled();\n expect(\n nativeFabricUIManager.cloneNodeWithNewChildren,\n@@ -157,9 +139,7 @@ describe('ReactFabric', () => {\n ).not.toBeCalled();\n \n \/\/ Call cloneNode for both changed text and properties.\n- act(() => {\n- ReactFabric.render(3<\/Text>, 11);\n- });\n+ ReactFabric.render(3<\/Text>, 11);\n expect(nativeFabricUIManager.cloneNode).not.toBeCalled();\n expect(\n nativeFabricUIManager.cloneNodeWithNewChildren,\n@@ -178,14 +158,12 @@ describe('ReactFabric', () => {\n uiViewClassName: 'RCTText',\n }));\n \n- act(() => {\n- ReactFabric.render(\n- \n- 1\n- <\/Text>,\n- 11,\n- );\n- });\n+ ReactFabric.render(\n+ \n+ 1\n+ <\/Text>,\n+ 11,\n+ );\n expect(nativeFabricUIManager.cloneNode).not.toBeCalled();\n expect(nativeFabricUIManager.cloneNodeWithNewChildren).not.toBeCalled();\n expect(nativeFabricUIManager.cloneNodeWithNewProps).not.toBeCalled();\n@@ -193,14 +171,12 @@ describe('ReactFabric', () => {\n nativeFabricUIManager.cloneNodeWithNewChildrenAndProps,\n ).not.toBeCalled();\n \n- act(() => {\n- ReactFabric.render(\n- \n- 1\n- <\/Text>,\n- 11,\n- );\n- });\n+ ReactFabric.render(\n+ \n+ 1\n+ <\/Text>,\n+ 11,\n+ );\n expect(\n nativeFabricUIManager.cloneNodeWithNewProps.mock.calls[0][1],\n ).toEqual({\n@@ -210,14 +186,12 @@ describe('ReactFabric', () => {\n nativeFabricUIManager.__dumpHierarchyForJestTestsOnly(),\n ).toMatchSnapshot();\n \n- act(() => {\n- ReactFabric.render(\n- \n- 2\n- <\/Text>,\n- 11,\n- );\n- });\n+ ReactFabric.render(\n+ \n+ 2\n+ <\/Text>,\n+ 11,\n+ );\n expect(\n nativeFabricUIManager.cloneNodeWithNewChildrenAndProps.mock.calls[0][1],\n ).toEqual({\n@@ -237,17 +211,15 @@ describe('ReactFabric', () => {\n UIManager.updateView.mockReset();\n \n let viewRef;\n- act(() => {\n- ReactFabric.render(\n- {\n- viewRef = ref;\n- }}\n- \/>,\n- 11,\n- );\n- });\n+ ReactFabric.render(\n+ {\n+ viewRef = ref;\n+ }}\n+ \/>,\n+ 11,\n+ );\n expect(UIManager.updateView).not.toBeCalled();\n \n expect(() => {\n@@ -275,16 +247,14 @@ describe('ReactFabric', () => {\n nativeFabricUIManager.dispatchCommand.mockClear();\n \n let viewRef;\n- act(() => {\n- ReactFabric.render(\n- {\n- viewRef = ref;\n- }}\n- \/>,\n- 11,\n- );\n- });\n+ ReactFabric.render(\n+ {\n+ viewRef = ref;\n+ }}\n+ \/>,\n+ 11,\n+ );\n \n expect(nativeFabricUIManager.dispatchCommand).not.toBeCalled();\n ReactFabric.dispatchCommand(viewRef, 'updateCommand', [10, 20]);\n@@ -304,16 +274,14 @@ describe('ReactFabric', () => {\n nativeFabricUIManager.dispatchCommand.mockReset();\n \n let viewRef;\n- act(() => {\n- ReactFabric.render(\n- {\n- viewRef = ref;\n- }}\n- \/>,\n- 11,\n- );\n- });\n+ ReactFabric.render(\n+ {\n+ viewRef = ref;\n+ }}\n+ \/>,\n+ 11,\n+ );\n \n expect(nativeFabricUIManager.dispatchCommand).not.toBeCalled();\n expect(() => {\n@@ -334,16 +302,14 @@ describe('ReactFabric', () => {\n nativeFabricUIManager.sendAccessibilityEvent.mockClear();\n \n let viewRef;\n- act(() => {\n- ReactFabric.render(\n- {\n- viewRef = ref;\n- }}\n- \/>,\n- 11,\n- );\n- });\n+ ReactFabric.render(\n+ {\n+ viewRef = ref;\n+ }}\n+ \/>,\n+ 11,\n+ );\n \n expect(nativeFabricUIManager.sendAccessibilityEvent).not.toBeCalled();\n ReactFabric.sendAccessibilityEvent(viewRef, 'focus');\n@@ -366,16 +332,14 @@ describe('ReactFabric', () => {\n nativeFabricUIManager.sendAccessibilityEvent.mockReset();\n \n let viewRef;\n- act(() => {\n- ReactFabric.render(\n- {\n- viewRef = ref;\n- }}\n- \/>,\n- 11,\n- );\n- });\n+ ReactFabric.render(\n+ {\n+ viewRef = ref;\n+ }}\n+ \/>,\n+ 11,\n+ );\n \n expect(nativeFabricUIManager.sendAccessibilityEvent).not.toBeCalled();\n expect(() => {\n@@ -396,16 +360,14 @@ describe('ReactFabric', () => {\n nativeFabricUIManager.measure.mockClear();\n \n let viewRef;\n- act(() => {\n- ReactFabric.render(\n- {\n- viewRef = ref;\n- }}\n- \/>,\n- 11,\n- );\n- });\n+ ReactFabric.render(\n+ {\n+ viewRef = ref;\n+ }}\n+ \/>,\n+ 11,\n+ );\n \n expect(nativeFabricUIManager.measure).not.toBeCalled();\n const successCallback = jest.fn();\n@@ -424,16 +386,14 @@ describe('ReactFabric', () => {\n nativeFabricUIManager.measureInWindow.mockClear();\n \n let viewRef;\n- act(() => {\n- ReactFabric.render(\n- {\n- viewRef = ref;\n- }}\n- \/>,\n- 11,\n- );\n- });\n+ ReactFabric.render(\n+ {\n+ viewRef = ref;\n+ }}\n+ \/>,\n+ 11,\n+ );\n \n expect(nativeFabricUIManager.measureInWindow).not.toBeCalled();\n const successCallback = jest.fn();\n@@ -453,24 +413,22 @@ describe('ReactFabric', () => {\n \n let viewRef;\n let otherRef;\n- act(() => {\n- ReactFabric.render(\n- \n- {\n- viewRef = ref;\n- }}\n- \/>\n- {\n- otherRef = ref;\n- }}\n- \/>\n- <\/View>,\n- 11,\n- );\n- });\n+ ReactFabric.render(\n+ \n+ {\n+ viewRef = ref;\n+ }}\n+ \/>\n+ {\n+ otherRef = ref;\n+ }}\n+ \/>\n+ <\/View>,\n+ 11,\n+ );\n \n expect(nativeFabricUIManager.measureLayout).not.toBeCalled();\n const successCallback = jest.fn();\n@@ -525,16 +483,12 @@ describe('ReactFabric', () => {\n const before = 'abcdefghijklmnopqrst';\n const after = 'mxhpgwfralkeoivcstzy';\n \n- act(() => {\n- ReactFabric.render(, 11);\n- });\n+ ReactFabric.render(, 11);\n expect(\n nativeFabricUIManager.__dumpHierarchyForJestTestsOnly(),\n ).toMatchSnapshot();\n \n- act(() => {\n- ReactFabric.render(, 11);\n- });\n+ ReactFabric.render(, 11);\n expect(\n nativeFabricUIManager.__dumpHierarchyForJestTestsOnly(),\n ).toMatchSnapshot();\n@@ -567,14 +521,12 @@ describe('ReactFabric', () => {\n \n const ref = React.createRef();\n \/\/ Wrap in a host node.\n- act(() => {\n- ReactFabric.render(\n- \n- \n- <\/View>,\n- 11,\n- );\n- });\n+ ReactFabric.render(\n+ \n+ \n+ <\/View>,\n+ 11,\n+ );\n expect(\n nativeFabricUIManager.__dumpHierarchyForJestTestsOnly(),\n ).toMatchSnapshot();\n@@ -600,9 +552,7 @@ describe('ReactFabric', () => {\n }\n }\n \n- act(() => {\n- ReactFabric.render(, 11);\n- });\n+ ReactFabric.render(, 11);\n expect(mockArgs.length).toEqual(0);\n });\n \n@@ -622,14 +572,12 @@ describe('ReactFabric', () => {\n );\n });\n \n- act(() => {\n- ReactFabric.render(\n- \n- \n- <\/View>,\n- 22,\n- );\n- });\n+ ReactFabric.render(\n+ \n+ \n+ <\/View>,\n+ 22,\n+ );\n expect(snapshots).toMatchSnapshot();\n });\n \n@@ -647,23 +595,19 @@ describe('ReactFabric', () => {\n uiViewClassName: 'RCTView',\n }));\n \n- act(() => {\n- ReactFabric.render(\n- \n- \n- <\/Text>,\n- 11,\n- );\n- });\n+ ReactFabric.render(\n+ \n+ \n+ <\/Text>,\n+ 11,\n+ );\n \n- act(() => {\n- ReactFabric.render(\n- \n- \n- <\/Text>,\n- 11,\n- );\n- });\n+ ReactFabric.render(\n+ \n+ \n+ <\/Text>,\n+ 11,\n+ );\n });\n \n it('should throw for text not inside of a ancestor', () => {\n@@ -680,22 +624,18 @@ describe('ReactFabric', () => {\n uiViewClassName: 'RCTView',\n }));\n \n- expect(() => {\n- act(() => {\n- ReactFabric.render(this should warn<\/View>, 11);\n- });\n- }).toThrow('Text strings must be rendered within a component.');\n+ expect(() => ReactFabric.render(this should warn<\/View>, 11)).toThrow(\n+ 'Text strings must be rendered within a component.',\n+ );\n \n- expect(() => {\n- act(() => {\n- ReactFabric.render(\n- \n- hi hello hi<\/ScrollView>\n- <\/Text>,\n- 11,\n- );\n- });\n- }).toThrow('Text strings must be rendered within a component.');\n+ expect(() =>\n+ ReactFabric.render(\n+ \n+ hi hello hi<\/ScrollView>\n+ <\/Text>,\n+ 11,\n+ ),\n+ ).toThrow('Text strings must be rendered within a component.');\n });\n \n it('should not throw for text inside of an indirect ancestor', () => {\n@@ -706,14 +646,12 @@ describe('ReactFabric', () => {\n \n const Indirection = () => 'Hi';\n \n- act(() => {\n- ReactFabric.render(\n- \n- \n- <\/Text>,\n- 11,\n- );\n- });\n+ ReactFabric.render(\n+ \n+ \n+ <\/Text>,\n+ 11,\n+ );\n });\n \n it('dispatches events to the last committed props', () => {\n@@ -730,9 +668,7 @@ describe('ReactFabric', () => {\n const touchStart = jest.fn();\n const touchStart2 = jest.fn();\n \n- act(() => {\n- ReactFabric.render(, 11);\n- });\n+ ReactFabric.render(, 11);\n \n expect(nativeFabricUIManager.createNode.mock.calls.length).toBe(1);\n expect(nativeFabricUIManager.registerEventHandler.mock.calls.length).toBe(\n@@ -762,9 +698,7 @@ describe('ReactFabric', () => {\n expect(touchStart).toBeCalled();\n expect(touchStart2).not.toBeCalled();\n \n- act(() => {\n- ReactFabric.render(, 11);\n- });\n+ ReactFabric.render(, 11);\n \n \/\/ Intentionally dispatch to the same instanceHandle again.\n dispatchEvent(instanceHandle, 'topTouchStart', touchEvent);\n@@ -808,35 +742,33 @@ describe('ReactFabric', () => {\n const ref1 = React.createRef();\n const ref2 = React.createRef();\n \n- act(() => {\n- ReactFabric.render(\n- \n- {\n- expect(ref1.current).not.toBeNull();\n- \/\/ Check for referential equality\n- expect(ref1.current).toBe(event.target);\n- expect(ref1.current).toBe(event.currentTarget);\n- }}\n- onStartShouldSetResponder={() => true}\n- \/>\n- {\n- expect(ref2.current).not.toBeNull();\n- \/\/ Check for referential equality\n- expect(ref2.current).toBe(event.target);\n- expect(ref2.current).toBe(event.currentTarget);\n- }}\n- onStartShouldSetResponder={() => true}\n- \/>\n- <\/View>,\n- 1,\n- );\n- });\n+ ReactFabric.render(\n+ \n+ {\n+ expect(ref1.current).not.toBeNull();\n+ \/\/ Check for referential equality\n+ expect(ref1.current).toBe(event.target);\n+ expect(ref1.current).toBe(event.currentTarget);\n+ }}\n+ onStartShouldSetResponder={() => true}\n+ \/>\n+ {\n+ expect(ref2.current).not.toBeNull();\n+ \/\/ Check for referential equality\n+ expect(ref2.current).toBe(event.target);\n+ expect(ref2.current).toBe(event.currentTarget);\n+ }}\n+ onStartShouldSetResponder={() => true}\n+ \/>\n+ <\/View>,\n+ 1,\n+ );\n \n const [\n dispatchEvent,\n@@ -891,12 +823,7 @@ describe('ReactFabric', () => {\n }\n }\n \n- act(() => {\n- ReactFabric.render(\n- (parent = n)} \/>,\n- 11,\n- );\n- });\n+ ReactFabric.render( (parent = n)} \/>, 11);\n \n let match;\n expect(\n@@ -928,14 +855,12 @@ describe('ReactFabric', () => {\n }\n }\n \n- act(() => {\n- ReactFabric.render(\n- \n- (parent = n)} \/>\n- <\/StrictMode>,\n- 11,\n- );\n- });\n+ ReactFabric.render(\n+ \n+ (parent = n)} \/>\n+ <\/StrictMode>,\n+ 11,\n+ );\n \n let match;\n expect(\n@@ -971,12 +896,7 @@ describe('ReactFabric', () => {\n }\n }\n \n- act(() => {\n- ReactFabric.render(\n- (parent = n)} \/>,\n- 11,\n- );\n- });\n+ ReactFabric.render( (parent = n)} \/>, 11);\n \n let match;\n expect(() => (match = ReactFabric.findNodeHandle(parent))).toErrorDev([\n@@ -1006,14 +926,12 @@ describe('ReactFabric', () => {\n }\n }\n \n- act(() => {\n- ReactFabric.render(\n- \n- (parent = n)} \/>\n- <\/StrictMode>,\n- 11,\n- );\n- });\n+ ReactFabric.render(\n+ \n+ (parent = n)} \/>\n+ <\/StrictMode>,\n+ 11,\n+ );\n \n let match;\n expect(() => (match = ReactFabric.findNodeHandle(parent))).toErrorDev([\n@@ -1035,9 +953,7 @@ describe('ReactFabric', () => {\n }));\n \n const viewRef = React.createRef();\n- act(() => {\n- ReactFabric.render(, 11);\n- });\n+ ReactFabric.render(, 11);\n \n expect(TextInputState.blurTextInput).not.toBeCalled();\n \n@@ -1054,9 +970,7 @@ describe('ReactFabric', () => {\n }));\n \n const viewRef = React.createRef();\n- act(() => {\n- ReactFabric.render(, 11);\n- });\n+ ReactFabric.render(, 11);\n \n expect(TextInputState.focusTextInput).not.toBeCalled();\n \n","parents":["59d3aca68638319c88d685ce22cac76a03cfe493"],"commit":{"subject":"Revert \"Use `act()` in ReactFabric tests (#21839)\" (#21840)","authorEmail":"yungsters@gmail.com","revision":"c549bc491877b94a44ecc00daa9cf04026a77a6e","shortRevision":"c549bc4918","authorName":"Timothy Yung","authoredAt":"2021-07-08T15:05:51-07:00"},"files":[{"path":"packages\/react-native-renderer\/src\/__tests__\/ReactFabric-test.internal.js","status":"M"}],"body":"This reverts commit 59d3aca68638319c88d685ce22cac76a03cfe493."}

dillon1000/react

Files changed