sjfloat
diff --git a/‎__tests__/Equality.ts
Copy file name to clipboardExpand all lines: __tests__/Equality.ts
+36-3Lines changed: 36 additions & 3 deletions b/‎__tests__/Equality.ts
Copy file name to clipboardExpand all lines: __tests__/Equality.ts
+36-3Lines changed: 36 additions & 3 deletions
diff --git a/‎dist/immutable.js
Copy file name to clipboardExpand all lines: dist/immutable.js
+12-4Lines changed: 12 additions & 4 deletions b/‎dist/immutable.js
Copy file name to clipboardExpand all lines: dist/immutable.js
+12-4Lines changed: 12 additions & 4 deletions
@@ -12,14 +12,16 @@ describe('Equality', () => {
 
   function expectIs(left, right) {
     var comparison = Immutable.is(left, right);
+    expect(comparison).toBe(true);
     var commutative = Immutable.is(right, left);
-    return comparison && commutative && comparison === commutative;
+    expect(commutative).toBe(true);
   }
 
   function expectIsNot(left, right) {
     var comparison = Immutable.is(left, right);
+    expect(comparison).toBe(false);
     var commutative = Immutable.is(right, left);
-    return !comparison && !commutative && comparison === commutative;
+    expect(commutative).toBe(false);
   }
 
   it('uses Object.is semantics', () => {
@@ -36,7 +38,9 @@ describe('Equality', () => {
     expectIs(NaN, NaN);
     expectIs(0, 0);
     expectIs(-0, -0);
-    expectIsNot(0, -0);
+    // Note: Unlike Object.is, Immutable.is assumes 0 and -0 are the same value,
+    // matching the behavior of ES6 Map key equality.
+    expectIs(0, -0);
     expectIs(NaN, 0/0);
 
     var string = "hello";
@@ -54,6 +58,35 @@ describe('Equality', () => {
     expectIsNot(object, {key:'value'});
   });
 
+  it('dereferences things', () => {
+    var ptrA = {foo: 1}, ptrB = {foo: 2};
+    expectIsNot(ptrA, ptrB);
+    ptrA.valueOf = ptrB.valueOf = function() {
+      return 5;
+    }
+    expectIs(ptrA, ptrB);
+    var object = {key:'value'};
+    ptrA.valueOf = ptrB.valueOf = function() {
+      return object;
+    }
+    expectIs(ptrA, ptrB);
+    ptrA.valueOf = ptrB.valueOf = function() {
+      return null;
+    }
+    expectIs(ptrA, ptrB);
+    ptrA.valueOf = ptrB.valueOf = function() {
+      return void 0;
+    }
+    expectIs(ptrA, ptrB);
+    ptrA.valueOf = function() {
+      return 4;
+    }
+    ptrB.valueOf = function() {
+      return 5;
+    }
+    expectIsNot(ptrA, ptrB);
+  });
+
   it('compares sequences', () => {
     var arraySeq = Immutable.Seq.of(1,2,3);
     var arraySeq2 = Immutable.Seq([1,2,3]);
 
@@ -690,11 +690,19 @@
         typeof valueB.valueOf === 'function') {
       valueA = valueA.valueOf();
       valueB = valueB.valueOf();
+      if (valueA === valueB || (valueA !== valueA && valueB !== valueB)) {
+        return true;
+      }
+      if (!valueA || !valueB) {
+        return false;
+      }
+    }
+    if (typeof valueA.equals === 'function' &&
+        typeof valueB.equals === 'function' &&
+        valueA.equals(valueB)) {
+      return true;
     }
-    return typeof valueA.equals === 'function' &&
-      typeof valueB.equals === 'function' ?
-        valueA.equals(valueB) :
-        valueA === valueB || (valueA !== valueA && valueB !== valueB);
+    return false;
   }
 
   function fromJS(json, converter) {