Revert "Update Modal's mock to not render its children when it is not…

… visible (facebook#32346)" This reverts commit ec614c1.
janicduplessis · Oct 25, 2021 · 07e65a1 · 07e65a1
1 parent 51530d1
commit 07e65a1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 46 deletions.
diff --git a/Libraries/Modal/__tests__/Modal-test.js b/Libraries/Modal/__tests__/Modal-test.js
@@ -27,15 +27,6 @@ describe('<Modal />', () => {
     expect(instance).toMatchSnapshot();
   });
 
-  it('should not render its children when mocked with visible=false', () => {
-    const instance = render.create(
-      <Modal visible={false}>
-        <View testID="child" />
-      </Modal>,
-    );
-    expect(instance.root.findAllByProps({testID: 'child'})).toHaveLength(0);
-  });
-
   it('should shallow render as <Modal> when mocked', () => {
     const output = render.shallow(
       <Modal>

diff --git a/Libraries/Modal/__tests__/__snapshots__/Modal-test.js.snap b/Libraries/Modal/__tests__/__snapshots__/Modal-test.js.snap
@@ -13,7 +13,7 @@ exports[`<Modal /> should render as <RCTModalHostView> when not mocked 1`] = `
 <RCTModalHostView
   animationType="none"
   hardwareAccelerated={false}
-  identifier={4}
+  identifier={1}
   onDismiss={[Function]}
   onStartShouldSetResponder={[Function]}
   presentationStyle="fullScreen"

diff --git a/jest/mockModal.js b/jest/mockModal.js
diff --git a/jest/setup.js b/jest/setup.js
@@ -110,11 +110,9 @@ jest
       getNativeRef: jest.fn(),
     }),
   )
-  .mock('../Libraries/Modal/Modal', () => {
-    const baseComponent = mockComponent('../Libraries/Modal/Modal');
-    const mockModal = jest.requireActual('./mockModal');
-    return mockModal(baseComponent);
-  })
+  .mock('../Libraries/Modal/Modal', () =>
+    mockComponent('../Libraries/Modal/Modal'),
+  )
   .mock('../Libraries/Components/View/View', () =>
     mockComponent('../Libraries/Components/View/View', MockNativeMethods),
   )