f

Author: Jack Pope

packages/react-reconciler/src/__tests__/ErrorBoundaryReconciliation-test.internal.js

@@ -46,61 +46,45 @@ describe('ErrorBoundaryReconciliation', () => {
       fail ? <InvalidType /> : <span prop="BrokenRender" />;
   });
 
-  async function sharedTest(ErrorBoundary, fallbackTagName, isConcurrent) {
-    let renderer;
+  [true, false].forEach(isConcurrent => {
+    async function sharedTest(ErrorBoundary, fallbackTagName) {
+      let renderer;
 
-    await act(() => {
-      renderer = ReactTestRenderer.create(
-        <ErrorBoundary fallbackTagName={fallbackTagName}>
-          <BrokenRender fail={false} />
-        </ErrorBoundary>,
-        {unstable_isConcurrent: isConcurrent},
-      );
-    });
-    expect(renderer).toMatchRenderedOutput(<span prop="BrokenRender" />);
-
-    await expect(async () => {
       await act(() => {
-        renderer.update(
+        renderer = ReactTestRenderer.create(
           <ErrorBoundary fallbackTagName={fallbackTagName}>
-            <BrokenRender fail={true} />
+            <BrokenRender fail={false} />
           </ErrorBoundary>,
+          {unstable_isConcurrent: isConcurrent},
         );
       });
-    }).toErrorDev(isConcurrent ? ['invalid', 'invalid'] : ['invalid']);
-    const Fallback = fallbackTagName;
-    expect(renderer).toMatchRenderedOutput(<Fallback prop="ErrorBoundary" />);
-  }
+      expect(renderer).toMatchRenderedOutput(<span prop="BrokenRender" />);
 
-  describe('isConcurrent', () => {
-    it('componentDidCatch can recover by rendering an element of the same type', () =>
-      sharedTest(DidCatchErrorBoundary, 'span', true));
+      await expect(async () => {
+        await act(() => {
+          renderer.update(
+            <ErrorBoundary fallbackTagName={fallbackTagName}>
+              <BrokenRender fail={true} />
+            </ErrorBoundary>,
+          );
+        });
+      }).toErrorDev(['invalid', 'invalid']);
+      const Fallback = fallbackTagName;
+      expect(renderer).toMatchRenderedOutput(<Fallback prop="ErrorBoundary" />);
+    }
 
-    it('componentDidCatch can recover by rendering an element of a different type', () =>
-      sharedTest(DidCatchErrorBoundary, 'div', true));
+    describe(isConcurrent ? 'concurrent' : 'sync', () => {
+      it('componentDidCatch can recover by rendering an element of the same type', () =>
+        sharedTest(DidCatchErrorBoundary, 'span'));
 
-    it('getDerivedStateFromError can recover by rendering an element of the same type', () =>
-      sharedTest(GetDerivedErrorBoundary, 'span', true));
-
-    it('getDerivedStateFromError can recover by rendering an element of a different type', () =>
-      sharedTest(GetDerivedErrorBoundary, 'div', true));
-  });
+      it('componentDidCatch can recover by rendering an element of a different type', () =>
+        sharedTest(DidCatchErrorBoundary, 'div'));
 
-  describe('legacy', () => {
-    // @gate !disableLegacyMode
-    it('componentDidCatch can recover by rendering an element of the same type', () =>
-      sharedTest(DidCatchErrorBoundary, 'span', false));
+      it('getDerivedStateFromError can recover by rendering an element of the same type', () =>
+        sharedTest(GetDerivedErrorBoundary, 'span'));
 
-    // @gate !disableLegacyMode
-    it('componentDidCatch can recover by rendering an element of a different type', () =>
-      sharedTest(DidCatchErrorBoundary, 'div', false));
-
-    // @gate !disableLegacyMode
-    it('getDerivedStateFromError can recover by rendering an element of the same type', () =>
-      sharedTest(GetDerivedErrorBoundary, 'span', false));
-
-    // @gate !disableLegacyMode
-    it('getDerivedStateFromError can recover by rendering an element of a different type', () =>
-      sharedTest(GetDerivedErrorBoundary, 'div', false));
+      it('getDerivedStateFromError can recover by rendering an element of a different type', () =>
+        sharedTest(GetDerivedErrorBoundary, 'div'));
+    });
   });
 });