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

Fix #678 Close #679
This commit is contained in:
slackersoft
2014-09-25 12:55:49 -07:00
4 changed files with 5 additions and 2 deletions

View File

@@ -61,6 +61,7 @@ getJasmineRequireObj().MockDate = function() {
}
function createDateProperties() {
FakeDate.prototype = GlobalDate.prototype;
FakeDate.now = function() {
if (GlobalDate.now) {