[Fix] shallow: .closest(): ensure an empty wrapper is returned fo…

…r no match - Also, refactor `closest` for `mount` Fixes #193
enzymejs · Jul 6, 2018 · ce1e113 · ce1e113
1 parent 1b4a9e0
commit ce1e113
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 3 deletions.
diff --git a/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx b/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx
@@ -2506,6 +2506,21 @@ describeWithDOM('mount', () => {
 
       expect(wrapper.find('.bux').closest('.baz').hasClass('bux')).to.equal(true);
     });
+
+    it('should not find a nonexistent match', () => {
+      const wrapper = mount((
+        <div className="foo">
+          <div className="bar" />
+        </div>
+      ));
+
+      expect(wrapper.find('.fooooo')).to.have.lengthOf(0);
+
+      const bar = wrapper.find('.bar');
+      expect(bar).to.have.lengthOf(1);
+
+      expect(bar.closest('.fooooo')).to.have.lengthOf(0);
+    });
   });
 
   describe('.hasClass(className)', () => {

diff --git a/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx b/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx
@@ -2297,8 +2297,8 @@ describe('shallow', () => {
       ));
 
       const closestFoo = wrapper.find('.bar').closest('.foo');
-      expect(closestFoo.hasClass('baz')).to.equal(true);
       expect(closestFoo).to.have.lengthOf(1);
+      expect(closestFoo.hasClass('baz')).to.equal(true);
     });
 
     it('should only ever return a wrapper of a single node', () => {
@@ -2328,6 +2328,21 @@ describe('shallow', () => {
 
       expect(wrapper.find('.bux').closest('.baz').hasClass('bux')).to.equal(true);
     });
+
+    it('should not find a nonexistent match', () => {
+      const wrapper = shallow((
+        <div className="foo">
+          <div className="bar" />
+        </div>
+      ));
+
+      expect(wrapper.find('.fooooo')).to.have.lengthOf(0);
+
+      const bar = wrapper.find('.bar');
+      expect(bar).to.have.lengthOf(1);
+
+      expect(bar.closest('.fooooo')).to.have.lengthOf(0);
+    });
   });
 
   describe('.hasClass(className)', () => {

diff --git a/packages/enzyme/src/ReactWrapper.js b/packages/enzyme/src/ReactWrapper.js
@@ -688,7 +688,11 @@ class ReactWrapper {
    * @returns {ReactWrapper}
    */
   closest(selector) {
-    return this.is(selector) ? this : this.parents().filter(selector).first();
+    if (this.is(selector)) {
+      return this;
+    }
+    const matchingAncestors = this.parents().filter(selector);
+    return matchingAncestors.length > 0 ? matchingAncestors.first() : this.findWhere(() => false);
   }
 
   /**

diff --git a/packages/enzyme/src/ShallowWrapper.js b/packages/enzyme/src/ShallowWrapper.js
@@ -879,7 +879,11 @@ class ShallowWrapper {
    * @returns {ShallowWrapper}
    */
   closest(selector) {
-    return this.is(selector) ? this : this.parents().filter(selector).first();
+    if (this.is(selector)) {
+      return this;
+    }
+    const matchingAncestors = this.parents().filter(selector);
+    return matchingAncestors.length > 0 ? matchingAncestors.first() : this.findWhere(() => false);
   }
 
   /**