expect(null).toEqual(jasmine.any(Object)) no longer passes

[Finishes #153181443] Fixes #1255.
2017-11-29 08:10:01 -08:00
parent 9619acf91f
commit a63172f53f
3 changed files with 9 additions and 2 deletions
--- a/src/core/asymmetric_equality/Any.js
+++ b/src/core/asymmetric_equality/Any.js
@@ -24,7 +24,7 @@ getJasmineRequireObj().Any = function(j$) {
    }

    if (this.expectedObject == Object) {
-      return typeof other == 'object';
+      return other !== null && typeof other == 'object';
    }

    if (this.expectedObject == Boolean) {