equals should skip null and undefined nodes fix #151

enzymejs · Feb 16, 2016 · 4909c4f · 4909c4f
1 parent dd655c4
commit 4909c4f
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 4 deletions.
diff --git a/src/Utils.js b/src/Utils.js
@@ -51,11 +51,12 @@ export function nodeEqual(a, b) {
   const right = propsOfNode(b);
   for (let i = 0; i < leftKeys.length; i++) {
     const prop = leftKeys[i];
-    if (!(prop in right)) return false;
     if (prop === 'children') {
-      if (!childrenEqual(childrenToArray(left.children), childrenToArray(right.children))) {
-        return false;
-      }
+      return childrenEqual(childrenToArray(left.children), childrenToArray(right.children));
+    }
+
+    if (!(prop in right)) {
+      return false;
     } else if (right[prop] === left[prop]) {
       // continue;
     } else if (typeof right[prop] === typeof left[prop] && typeof left[prop] === 'object') {

diff --git a/test/Utils-spec.js b/test/Utils-spec.js
@@ -124,6 +124,34 @@ describe('Utils', () => {
 
     });
 
+    it('should skip null children', () => {
+      expect(nodeEqual(
+        <div>{null}</div>,
+        <div></div>
+      )).to.equal(true);
+    });
+
+    it('should skip undefined children', () => {
+      expect(nodeEqual(
+        <div>{undefined}</div>,
+        <div></div>
+      )).to.equal(true);
+    });
+
+    it('should skip empty children', () => {
+      expect(nodeEqual(
+        <div>{[]}</div>,
+        <div></div>
+      )).to.equal(true);
+    });
+
+    it('should skip array of null children', () => {
+      expect(nodeEqual(
+        <div>{[null, null, null]}</div>,
+        <div></div>
+      )).to.equal(true);
+    });
+
   });
 
   describe('propFromEvent', () => {