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

Fix #678 Close #679
2014-09-25 12:55:49 -07:00
parent ba0982d89f 62840f72a6
commit 1fb0d2eefa
4 changed files with 5 additions and 2 deletions
--- 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) {