Merge pull request #226 from CurtisHumphrey/contains_bug

[contains] Fix bug for matching sub arrays
enzymejs · Mar 7, 2016 · 43f752d · 43f752d
2 parents 907fe34 + c82293c
commit 43f752d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/src/Utils.js b/src/Utils.js
@@ -81,7 +81,8 @@ export function nodeEqual(a, b) {
 
 export function containsChildrenSubArray(match, node, subArray) {
   const children = childrenOfNode(node);
-  return children.some((_, i) => arraysEqual(match, children.slice(i, subArray.length), subArray));
+  const checker = (_, i) => arraysEqual(match, children.slice(i, i + subArray.length), subArray);
+  return children.some(checker);
 }
 
 function arraysEqual(match, left, right) {

diff --git a/test/ReactWrapper-spec.js b/test/ReactWrapper-spec.js
@@ -138,13 +138,18 @@ describeWithDOM('mount', () => {
         <div>Goodbye</div>,
       ];
 
-      const passes = [
+      const passes1 = [
         <span>Hello</span>,
         <div>Goodbye</div>,
       ];
+      const passes2 = [
+        <div>Goodbye</div>,
+        <span>More</span>,
+      ];
 
       expect(wrapper.contains(fails)).to.equal(false);
-      expect(wrapper.contains(passes)).to.equal(true);
+      expect(wrapper.contains(passes1)).to.equal(true);
+      expect(wrapper.contains(passes2)).to.equal(true);
     });
 
   });

diff --git a/test/ShallowWrapper-spec.js b/test/ShallowWrapper-spec.js
@@ -144,13 +144,18 @@ describe('shallow', () => {
         <div>Goodbye</div>,
       ];
 
-      const passes = [
+      const passes1 = [
         <span>Hello</span>,
         <div>Goodbye</div>,
       ];
+      const passes2 = [
+        <div>Goodbye</div>,
+        <span>More</span>,
+      ];
 
       expect(wrapper.contains(fails)).to.equal(false);
-      expect(wrapper.contains(passes)).to.equal(true);
+      expect(wrapper.contains(passes1)).to.equal(true);
+      expect(wrapper.contains(passes2)).to.equal(true);
     });
 
   });