aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVojta Jina2013-09-05 12:01:31 -0700
committerVojta Jina2013-10-02 15:59:49 -0700
commitfc8034b352121f8f057dbd5e3837eeb17e1df580 (patch)
treeb6b6dc6fdc151006e39817f808e937bb3c3d2260 /src
parentd70711481e6311c9cd283d650f07ca0cca72ecc2 (diff)
downloadangular.js-fc8034b352121f8f057dbd5e3837eeb17e1df580.tar.bz2
feat(ngMock.$timeout): remove flushNext method
Diffstat (limited to 'src')
-rw-r--r--src/ngMock/angular-mocks.js30
1 files changed, 7 insertions, 23 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;