aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ngMock/angular-mocks.js30
-rw-r--r--test/ng/timeoutSpec.js2
-rw-r--r--test/ngMock/angular-mocksSpec.js4
3 files changed, 10 insertions, 26 deletions
diff --git a/src/ngMock/angular-mocks.js b/src/ngMock/angular-mocks.js
index 4fef3ee4..1ba642f0 100644
--- a/src/ngMock/angular-mocks.js
+++ b/src/ngMock/angular-mocks.js
@@ -75,6 +75,13 @@ angular.mock.$Browser = function() {
};
+ /**
+ * @name ngMock.$browser#defer.now
+ * @propertyOf ngMock.$browser
+ *
+ * @description
+ * Current milliseconds mock time.
+ */
self.defer.now = 0;
@@ -119,29 +126,6 @@ angular.mock.$Browser = function() {
}
};
- /**
- * @name ngMock.$browser#defer.flushNext
- * @methodOf ngMock.$browser
- *
- * @description
- * Flushes next pending request and compares it to the provided delay
- *
- * @param {number=} expectedDelay the delay value that will be asserted against the delay of the next timeout function
- */
- self.defer.flushNext = function(expectedDelay) {
- var tick = self.deferredFns.shift();
- expect(tick.time).toEqual(expectedDelay);
- tick.fn();
- };
-
- /**
- * @name ngMock.$browser#defer.now
- * @propertyOf ngMock.$browser
- *
- * @description
- * Current milliseconds mock time.
- */
-
self.$$baseHref = '';
self.baseHref = function() {
return this.$$baseHref;
diff --git a/test/ng/timeoutSpec.js b/test/ng/timeoutSpec.js
index 832528e9..8de63bec 100644
--- a/test/ng/timeoutSpec.js
+++ b/test/ng/timeoutSpec.js
@@ -77,7 +77,7 @@ describe('$timeout', function() {
var promise2 = $timeout(function() {}, 100, false);
expect(cancelSpy).not.toHaveBeenCalled();
- $timeout.flushNext(0);
+ $timeout.flush(0);
// Promise1 deferred object should already be removed from the list and not cancellable
$timeout.cancel(promise1);
diff --git a/test/ngMock/angular-mocksSpec.js b/test/ngMock/angular-mocksSpec.js
index 966877b8..e506e608 100644
--- a/test/ngMock/angular-mocksSpec.js
+++ b/test/ngMock/angular-mocksSpec.js
@@ -417,9 +417,9 @@ describe('ngMock', function() {
$timeout(iterate, 100);
$timeout(iterate, 123);
- $timeout.flushNext(100);
+ $timeout.flush(100);
expect(count).toBe(1);
- $timeout.flushNext(123);
+ $timeout.flush(123);
expect(count).toBe(2);
}));
});