refactor(ngMock/$interval): more closely follow actual $interval's internal implementation

Author: gkalpak

src/ngMock/angular-mocks.js

@@ -552,13 +552,15 @@ angular.mock.$IntervalProvider = function() {
           promise = deferred.promise;
 
       count = (angular.isDefined(count)) ? count : 0;
-      promise.then(null, function() {}, (!hasParams) ? fn : function() {
-        fn.apply(null, args);
-      });
 
       promise.$$intervalId = nextRepeatId;
 
       function tick() {
+        if (skipApply) {
+          $browser.defer(callback);
+        } else {
+          $rootScope.$evalAsync(callback);
+        }
         deferred.notify(iteration++);
 
         if (count > 0 && iteration >= count) {
@@ -581,6 +583,14 @@ angular.mock.$IntervalProvider = function() {
         }
       }
 
+      function callback() {
+        if (!hasParams) {
+          fn(iteration);
+        } else {
+          fn.apply(null, args);
+        }
+      }
+
       repeatFns.push({
         nextTime: (now + (delay || 0)),
         delay: delay || 1,

test/ngMock/angular-mocksSpec.js

@@ -323,16 +323,16 @@ describe('ngMock', function() {
 
     it('should NOT call $apply if invokeApply is set to false',
         inject(function($interval, $rootScope) {
-      var applySpy = spyOn($rootScope, '$apply').and.callThrough();
+      var digestSpy = spyOn($rootScope, '$digest').and.callThrough();
 
       var counter = 0;
       $interval(function increment() { counter++; }, 1000, 0, false);
 
-      expect(applySpy).not.toHaveBeenCalled();
+      expect(digestSpy).not.toHaveBeenCalled();
       expect(counter).toBe(0);
 
       $interval.flush(2000);
-      expect(applySpy).not.toHaveBeenCalled();
+      expect(digestSpy).not.toHaveBeenCalled();
       expect(counter).toBe(2);
     }));