[Fix] mount: findWhere: avoid passing empty wrappers to predicate

Fixes #1993.
enzymejs · Feb 1, 2019 · 9717f61 · 9717f61
1 parent a7c541b
commit 9717f61
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 2 deletions.
diff --git a/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx b/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx
@@ -1596,6 +1596,21 @@ describeWithDOM('mount', () => {
       expect(wrapper.findWhere(() => false)).to.have.lengthOf(0);
     });
 
+    it('does not pass empty wrappers', () => {
+      class EditableText extends React.Component {
+        render() {
+          return <div>{''}</div>;
+        }
+      }
+
+      const wrapper = mount(<EditableText />);
+
+      const stub = sinon.stub();
+      wrapper.findWhere(stub);
+      const passedNodeLengths = stub.getCalls().map(({ args: [firstArg] }) => firstArg.length);
+      expect(passedNodeLengths).to.eql([1, 1]);
+    });
+
     it('calls the predicate with the wrapped node as the first argument', () => {
       const wrapper = mount((
         <div>

diff --git a/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx b/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx
@@ -1572,6 +1572,21 @@ describe('shallow', () => {
       expect(wrapper.findWhere(() => false)).to.have.lengthOf(0);
     });
 
+    it('does not pass empty wrappers', () => {
+      class EditableText extends React.Component {
+        render() {
+          return <div>{''}</div>;
+        }
+      }
+
+      const wrapper = shallow(<EditableText />);
+
+      const stub = sinon.stub();
+      wrapper.findWhere(stub);
+      const passedNodeLengths = stub.getCalls().map(({ args: [firstArg] }) => firstArg.length);
+      expect(passedNodeLengths).to.eql([1, 1]);
+    });
+
     it('calls the predicate with the wrapped node as the first argument', () => {
       const wrapper = shallow((
         <div>

diff --git a/packages/enzyme/src/ReactWrapper.js b/packages/enzyme/src/ReactWrapper.js
@@ -1019,7 +1019,10 @@ class ReactWrapper {
    * @returns {ReactWrapper}
    */
   findWhere(predicate) {
-    return findWhereUnwrapped(this, n => predicate(this.wrap(n)));
+    return findWhereUnwrapped(this, (n) => {
+      const node = this.wrap(n);
+      return node.length > 0 && predicate(node);
+    });
   }
 
   /**

diff --git a/packages/enzyme/src/ShallowWrapper.js b/packages/enzyme/src/ShallowWrapper.js
@@ -1365,7 +1365,10 @@ class ShallowWrapper {
    * @returns {ShallowWrapper}
    */
   findWhere(predicate) {
-    return findWhereUnwrapped(this, n => predicate(this.wrap(n)));
+    return findWhereUnwrapped(this, (n) => {
+      const node = this.wrap(n);
+      return node.length > 0 && predicate(node);
+    });
   }
 
   /**