[enzyme-adapter-react-16] [fix] fix simulateError() on Memo component

enzymejs · Jun 15, 2021 · 8c55734 · 8c55734
1 parent f046079
commit 8c55734
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 3 deletions.
diff --git a/packages/enzyme-adapter-react-16/src/ReactSixteenAdapter.js b/packages/enzyme-adapter-react-16/src/ReactSixteenAdapter.js
@@ -527,7 +527,7 @@ class ReactSixteenAdapter extends EnzymeAdapter {
           rootNode,
           nodeHierarchy,
           nodeTypeFromType,
-          adapter.displayNameOfNode,
+          adapter.displayNameOfNode.bind(adapter),
           is166 ? catchingType : undefined,
         );
       },
@@ -787,7 +787,7 @@ class ReactSixteenAdapter extends EnzymeAdapter {
           cachedNode,
           nodeHierarchy.concat(cachedNode),
           nodeTypeFromType,
-          adapter.displayNameOfNode,
+          adapter.displayNameOfNode.bind(adapter),
           is166 ? cachedNode.type : undefined,
         );
       },

diff --git a/packages/enzyme-test-suite/test/shared/lifecycles/componentDidCatch.jsx b/packages/enzyme-test-suite/test/shared/lifecycles/componentDidCatch.jsx
@@ -54,6 +54,7 @@ export default function describeCDC({
         }
 
         render() {
+          const { ThrowerComponent } = this.props;
           const {
             didThrow,
             throws,
@@ -62,7 +63,7 @@ export default function describeCDC({
             <div>
               <MaybeFragment>
                 <span>
-                  <Thrower throws={throws} />
+                  {<ThrowerComponent throws={throws} />}
                   <div>
                     {didThrow ? 'HasThrown' : 'HasNotThrown'}
                   </div>
@@ -73,6 +74,10 @@ export default function describeCDC({
         }
       }
 
+      ErrorBoundary.defaultProps = {
+        ThrowerComponent: Thrower,
+      };
+
       function ErrorSFC(props) {
         return <ErrorBoundary {...props} />;
       }
@@ -121,6 +126,39 @@ export default function describeCDC({
         });
       });
 
+      itIf(
+        is('>= 16.6'),
+        'catches a simulated error on memo() component',
+        () => {
+          const MemoThrower = React.memo(Thrower);
+          const spy = sinon.spy();
+          const wrapper = Wrap(
+            <ErrorBoundary spy={spy} ThrowerComponent={MemoThrower} />,
+          );
+
+          expect(spy).to.have.property('callCount', 0);
+
+          expect(() => wrapper.find(Thrower).simulateError(errorToThrow)).not.to.throw();
+
+          expect(spy).to.have.property('callCount', 1);
+
+          expect(spy.args).to.be.an('array').and.have.lengthOf(1);
+          const [[actualError, info]] = spy.args;
+          expect(() => {
+            throw actualError;
+          }).to.throw(errorToThrow);
+          expect(info).to.deep.equal({
+            componentStack: `
+    in Memo(Thrower) (created by ErrorBoundary)
+    in span (created by ErrorBoundary)${hasFragments ? '' : `
+    in main (created by ErrorBoundary)`}
+    in div (created by ErrorBoundary)
+    in ErrorBoundary (created by WrapperComponent)
+    in WrapperComponent`,
+          });
+        },
+      );
+
       it('rerenders on a simulated error', () => {
         const wrapper = Wrap(<ErrorBoundary spy={sinon.stub()} />);