add $browser.$defer.cancel

NEEDS TESTS

Author: IgorMinar

src/Browser.js

@@ -35,6 +35,8 @@ function Browser(window, document, body, XHR, $log) {
   var self = this,
       location = window.location,
       setTimeout = window.setTimeout,
+      clearTimeout = window.clearTimeout,
+      pendingDeferIds = {},
       lastLocationUrl;
 
   self.isMock = false;
@@ -348,10 +350,26 @@ function Browser(window, document, body, XHR, $log) {
    *
    */
   self.defer = function(fn, delay) {
+    var timeoutId;
     outstandingRequestCount++;
-    setTimeout(function() { completeOutstandingRequest(fn); }, delay || 0);
+    timeoutId = setTimeout(function() {
+      delete pendingDeferIds[timeoutId];
+      completeOutstandingRequest(fn);
+    }, delay || 0);
+    pendingDeferIds[timeoutId] = true;
+    return timeoutId;
   };
 
+
+  self.defer.cancel = function(deferId) {
+    if (pendingDeferIds[deferId]) {
+      delete pendingDeferIds[timeoutId];
+      clearTimeout(deferId);
+      return true;
+    }
+  };
+
+
   //////////////////////////////////////////////////////////////
   // Misc API
   //////////////////////////////////////////////////////////////

src/angular-mocks.js

@@ -153,15 +153,32 @@ function MockBrowser() {
   self.cookieHash = {};
   self.lastCookieHash = {};
   self.deferredFns = [];
+  self.deferredNextId = 0;
 
   self.defer = function(fn, delay) {
     delay = delay || 0;
-    self.deferredFns.push({time:(self.defer.now + delay), fn:fn});
+    self.deferredFns.push({time:(self.defer.now + delay), fn:fn, id: self.deferredNextId});
     self.deferredFns.sort(function(a,b){ return a.time - b.time;});
+    return self.deferredNextId++;
   };
 
+
   self.defer.now = 0;
 
+
+  self.defer.cancel = function(deferId) {
+    var fnIndex;
+
+    forEach(self.deferredFns, function(fn, index) {
+      if (fn.id === deferId) fnIndex = index;
+    });
+
+    if (fnIndex) {
+      self.deferredFns.splice(fnIndex, 1);
+    }
+  }
+
+
   self.defer.flush = function(time) {
     self.defer.now += (time || 0);
     while (self.deferredFns.length && self.deferredFns[0].time <= self.defer.now) {