Merge branch 'master' of https://github.com/beatrichartz/jasmine into beatrichartz-master

- Merges #1362 from @beatrichartz

lib/jasmine-core/jasmine.js

@@ -2758,6 +2758,12 @@ getJasmineRequireObj().toBeCloseTo = function() {
           precision = precision || 2;
         }
 
+        if (expected === null || actual === null) {
+          throw new Error('Cannot use toBeCloseTo with null. Arguments evaluated to: ' +
+            'expect(' + actual + ').toBeCloseTo(' + expected + ').'
+          );
+        }
+
         return {
           pass: Math.abs(expected - actual) < (Math.pow(10, -precision) / 2)
         };

spec/core/matchers/toBeCloseToSpec.js

@@ -29,6 +29,22 @@ describe("toBeCloseTo", function() {
     expect(result.pass).toBe(true);
   });
 
+  it("fails when one of the arguments is null", function() {
+    var matcher = jasmineUnderTest.matchers.toBeCloseTo();
+
+    expect(function() {
+      matcher.compare(null, null);
+    }).toThrowError('Cannot use toBeCloseTo with null. Arguments evaluated to: expect(null).toBeCloseTo(null).');
+
+    expect(function() {
+      matcher.compare(0, null);
+    }).toThrowError('Cannot use toBeCloseTo with null. Arguments evaluated to: expect(0).toBeCloseTo(null).');
+
+    expect(function() {
+      matcher.compare(null, 0);
+    }).toThrowError('Cannot use toBeCloseTo with null. Arguments evaluated to: expect(null).toBeCloseTo(0).');
+  });
+
   it("rounds expected values", function() {
     var matcher = jasmineUnderTest.matchers.toBeCloseTo(),
       result;

src/core/matchers/toBeCloseTo.js

@@ -15,6 +15,12 @@ getJasmineRequireObj().toBeCloseTo = function() {
           precision = precision || 2;
         }
 
+        if (expected === null || actual === null) {
+          throw new Error('Cannot use toBeCloseTo with null. Arguments evaluated to: ' +
+            'expect(' + actual + ').toBeCloseTo(' + expected + ').'
+          );
+        }
+
         return {
           pass: Math.abs(expected - actual) < (Math.pow(10, -precision) / 2)
         };