[Fix] shallow: .parents: ensure that one .find call does not af…

…fect another. Fixes #1780.
enzymejs · Aug 21, 2018 · 6844716 · 6844716
1 parent dc1426e
commit 6844716
Show file tree

Hide file tree

Showing 5 changed files with 95 additions and 5 deletions.
diff --git a/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx b/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx
@@ -3450,6 +3450,49 @@ describeWithDOM('mount', () => {
       expect(bar).to.have.lengthOf(1);
       expect(bar.parents('.root')).to.have.lengthOf(1);
     });
+
+    it('works when called sequentially on two sibling nodes', () => {
+      class Test extends React.Component {
+        render() {
+          return (
+            <div>
+              <div className="a">
+                <div>A child</div>
+              </div>
+              <div className="b">
+                <div>B child</div>
+              </div>
+            </div>
+          );
+        }
+      }
+
+      const wrapper = mount(<Test />);
+
+      const aChild = wrapper.find({ children: 'A child' });
+      expect(aChild.debug()).to.equal(`<div>
+  A child
+</div>`);
+      expect(aChild).to.have.lengthOf(1);
+
+      const bChild = wrapper.find({ children: 'B child' });
+      expect(bChild.debug()).to.equal(`<div>
+  B child
+</div>`);
+      expect(bChild).to.have.lengthOf(1);
+
+//       const bChildParents = bChild.parents('.b');
+//       expect(bChildParents.debug(`<div className="b">
+//   <div>B child</div>
+// </div>`));
+//       expect(bChildParents).to.have.lengthOf(1);
+
+      const aChildParents = aChild.parents('.b');
+      expect(aChildParents.debug(`<div className="a">
+  <div>A child</div>
+</div>`));
+      expect(aChildParents).to.have.lengthOf(1);
+    });
   });
 
   describe('.parent()', () => {

diff --git a/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx b/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx
@@ -3394,6 +3394,49 @@ describe('shallow', () => {
       expect(parents.at(0).hasClass('foo')).to.equal(true);
       expect(parents.at(1).hasClass('bax')).to.equal(true);
     });
+
+    it('works when called sequentially on two sibling nodes', () => {
+      class Test extends React.Component {
+        render() {
+          return (
+            <div>
+              <div className="a">
+                <div>A child</div>
+              </div>
+              <div className="b">
+                <div>B child</div>
+              </div>
+            </div>
+          );
+        }
+      }
+
+      const wrapper = shallow(<Test />);
+
+      const aChild = wrapper.find({ children: 'A child' });
+      expect(aChild.debug()).to.equal(`<div>
+  A child
+</div>`);
+      expect(aChild).to.have.lengthOf(1);
+
+      const bChild = wrapper.find({ children: 'B child' });
+      expect(bChild.debug()).to.equal(`<div>
+  B child
+</div>`);
+      expect(bChild).to.have.lengthOf(1);
+
+//       const bChildParents = bChild.parents('.b');
+//       expect(bChildParents.debug(`<div className="b">
+//   <div>B child</div>
+// </div>`));
+//       expect(bChildParents).to.have.lengthOf(1);
+
+      const aChildParents = aChild.parents('.a');
+      expect(aChildParents.debug(`<div className="a">
+  <div>A child</div>
+</div>`));
+      expect(aChildParents).to.have.lengthOf(1);
+    });
   });
 
   describe('.parent()', () => {

diff --git a/packages/enzyme/src/RSTTraversal.js b/packages/enzyme/src/RSTTraversal.js
@@ -106,7 +106,7 @@ export function pathToNode(node, root) {
 }
 
 export function parentsOfNode(node, root) {
-  return pathToNode(node, root).reverse();
+  return (pathToNode(node, root) || []).reverse();
 }
 
 export function nodeHasId(node, id) {

diff --git a/packages/enzyme/src/ReactWrapper.js b/packages/enzyme/src/ReactWrapper.js
@@ -702,8 +702,10 @@ class ReactWrapper {
    * @returns {ReactWrapper}
    */
   parents(selector) {
-    const allParents = this.wrap(this.single('parents', n => parentsOfNode(n, this[ROOT].getNodeInternal())));
-    return selector ? allParents.filter(selector) : allParents;
+    return this.single('parents', n => {
+      const allParents = this.wrap(parentsOfNode(n, this[ROOT].getNodeInternal()));
+      return selector ? allParents.filter(selector) : allParents;
+    })
   }
 
   /**

diff --git a/packages/enzyme/src/ShallowWrapper.js b/packages/enzyme/src/ShallowWrapper.js
@@ -931,8 +931,10 @@ class ShallowWrapper {
    * @returns {ShallowWrapper}
    */
   parents(selector) {
-    const allParents = this.wrap(this.single('parents', n => parentsOfNode(n, getRootNodeInternal(this))));
-    return selector ? allParents.filter(selector) : allParents;
+    return this.single('parents', n => {
+      const allParents = this.wrap(parentsOfNode(n, getRootNodeInternal(this)));
+      return selector ? allParents.filter(selector) : allParents;
+    });
   }
 
   /**