remove need for ShallowWrapper#update

jwbay · Aug 13, 2017 · df609cf · df609cf
1 parent 3db226c
commit df609cf
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/src/ShallowWrapper.js b/src/ShallowWrapper.js
@@ -151,6 +151,10 @@ class ShallowWrapper {
         'ShallowWrapper::getNode() can only be called when wrapping one node',
       );
     }
+    if (this.root === this) {
+      this.node = getRootNode(this.renderer.getNode());
+      this.nodes = [this.node];
+    }
     return this.node;
   }
 
@@ -160,6 +164,10 @@ class ShallowWrapper {
    * @return {Array<ReactElement>}
    */
   getNodes() {
+    if (this.root === this) {
+      this.node = getRootNode(this.renderer.getNode());
+      this.nodes = [this.node];
+    }
     return this.nodes;
   }
 

diff --git a/src/adapters/ReactFifteenFourAdapter.js b/src/adapters/ReactFifteenFourAdapter.js
@@ -116,6 +116,7 @@ class ReactFifteenFourAdapter extends EnzymeAdapter {
     const renderer = TestUtils.createRenderer();
     let isDOM = false;
     let cachedNode = null;
+    let cachedOutput = null;
     return {
       render(el, context) {
         cachedNode = el;
@@ -132,7 +133,11 @@ class ReactFifteenFourAdapter extends EnzymeAdapter {
       },
       getNode() {
         if (isDOM) {
-          return elementToTree(cachedNode);
+          // a shallow wrapper around a DOM node can never be updated.
+          // this is mainly to preserve reference equality that some
+          // tests were asserting on though
+          cachedOutput = cachedOutput || elementToTree(cachedNode);
+          return cachedOutput;
         }
         const output = renderer.getRenderOutput();
         return {

diff --git a/test/ShallowWrapper-spec.jsx b/test/ShallowWrapper-spec.jsx
@@ -4156,10 +4156,10 @@ describe('shallow', () => {
       const b1 = wrapper.find('a').get(1);
       const c1 = wrapper.find('a').get(2);
       const d1 = wrapper.find('a').get(3);
-      expect(a1).to.equal(a);
-      expect(b1).to.equal(b);
-      expect(c1).to.equal(c);
-      expect(d1).to.equal(d);
+      expect(a1).to.eql(a);
+      expect(b1).to.eql(b);
+      expect(c1).to.eql(c);
+      expect(d1).to.eql(d);
     });
   });
 
@@ -4253,7 +4253,6 @@ describe('shallow', () => {
       const wrapper = shallow(<Test />);
       wrapper.find('.async-btn').simulate('click');
       setImmediate(() => {
-        wrapper.update(); // TODO(lmr): this is a breaking change...
         expect(wrapper.find('.show-me').length).to.equal(1);
         done();
       });
@@ -4262,7 +4261,6 @@ describe('shallow', () => {
     it('should have updated output after child prop callback invokes setState', () => {
       const wrapper = shallow(<Test />);
       wrapper.find(Child).props().callback();
-      wrapper.update(); // TODO(lmr): this is a breaking change...
       expect(wrapper.find('.show-me').length).to.equal(1);
     });
   });