From b7fdabc4bf2a9dd11a57f98c5229d834c4589bab Mon Sep 17 00:00:00 2001
From: Matias Niemelä
Date: Tue, 23 Jul 2013 23:45:21 -0400
Subject: feat(ngMock): support delay limit for $timeout.flush

---
 src/ngMock/angular-mocks.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src')

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);
   };
 
   /**
-- 
cgit v1.2.3