admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-clock-date' of https://github.com/andrewiggins/jasmine into andrewiggins-fix-clock-date

Browse Source 
Fixes #915
Merges #980
This commit is contained in:
Gregg Van Hove
2015-12-22 14:49:18 -08:00
parent 79206ccff5 c8b212f278
commit 17c5e2b10d
4 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/DelayedFunctionScheduler.js
View File

@@ -6,11 +6,11 @@ getJasmineRequireObj().DelayedFunctionScheduler = function() {
var currentTime = 0;
var delayedFnCount = 0;
self.tick = function(millis) {
self.tick = function(millis, tickDate) {
millis = millis || 0;
var endTime = currentTime + millis;
runScheduledFunctions(endTime);
runScheduledFunctions(endTime, tickDate);
currentTime = endTime;
};
@@ -113,13 +113,18 @@ getJasmineRequireObj().DelayedFunctionScheduler = function() {
}
}
function runScheduledFunctions(endTime) {
function runScheduledFunctions(endTime, tickDate) {
tickDate = tickDate || function() {};
if (scheduledLookup.length === 0 || scheduledLookup[0] > endTime) {
tickDate(endTime);
return;
}
do {
currentTime = scheduledLookup.shift();
var newCurrentTime = scheduledLookup.shift();
tickDate(newCurrentTime - currentTime);
currentTime = newCurrentTime;
var funcsToRun = scheduledFunctions[currentTime];
delete scheduledFunctions[currentTime];