diff options
Diffstat (limited to 'src/angular-mocks.js')
| -rw-r--r-- | src/angular-mocks.js | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/angular-mocks.js b/src/angular-mocks.js index 5cf7ff7c..0f806917 100644 --- a/src/angular-mocks.js +++ b/src/angular-mocks.js @@ -161,12 +161,19 @@ function MockBrowser() { self.lastCookieHash = {}; self.deferredFns = []; - self.defer = function(fn) { - self.deferredFns.push(fn); + self.defer = function(fn, delay) { + delay = delay || 0; + self.deferredFns.push({time:(self.defer.now + delay), fn:fn}); + self.deferredFns.sort(function(a,b){ return a.time - b.time;}); }; - self.defer.flush = function() { - while (self.deferredFns.length) self.deferredFns.shift()(); + self.defer.now = 0; + + self.defer.flush = function(time) { + self.defer.now += (time || 0); + while (self.deferredFns.length && self.deferredFns[0].time <= self.defer.now) { + self.deferredFns.shift().fn(); + } }; } MockBrowser.prototype = { |
