diff options
| author | Igor Minar | 2013-08-27 17:20:30 -0700 |
|---|---|---|
| committer | Igor Minar | 2013-08-27 17:23:36 -0700 |
| commit | 4114f9c21bec5a396e59954dfc42d2c96527ac3d (patch) | |
| tree | feae4ef9b6f1b32cb2d5558f3a86f98bbc6382bc /src/ngMock/angular-mocks.js | |
| parent | 70b44ad32a79e0746e19a74bde35f49c79f89942 (diff) | |
| download | angular.js-4114f9c21bec5a396e59954dfc42d2c96527ac3d.tar.bz2 | |
revert: feat(mocks): make $timeout#flush throw an exception when empty
This reverts commit cbf06a5d64aba537f0e2679a194d3998d8365493.
This turned out to be a bad idea because it allow us to fast-forward
the wall clock time (see previous commit).
Diffstat (limited to 'src/ngMock/angular-mocks.js')
| -rw-r--r-- | src/ngMock/angular-mocks.js | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/ngMock/angular-mocks.js b/src/ngMock/angular-mocks.js index 05fdc4ed..125a42a6 100644 --- a/src/ngMock/angular-mocks.js +++ b/src/ngMock/angular-mocks.js @@ -104,28 +104,19 @@ angular.mock.$Browser = function() { * @param {number=} number of milliseconds to flush. See {@link #defer.now} */ self.defer.flush = function(delay) { - var flushedSomething = false; - if (angular.isDefined(delay)) { self.defer.now += delay; } else { if (self.deferredFns.length) { self.defer.now = self.deferredFns[self.deferredFns.length-1].time; + } else { + throw Error('No deferred tasks to be flushed'); } } while (self.deferredFns.length && self.deferredFns[0].time <= self.defer.now) { - flushedSomething = true; self.deferredFns.shift().fn(); } - - if (!flushedSomething) { - if (angular.isUndefined(delay)) { - throw Error('No deferred tasks to be flushed!'); - } else { - throw Error('No deferred tasks with delay up to ' + delay + 'ms to be flushed!') - } - } }; /** |
