aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ngMock/angular-mocks.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ngMock/angular-mocks.js b/src/ngMock/angular-mocks.js
index 3024a4c9..aed67c29 100644
--- a/src/ngMock/angular-mocks.js
+++ b/src/ngMock/angular-mocks.js
@@ -1487,9 +1487,11 @@ angular.mock.$TimeoutDecorator = function($delegate, $browser) {
* @description
*
* Flushes the queue of pending tasks.
+ *
+ * @param {number=} delay maximum timeout amount to flush up until
*/
- $delegate.flush = function() {
- $browser.defer.flush();
+ $delegate.flush = function(delay) {
+ $browser.defer.flush(delay);
};
/**