Merge pull request #1812 from jgzuke/jgzuke-test-mount-simulate-bug

[Fix] `mount`: update after `simulateError`
enzymejs · Sep 19, 2018 · f281fef · f281fef
2 parents 508a648 + 54cb6a6
commit f281fef
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 4 deletions.
diff --git a/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx b/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx
@@ -5033,13 +5033,19 @@ describeWithDOM('mount', () => {
         class ErrorBoundary extends React.Component {
           constructor(...args) {
             super(...args);
-            this.state = { throws: false };
+            this.state = {
+              throws: false,
+              didThrow: false,
+            };
           }
 
           componentDidCatch(error, info) {
             const { spy } = this.props;
             spy(error, info);
-            this.setState({ throws: false });
+            this.setState({
+              throws: false,
+              didThrow: true,
+            });
           }
 
           render() {
@@ -5049,6 +5055,9 @@ describeWithDOM('mount', () => {
                 <MaybeFragment>
                   <span>
                     <Thrower throws={throws} />
+                    <div>
+                      {this.state.didThrow ? 'HasThrown' : 'HasNotThrown'}
+                    </div>
                   </span>
                 </MaybeFragment>
               </div>
@@ -5096,6 +5105,18 @@ describeWithDOM('mount', () => {
           });
         });
 
+        it('rerenders on a simulated error', () => {
+          const wrapper = mount(<ErrorBoundary spy={sinon.stub()} />);
+
+          expect(wrapper.find({ children: 'HasThrown' })).to.have.lengthOf(0);
+          expect(wrapper.find({ children: 'HasNotThrown' })).to.have.lengthOf(1);
+
+          expect(() => wrapper.find(Thrower).simulateError(errorToThrow)).not.to.throw();
+
+          expect(wrapper.find({ children: 'HasThrown' })).to.have.lengthOf(1);
+          expect(wrapper.find({ children: 'HasNotThrown' })).to.have.lengthOf(0);
+        });
+
         it('catches errors during render', () => {
           const spy = sinon.spy();
           const wrapper = mount(<ErrorBoundary spy={spy} />);

diff --git a/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx b/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx
@@ -5067,13 +5067,19 @@ describe('shallow', () => {
         class ErrorBoundary extends React.Component {
           constructor(...args) {
             super(...args);
-            this.state = { throws: false };
+            this.state = {
+              throws: false,
+              didThrow: false,
+            };
           }
 
           componentDidCatch(error, info) {
             const { spy } = this.props;
             spy(error, info);
-            this.setState({ throws: false });
+            this.setState({
+              throws: false,
+              didThrow: true,
+            });
           }
 
           render() {
@@ -5083,6 +5089,9 @@ describe('shallow', () => {
                 <MaybeFragment>
                   <span>
                     <Thrower throws={throws} />
+                    <div>
+                      {this.state.didThrow ? 'HasThrown' : 'HasNotThrown'}
+                    </div>
                   </span>
                 </MaybeFragment>
               </div>
@@ -5124,6 +5133,18 @@ describe('shallow', () => {
           });
         });
 
+        it('rerenders on a simulated error', () => {
+          const wrapper = shallow(<ErrorBoundary spy={sinon.stub()} />);
+
+          expect(wrapper.find({ children: 'HasThrown' })).to.have.lengthOf(0);
+          expect(wrapper.find({ children: 'HasNotThrown' })).to.have.lengthOf(1);
+
+          expect(() => wrapper.find(Thrower).simulateError(errorToThrow)).not.to.throw();
+
+          expect(wrapper.find({ children: 'HasThrown' })).to.have.lengthOf(1);
+          expect(wrapper.find({ children: 'HasNotThrown' })).to.have.lengthOf(0);
+        });
+
         it('does not catch errors during shallow render', () => {
           const spy = sinon.spy();
           const wrapper = shallow(<ErrorBoundary spy={spy} />);
@@ -5141,6 +5162,9 @@ describe('shallow', () => {
           expect(() => thrower.dive()).to.throw(errorToThrow);
 
           expect(spy).to.have.property('callCount', 0);
+
+          expect(wrapper.find({ children: 'HasThrown' })).to.have.lengthOf(0);
+          expect(wrapper.find({ children: 'HasNotThrown' })).to.have.lengthOf(1);
         });
       });
     });

diff --git a/packages/enzyme/src/ReactWrapper.js b/packages/enzyme/src/ReactWrapper.js
@@ -643,6 +643,7 @@ class ReactWrapper {
       const nodeHierarchy = [thisNode].concat(nodeParents(this, thisNode));
       renderer.simulateError(nodeHierarchy, rootNode, error);
 
+      this[ROOT].update();
       return this;
     });
   }