From cbf06a5d64aba537f0e2679a194d3998d8365493 Mon Sep 17 00:00:00 2001
From: Igor Minar
Date: Sat, 24 Aug 2013 14:18:47 -0700
Subject: feat(mocks): make $timeout#flush throw an exception when empty

When calling $timeout.flush with or without a delay an exception should
be thrown if there is nothing to be flushed.

This prevents tests from flushing stuff unnecessarily.

BREAKING CHANGE: calling $timeout.flush(delay) when there is no task to be flushed
within the delay throws an exception now.

Please adjust the delay or remove the flush call from your tests as the exception
is a signed of a programming error.
---
 src/ngMock/angular-mocks.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/ngMock/angular-mocks.js b/src/ngMock/angular-mocks.js
index 125a42a6..05fdc4ed 100644
--- a/src/ngMock/angular-mocks.js
+++ b/src/ngMock/angular-mocks.js
@@ -104,19 +104,28 @@ 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!')
+      }
+    }
   };
 
   /**
-- 
cgit v1.2.3