diff --git a/src/AngularPublic.js b/src/AngularPublic.js index 3f530626d3e2..dff1ce015ae1 100644 --- a/src/AngularPublic.js +++ b/src/AngularPublic.js @@ -87,7 +87,6 @@ $$TestabilityProvider, $TimeoutProvider, $$RAFProvider, - $$AsyncCallbackProvider, $WindowProvider, $$jqLiteProvider, $$CookieReaderProvider @@ -248,7 +247,6 @@ function publishExternalAPI(angular) { $timeout: $TimeoutProvider, $window: $WindowProvider, $$rAF: $$RAFProvider, - $$asyncCallback: $$AsyncCallbackProvider, $$jqLite: $$jqLiteProvider, $$HashMap: $$HashMapProvider, $$cookieReader: $$CookieReaderProvider diff --git a/src/ngMock/angular-mocks.js b/src/ngMock/angular-mocks.js index 090cac87f433..e5de17c2d4f8 100644 --- a/src/ngMock/angular-mocks.js +++ b/src/ngMock/angular-mocks.js @@ -764,15 +764,14 @@ angular.mock.animate = angular.module('ngAnimateMock', ['ng']) }; }); - $provide.decorator('$animate', ['$delegate', '$$asyncCallback', '$timeout', '$browser', '$$rAF', - function($delegate, $$asyncCallback, $timeout, $browser, $$rAF) { + $provide.decorator('$animate', ['$delegate', '$timeout', '$browser', '$$rAF', + function($delegate, $timeout, $browser, $$rAF) { var animate = { queue: [], cancel: $delegate.cancel, enabled: $delegate.enabled, triggerCallbackEvents: function() { $$rAF.flush(); - $$asyncCallback.flush(); }, triggerCallbackPromise: function() { $timeout.flush(0); @@ -1764,20 +1763,6 @@ angular.mock.$RAFDecorator = ['$delegate', function($delegate) { return rafFn; }]; -angular.mock.$AsyncCallbackDecorator = ['$delegate', function($delegate) { - var callbacks = []; - var addFn = function(fn) { - callbacks.push(fn); - }; - addFn.flush = function() { - angular.forEach(callbacks, function(fn) { - fn(); - }); - callbacks = []; - }; - return addFn; -}]; - /** * */ @@ -1884,7 +1869,6 @@ angular.module('ngMock', ['ng']).provider({ }).config(['$provide', function($provide) { $provide.decorator('$timeout', angular.mock.$TimeoutDecorator); $provide.decorator('$$rAF', angular.mock.$RAFDecorator); - $provide.decorator('$$asyncCallback', angular.mock.$AsyncCallbackDecorator); $provide.decorator('$rootScope', angular.mock.$RootScopeDecorator); $provide.decorator('$controller', angular.mock.$ControllerDecorator); }]); diff --git a/test/ng/asyncCallbackSpec.js b/test/ng/asyncCallbackSpec.js deleted file mode 100644 index f9bbe7812062..000000000000 --- a/test/ng/asyncCallbackSpec.js +++ /dev/null @@ -1,33 +0,0 @@ -'use strict'; -describe('$$asyncCallback', function() { - it('should perform a callback asynchronously', inject(function($$asyncCallback) { - var message = 'hello there '; - $$asyncCallback(function() { - message += 'Angular'; - }); - - expect(message).toBe('hello there '); - $$asyncCallback.flush(); - expect(message).toBe('hello there Angular'); - })); - - describe('mocks', function() { - it('should queue up all async callbacks', inject(function($$asyncCallback) { - var callback = jasmine.createSpy('callback'); - $$asyncCallback(callback); - $$asyncCallback(callback); - $$asyncCallback(callback); - expect(callback.callCount).toBe(0); - - $$asyncCallback.flush(); - expect(callback.callCount).toBe(3); - - $$asyncCallback(callback); - $$asyncCallback(callback); - expect(callback.callCount).toBe(3); - - $$asyncCallback.flush(); - expect(callback.callCount).toBe(5); - })); - }); -});