Merge branch 'mock-date' of https://github.com/jalopez/jasmine into jalopez-mock-date

This commit is contained in:
Elana Koren and Gregg Van Hove
2014-02-27 10:03:35 -08:00
6 changed files with 286 additions and 3 deletions

View File

@@ -11,7 +11,7 @@ getJasmineRequireObj().Env = function(j$) {
var realSetTimeout = j$.getGlobal().setTimeout;
var realClearTimeout = j$.getGlobal().clearTimeout;
this.clock = new j$.Clock(global, new j$.DelayedFunctionScheduler());
this.clock = new j$.Clock(global, new j$.DelayedFunctionScheduler(), new j$.MockDate(global));
var runnableLookupTable = {};