auto update wrappers behind a flag

enzymejs · Sep 28, 2017 · 09ba714 · 09ba714
1 parent 106b5d1
commit 09ba714
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 6 deletions.
diff --git a/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx b/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx
@@ -3683,6 +3683,55 @@ describeWithDOM('mount', () => {
     });
   });
 
+  describe('out-of-band state updates with autoUpdate', () => {
+    class Child extends React.Component {
+      render() {
+        return <span />;
+      }
+    }
+
+    class Test extends React.Component {
+      componentWillMount() {
+        this.state = {};
+      }
+
+      asyncSetState() {
+        setImmediate(() => {
+          this.setState({ showSpan: true });
+        });
+      }
+
+      callbackSetState() {
+        this.setState({ showSpan: true });
+      }
+
+      render() {
+        return (
+          <div>
+            {this.state && this.state.showSpan && <span className="show-me" />}
+            <button className="async-btn" onClick={() => this.asyncSetState()} />
+            <Child callback={() => this.callbackSetState()} />
+          </div>
+        );
+      }
+    }
+
+    it('should have updated output after an asynchronous setState', (done) => {
+      const wrapper = mount(<Test />, { autoUpdate: true });
+      wrapper.find('.async-btn').simulate('click');
+      setImmediate(() => {
+        expect(wrapper.find('.show-me').length).to.equal(1);
+        done();
+      });
+    });
+
+    it('should have updated output after child prop callback invokes setState', () => {
+      const wrapper = mount(<Test />, { autoUpdate: true });
+      wrapper.find(Child).props().callback();
+      expect(wrapper.find('.show-me').length).to.equal(1);
+    });
+  });
+
   describe('#single()', () => {
     it('throws if run on multiple nodes', () => {
       const wrapper = mount(<div><i /><i /></div>).children();

diff --git a/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx b/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx
@@ -4446,7 +4446,7 @@ describe('shallow', () => {
     });
   });
 
-  describe('out-of-band state updates', () => {
+  describe('out-of-band state updates with autoUpdate', () => {
     class Child extends React.Component {
       render() {
         return <span />;
@@ -4486,19 +4486,17 @@ describe('shallow', () => {
     }
 
     it('should have updated output after an asynchronous setState', (done) => {
-      const wrapper = shallow(<Test />);
+      const wrapper = shallow(<Test />, { autoUpdate: true });
       wrapper.find('.async-btn').simulate('click');
       setImmediate(() => {
-        wrapper.update();
         expect(wrapper.find('.show-me').length).to.equal(1);
         done();
       });
     });
 
     it('should have updated output after child prop callback invokes setState', () => {
-      const wrapper = shallow(<Test />);
+      const wrapper = shallow(<Test />, { autoUpdate: true });
       wrapper.find(Child).props().callback();
-      wrapper.update();
       expect(wrapper.find('.show-me').length).to.equal(1);
     });
   });

diff --git a/packages/enzyme/src/ReactWrapper.js b/packages/enzyme/src/ReactWrapper.js
@@ -124,6 +124,10 @@ class ReactWrapper {
         'ReactWrapper::getNode() can only be called when wrapping one node',
       );
     }
+    if (this[ROOT] === this && this[OPTIONS].autoUpdate) {
+      this[NODE] = this[RENDERER].getNode();
+      this[NODES] = [this[NODE]];
+    }
     return this[NODES][0];
   }
 
@@ -133,6 +137,10 @@ class ReactWrapper {
    * @return {Array<ReactComponent>}
    */
   getNodesInternal() {
+    if (this[ROOT] === this && this[OPTIONS].autoUpdate) {
+      this[NODE] = this[RENDERER].getNode();
+      this[NODES] = [this[NODE]];
+    }
     return this[NODES];
   }
 
@@ -675,7 +683,7 @@ class ReactWrapper {
    */
   parents(selector) {
     const allParents = this.wrap(
-      this.single('parents', n => parentsOfNode(n, this[ROOT].getNodeInternal())),
+      this.single('parents', n => parentsOfNode(n, this[ROOT][NODE])),
     );
     return selector ? allParents.filter(selector) : allParents;
   }

diff --git a/packages/enzyme/src/ShallowWrapper.js b/packages/enzyme/src/ShallowWrapper.js
@@ -164,6 +164,10 @@ class ShallowWrapper {
         'ShallowWrapper::getNode() can only be called when wrapping one node',
       );
     }
+    if (this[ROOT] === this && this[OPTIONS].autoUpdate) {
+      this[NODE] = getRootNode(this[RENDERER].getNode());
+      this[NODES] = [this[NODE]];
+    }
     return this[NODE];
   }
 
@@ -198,6 +202,10 @@ class ShallowWrapper {
   }
 
   getNodesInternal() {
+    if (this[ROOT] === this && this[OPTIONS].autoUpdate) {
+      this[NODE] = getRootNode(this[RENDERER].getNode());
+      this[NODES] = [this[NODE]];
+    }
     return this[NODES];
   }