diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index 5fafa405..c9866039 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -821,7 +821,7 @@ getJasmineRequireObj().Env = function(j$) { message += error.message || error; } - currentSpec.addExpectationResult(false, { + currentRunnable().addExpectationResult(false, { matcherName: '', passed: false, expected: '', @@ -1490,6 +1490,7 @@ getJasmineRequireObj().MockDate = function() { } function createDateProperties() { + FakeDate.prototype = GlobalDate.prototype; FakeDate.now = function() { if (GlobalDate.now) { diff --git a/spec/core/ClockSpec.js b/spec/core/ClockSpec.js index 18d281bf..a7acb244 100644 --- a/spec/core/ClockSpec.js +++ b/spec/core/ClockSpec.js @@ -389,7 +389,7 @@ describe("Clock (acceptance)", function() { clock.tick(6); expect(delayedFn1).toHaveBeenCalled(); - expect(delayedFn2).toHaveBeenCalled(); + expect(delayedFn2).toHaveBeenCalled(); }); it("does not mock the Date object by default", function() { diff --git a/spec/core/MockDateSpec.js b/spec/core/MockDateSpec.js index 250fe457..f8f3bb56 100644 --- a/spec/core/MockDateSpec.js +++ b/spec/core/MockDateSpec.js @@ -75,6 +75,7 @@ describe("FakeDate", function() { mockDate.install(); expect(new fakeGlobal.Date()).toEqual(jasmine.any(Date)); + expect(new fakeGlobal.Date() instanceof fakeGlobal.Date).toBe(true); }); it("fakes current time when using Date.now()", function() { diff --git a/src/core/MockDate.js b/src/core/MockDate.js index db347bbe..e7914fb2 100644 --- a/src/core/MockDate.js +++ b/src/core/MockDate.js @@ -61,6 +61,7 @@ getJasmineRequireObj().MockDate = function() { } function createDateProperties() { + FakeDate.prototype = GlobalDate.prototype; FakeDate.now = function() { if (GlobalDate.now) {