1. Added fix for checking null or unfined during equality checking

2. Added tests for the check
immutable-js · Apr 11, 2017 · 69fee54 · 69fee54
1 parent 6a50e0d
commit 69fee54
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/__tests__/Record.ts b/__tests__/Record.ts
@@ -72,6 +72,13 @@ describe('Record', () => {
     expect(t1.equals(t2));
   });
 
+  it('if compared against undefined or null should return false', () => {
+    const MyType = Record({ a: 1, b: 2 });
+    const t1 = new MyType();
+    expect(t1.equals(undefined)).toBeFalsy();
+    expect(t1.equals(null)).toBeFalsy();
+  });
+
   it('merges in Objects and other Records', () => {
     let Point2 = Record({x: 0, y: 0});
     let Point3 = Record({x: 0, y: 0, z: 0});

diff --git a/dist/immutable.js b/dist/immutable.js
@@ -5235,8 +5235,10 @@ Record.prototype.toString = function toString () {
 };
 
 Record.prototype.equals = function equals (other) {
-  return this === other ||
-    (this._keys === other._keys && recordSeq(this).equals(recordSeq(other)));
+  return other &&
+    (this === other ||
+      (this._keys === other._keys &&
+        recordSeq(this).equals(recordSeq(other))));
 };
 
 Record.prototype.hashCode = function hashCode () {

diff --git a/dist/immutable.min.js b/dist/immutable.min.js
diff --git a/src/Record.js b/src/Record.js
@@ -86,8 +86,10 @@ export class Record {
   }
 
   equals(other) {
-    return this === other ||
-      (this._keys === other._keys && recordSeq(this).equals(recordSeq(other)));
+    return other &&
+      (this === other ||
+        (this._keys === other._keys &&
+          recordSeq(this).equals(recordSeq(other))));
   }
 
   hashCode() {