Merge pull request #1478 from KordonDev/master

[Fix] `shallow`: `.at()`: return an empty wrapper when an index does not exist Fixes #1475.
enzymejs · Jul 7, 2018 · 8ec2106 · 8ec2106
2 parents 18de4ed + 9739619
commit 8ec2106
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 3 deletions.
diff --git a/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx b/packages/enzyme-test-suite/test/ReactWrapper-spec.jsx
@@ -3140,6 +3140,19 @@ describeWithDOM('mount', () => {
       expect(wrapper.find('.bar').at(2).hasClass('bux')).to.equal(true);
       expect(wrapper.find('.bar').at(3).hasClass('baz')).to.equal(true);
     });
+
+    it('`.at()` does not affect the results of `.exists()`', () => {
+      const wrapper = mount((
+        <div>
+          <div className="foo" />
+        </div>
+      ));
+      expect(wrapper.find('.bar').exists()).to.equal(false);
+      expect(wrapper.find('.bar').at(0).exists()).to.equal(false);
+
+      expect(wrapper.find('.foo').exists()).to.equal(true);
+      expect(wrapper.find('.foo').at(0).exists()).to.equal(true);
+    });
   });
 
   describe('.get(index)', () => {

diff --git a/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx b/packages/enzyme-test-suite/test/ShallowWrapper-spec.jsx
@@ -3091,6 +3091,19 @@ describe('shallow', () => {
       expect(wrapper.find('.bar').at(2).hasClass('bux')).to.equal(true);
       expect(wrapper.find('.bar').at(3).hasClass('baz')).to.equal(true);
     });
+
+    it('`.at()` does not affect the results of `.exists()`', () => {
+      const wrapper = shallow((
+        <div>
+          <div className="foo" />
+        </div>
+      ));
+      expect(wrapper.find('.bar').exists()).to.equal(false);
+      expect(wrapper.find('.bar').at(0).exists()).to.equal(false);
+
+      expect(wrapper.find('.foo').exists()).to.equal(true);
+      expect(wrapper.find('.foo').at(0).exists()).to.equal(true);
+    });
   });
 
   describe('.get(index)', () => {

diff --git a/packages/enzyme/src/ReactWrapper.js b/packages/enzyme/src/ReactWrapper.js
@@ -919,7 +919,11 @@ class ReactWrapper {
    * @returns {ReactWrapper}
    */
   at(index) {
-    return this.wrap(this.getNodesInternal()[index]);
+    const nodes = this.getNodesInternal();
+    if (index < nodes.length) {
+      return this.wrap(nodes[index]);
+    }
+    return this.wrap([]);
   }
 
   /**

diff --git a/packages/enzyme/src/ShallowWrapper.js b/packages/enzyme/src/ShallowWrapper.js
@@ -1116,7 +1116,7 @@ class ShallowWrapper {
    * @returns {ReactElement}
    */
   get(index) {
-    return getAdapter(this[OPTIONS]).nodeToElement(this.getNodesInternal()[index]);
+    return this.getElements()[index];
   }
 
   /**
@@ -1126,7 +1126,11 @@ class ShallowWrapper {
    * @returns {ShallowWrapper}
    */
   at(index) {
-    return this.wrap(this.getNodesInternal()[index]);
+    const nodes = this.getNodesInternal();
+    if (index < nodes.length) {
+      return this.wrap(nodes[index]);
+    }
+    return this.wrap([]);
   }
 
   /**