{"body":"","parents":["609d0cc3c8d484cd16378f4ba0e2e9eedbf48358"],"commit":{"authorName":"Jan Kassens","subject":"Update ReactFabric-test.internal to concurrent root (#30103)","revision":"8416ebee38b1712611d8987ba64ce8fd87c3a540","shortRevision":"8416ebee38","authorEmail":"jkassens@meta.com","authoredAt":"2024-06-26T16:04:38-04:00"},"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 8639e77f43..99d21ea933 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@@ -29,9 +29,6 @@ describe('ReactFabric', () => {\n beforeEach(() => {\n jest.resetModules();\n \n- \/\/ TODO: migrate these tests off of the legacy API\n- require('shared\/ReactFeatureFlags').disableLegacyMode = false;\n-\n require('react-native\/Libraries\/ReactPrivate\/InitializeNativeFabricUIManager');\n \n React = require('react');\n@@ -51,7 +48,7 @@ describe('ReactFabric', () => {\n }));\n \n await act(() => {\n- ReactFabric.render(, 1);\n+ ReactFabric.render(, 1, null, true);\n });\n expect(nativeFabricUIManager.createNode).toBeCalled();\n expect(nativeFabricUIManager.appendChild).not.toBeCalled();\n@@ -69,13 +66,13 @@ describe('ReactFabric', () => {\n nativeFabricUIManager.createNode.mockReturnValue(firstNode);\n \n await act(() => {\n- ReactFabric.render(, 11);\n+ ReactFabric.render(, 11, null, true);\n });\n \n expect(nativeFabricUIManager.createNode).toHaveBeenCalledTimes(1);\n \n await act(() => {\n- ReactFabric.render(, 11);\n+ ReactFabric.render(, 11, null, true);\n });\n \n expect(nativeFabricUIManager.createNode).toHaveBeenCalledTimes(1);\n@@ -99,7 +96,7 @@ describe('ReactFabric', () => {\n }));\n \n await act(() => {\n- ReactFabric.render(1<\/Text>, 11);\n+ ReactFabric.render(1<\/Text>, 11, null, true);\n });\n expect(nativeFabricUIManager.cloneNode).not.toBeCalled();\n expect(nativeFabricUIManager.cloneNodeWithNewChildren).not.toBeCalled();\n@@ -110,7 +107,7 @@ describe('ReactFabric', () => {\n \n \/\/ If no properties have changed, we shouldn't call cloneNode.\n await act(() => {\n- ReactFabric.render(1<\/Text>, 11);\n+ ReactFabric.render(1<\/Text>, 11, null, true);\n });\n expect(nativeFabricUIManager.cloneNode).not.toBeCalled();\n expect(nativeFabricUIManager.cloneNodeWithNewChildren).not.toBeCalled();\n@@ -121,7 +118,7 @@ describe('ReactFabric', () => {\n \n \/\/ Only call cloneNode for the changed property (and not for text).\n await act(() => {\n- ReactFabric.render(1<\/Text>, 11);\n+ ReactFabric.render(1<\/Text>, 11, null, true);\n });\n expect(nativeFabricUIManager.cloneNode).not.toBeCalled();\n expect(nativeFabricUIManager.cloneNodeWithNewChildren).not.toBeCalled();\n@@ -134,7 +131,7 @@ describe('ReactFabric', () => {\n \n \/\/ Only call cloneNode for the changed text (and no other properties).\n await act(() => {\n- ReactFabric.render(2<\/Text>, 11);\n+ ReactFabric.render(2<\/Text>, 11, null, true);\n });\n expect(nativeFabricUIManager.cloneNode).not.toBeCalled();\n expect(\n@@ -149,7 +146,7 @@ describe('ReactFabric', () => {\n \n \/\/ Call cloneNode for both changed text and properties.\n await act(() => {\n- ReactFabric.render(3<\/Text>, 11);\n+ ReactFabric.render(3<\/Text>, 11, null, true);\n });\n expect(nativeFabricUIManager.cloneNode).not.toBeCalled();\n expect(\n@@ -175,6 +172,8 @@ describe('ReactFabric', () => {\n 1\n <\/Text>,\n 11,\n+ null,\n+ true,\n );\n });\n expect(nativeFabricUIManager.cloneNode).not.toBeCalled();\n@@ -190,6 +189,8 @@ describe('ReactFabric', () => {\n 1\n <\/Text>,\n 11,\n+ null,\n+ true,\n );\n });\n expect(\n@@ -207,6 +208,8 @@ describe('ReactFabric', () => {\n 2\n <\/Text>,\n 11,\n+ null,\n+ true,\n );\n });\n const argIndex = gate(flags => flags.passChildrenWhenCloningPersistedNodes)\n@@ -236,11 +239,15 @@ describe('ReactFabric', () => {\n <\/View>\n );\n \n- await act(() => ReactFabric.render(, 11));\n+ await act(() =>\n+ ReactFabric.render(, 11, null, true),\n+ );\n expect(nativeFabricUIManager.completeRoot).toBeCalled();\n jest.clearAllMocks();\n \n- await act(() => ReactFabric.render(, 11));\n+ await act(() =>\n+ ReactFabric.render(, 11, null, true),\n+ );\n expect(nativeFabricUIManager.cloneNode).not.toBeCalled();\n expect(nativeFabricUIManager.cloneNodeWithNewProps).toHaveBeenCalledTimes(\n 1,\n@@ -289,6 +296,8 @@ describe('ReactFabric', () => {\n }}\n \/>,\n 11,\n+ null,\n+ true,\n );\n });\n \n@@ -320,6 +329,8 @@ describe('ReactFabric', () => {\n }}\n \/>,\n 11,\n+ null,\n+ true,\n );\n });\n \n@@ -350,6 +361,8 @@ describe('ReactFabric', () => {\n }}\n \/>,\n 11,\n+ null,\n+ true,\n );\n });\n \n@@ -382,6 +395,8 @@ describe('ReactFabric', () => {\n }}\n \/>,\n 11,\n+ null,\n+ true,\n );\n });\n \n@@ -395,7 +410,33 @@ describe('ReactFabric', () => {\n expect(nativeFabricUIManager.sendAccessibilityEvent).not.toBeCalled();\n });\n \n- it('returns the correct instance and calls it in the callback', () => {\n+ it('calls the callback with the correct instance and returns null', async () => {\n+ const View = createReactNativeComponentClass('RCTView', () => ({\n+ validAttributes: {foo: true},\n+ uiViewClassName: 'RCTView',\n+ }));\n+\n+ let a;\n+ let b;\n+ let c;\n+ await act(() => {\n+ c = ReactFabric.render(\n+ (a = v)} \/>,\n+ 11,\n+ function () {\n+ b = this;\n+ },\n+ true,\n+ );\n+ });\n+\n+ expect(a).toBeTruthy();\n+ expect(a).toBe(b);\n+ expect(c).toBe(null);\n+ });\n+\n+ \/\/ @gate !disableLegacyMode\n+ it('returns the instance in legacy mode and calls the callback with it', () => {\n const View = createReactNativeComponentClass('RCTView', () => ({\n validAttributes: {foo: true},\n uiViewClassName: 'RCTView',\n@@ -404,7 +445,12 @@ describe('ReactFabric', () => {\n let a;\n let b;\n const c = ReactFabric.render(\n- (a = v)} \/>,\n+ {\n+ a = v;\n+ }}\n+ \/>,\n 11,\n function () {\n b = this;\n@@ -440,7 +486,7 @@ describe('ReactFabric', () => {\n const after = 'mxhpgwfralkeoivcstzy';\n \n await act(() => {\n- ReactFabric.render(, 11);\n+ ReactFabric.render(, 11, null, true);\n });\n expect(nativeFabricUIManager.__dumpHierarchyForJestTestsOnly()).toBe(`11\n RCTView null\n@@ -466,7 +512,7 @@ describe('ReactFabric', () => {\n RCTView {\"title\":\"t\"}`);\n \n await act(() => {\n- ReactFabric.render(, 11);\n+ ReactFabric.render(, 11, null, true);\n });\n expect(nativeFabricUIManager.__dumpHierarchyForJestTestsOnly()).toBe(`11\n RCTView null\n@@ -525,6 +571,8 @@ describe('ReactFabric', () => {\n \n <\/View>,\n 11,\n+ null,\n+ true,\n );\n });\n expect(nativeFabricUIManager.__dumpHierarchyForJestTestsOnly()).toBe(\n@@ -555,8 +603,10 @@ describe('ReactFabric', () => {\n \n \/\/ Call setState() so that we skip over the top-level host node.\n \/\/ It should still get recreated despite a bailout.\n- ref.current.setState({\n- chars: after,\n+ await act(() => {\n+ ref.current.setState({\n+ chars: after,\n+ });\n });\n expect(nativeFabricUIManager.__dumpHierarchyForJestTestsOnly()).toBe(`11\n RCTView null\n@@ -595,7 +645,7 @@ describe('ReactFabric', () => {\n }\n \n await act(() => {\n- ReactFabric.render(, 11);\n+ ReactFabric.render(, 11, null, true);\n });\n expect(mockArgs.length).toEqual(0);\n });\n@@ -621,6 +671,8 @@ describe('ReactFabric', () => {\n \n <\/View>,\n 22,\n+ null,\n+ true,\n );\n });\n expect(snapshots).toEqual([\n@@ -649,6 +701,8 @@ describe('ReactFabric', () => {\n \n <\/Text>,\n 11,\n+ null,\n+ true,\n );\n });\n \n@@ -658,6 +712,8 @@ describe('ReactFabric', () => {\n \n <\/Text>,\n 11,\n+ null,\n+ true,\n );\n });\n });\n@@ -678,7 +734,7 @@ describe('ReactFabric', () => {\n \n await expect(async () => {\n await act(() => {\n- ReactFabric.render(this should warn<\/View>, 11);\n+ ReactFabric.render(this should warn<\/View>, 11, null, true);\n });\n }).toErrorDev(['Text strings must be rendered within a component.']);\n \n@@ -689,6 +745,8 @@ describe('ReactFabric', () => {\n hi hello hi<\/ScrollView>\n <\/Text>,\n 11,\n+ null,\n+ true,\n );\n });\n }).toErrorDev(['Text strings must be rendered within a component.']);\n@@ -708,6 +766,8 @@ describe('ReactFabric', () => {\n \n <\/Text>,\n 11,\n+ null,\n+ true,\n );\n });\n });\n@@ -727,7 +787,7 @@ describe('ReactFabric', () => {\n const touchStart2 = jest.fn();\n \n await act(() => {\n- ReactFabric.render(, 11);\n+ ReactFabric.render(, 11, null, true);\n });\n \n expect(nativeFabricUIManager.createNode.mock.calls.length).toBe(1);\n@@ -753,7 +813,7 @@ describe('ReactFabric', () => {\n expect(touchStart2).not.toBeCalled();\n \n await act(() => {\n- ReactFabric.render(, 11);\n+ ReactFabric.render(, 11, null, true);\n });\n \n \/\/ Intentionally dispatch to the same instanceHandle again.\n@@ -819,6 +879,8 @@ describe('ReactFabric', () => {\n \/>\n <\/View>,\n 11,\n+ null,\n+ true,\n );\n });\n \n@@ -914,6 +976,8 @@ describe('ReactFabric', () => {\n \/>\n <\/View>,\n 1,\n+ null,\n+ true,\n );\n });\n \n@@ -973,6 +1037,8 @@ describe('ReactFabric', () => {\n ReactFabric.render(\n (parent = n)} \/>,\n 11,\n+ null,\n+ true,\n );\n });\n \n@@ -1012,6 +1078,8 @@ describe('ReactFabric', () => {\n (parent = n)} \/>\n <\/StrictMode>,\n 11,\n+ null,\n+ true,\n );\n });\n \n@@ -1053,6 +1121,8 @@ describe('ReactFabric', () => {\n ReactFabric.render(\n (parent = n)} \/>,\n 11,\n+ null,\n+ true,\n );\n });\n \n@@ -1092,6 +1162,8 @@ describe('ReactFabric', () => {\n (parent = n)} \/>\n <\/StrictMode>,\n 11,\n+ null,\n+ true,\n );\n });\n \n@@ -1127,6 +1199,8 @@ describe('ReactFabric', () => {\n }}\n \/>,\n 11,\n+ null,\n+ true,\n );\n });\n const dangerouslyRetainedViewRef = viewRef;\n@@ -1149,7 +1223,7 @@ describe('ReactFabric', () => {\n }));\n \n await act(() => {\n- ReactFabric.render(, 1);\n+ ReactFabric.render(, 1, null, true);\n });\n \n const internalInstanceHandle =\n@@ -1182,6 +1256,8 @@ describe('ReactFabric', () => {\n }}\n \/>,\n 1,\n+ null,\n+ true,\n );\n });\n \n@@ -1196,7 +1272,7 @@ describe('ReactFabric', () => {\n expect(publicInstance).toBe(viewRef);\n \n await act(() => {\n- ReactFabric.render(null, 1);\n+ ReactFabric.render(null, 1, null, true);\n });\n \n const publicInstanceAfterUnmount =\n@@ -1215,7 +1291,7 @@ describe('ReactFabric', () => {\n }));\n \n await act(() => {\n- ReactFabric.render(Text content<\/RCTText>, 1);\n+ ReactFabric.render(Text content<\/RCTText>, 1, null, true);\n });\n \n \/\/ Access the internal instance handle used to create the text node.\n@@ -1247,7 +1323,7 @@ describe('ReactFabric', () => {\n expect(publicInstance).toBe(expectedPublicInstance);\n \n await act(() => {\n- ReactFabric.render(null, 1);\n+ ReactFabric.render(null, 1, null, true);\n });\n \n const publicInstanceAfterUnmount =\n","files":[{"status":"M","path":"packages\/react-native-renderer\/src\/__tests__\/ReactFabric-test.internal.js"}]}

dillon1000/react

Files changed