DO NOT MERGE alternative to angular#13128 wrt tests

Author: gkalpak

src/ng/http.js

@@ -1261,16 +1261,16 @@ function $HttpProvider() {
           }
         }
 
-        function resolveHttpPromise() {
+        // function resolveHttpPromise() {
           resolvePromise(response, status, headersString, statusText);
-        }
-
-        if (useApplyAsync) {
-          $rootScope.$applyAsync(resolveHttpPromise);
-        } else {
-          resolveHttpPromise();
-          if (!$rootScope.$$phase) $rootScope.$apply();
-        }
+        // }
+
+        // if (useApplyAsync) {
+        //   $rootScope.$applyAsync(resolveHttpPromise);
+        // } else {
+        //   resolveHttpPromise();
+        //   if (!$rootScope.$$phase) $rootScope.$apply();
+        // }
       }
 
 

test/ng/directive/ngIncludeSpec.js

@@ -372,6 +372,7 @@ describe('ngInclude', function() {
       $httpBackend.expectGET('include.svg').respond('<rect></rect><rect></rect>');
       element = $compile('<svg><test></test></svg>')($rootScope);
       $httpBackend.flush();
+      $httpBackend.flush();
       var child = element.find('rect');
       expect(child.length).toBe(2);
       expect(child[0] instanceof SVGRectElement).toBe(true);

test/ng/httpSpec.js

@@ -293,7 +293,7 @@ describe('$http', function() {
       $httpBackend = $hb;
       $http = $h;
       $rootScope = $rs;
-      spyOn($rootScope, '$apply').andCallThrough();
+      spyOn($rootScope, '$evalAsync').andCallThrough();
     }]));
 
     it('should throw error if the request configuration is not an object', function() {
@@ -1012,31 +1012,37 @@ describe('$http', function() {
     });
 
 
-    describe('scope.$apply', function() {
+    describe('$rootScope.$evalAsync', function() {
 
-      it('should $apply after success callback', function() {
-        $httpBackend.when('GET').respond(200);
-        $http({method: 'GET', url: '/some'});
-        $httpBackend.flush();
-        expect($rootScope.$apply).toHaveBeenCalledOnce();
+      it('should $evalAsync after success callback', function() {
+        $httpBackend.whenGET().respond(200);
+        $http.get('/some');
+        $rootScope.$digest();   // Send the request
+        $rootScope.$evalAsync.reset();
+        $httpBackend.flush(null, false);
+        expect($rootScope.$evalAsync).toHaveBeenCalledOnce();
       });
 
 
-      it('should $apply after error callback', function() {
-        $httpBackend.when('GET').respond(404);
-        $http({method: 'GET', url: '/some'});
-        $httpBackend.flush();
-        expect($rootScope.$apply).toHaveBeenCalledOnce();
+      it('should $evalAsync after error callback', function() {
+        $httpBackend.whenGET().respond(404);
+        $http.get('/some');
+        $rootScope.$digest();   // Send the request
+        $rootScope.$evalAsync.reset();
+        $httpBackend.flush(null, false);
+        expect($rootScope.$evalAsync).toHaveBeenCalledOnce();
       });
 
 
-      it('should $apply even if exception thrown during callback', inject(function($exceptionHandler) {
-        $httpBackend.when('GET').respond(200);
+      it('should $evalAsync even if exception thrown during callback', inject(function($exceptionHandler) {
+        $httpBackend.whenGET().respond(200);
         callback.andThrow('error in callback');
 
-        $http({method: 'GET', url: '/some'}).then(callback);
-        $httpBackend.flush();
-        expect($rootScope.$apply).toHaveBeenCalledOnce();
+        $http.get('/some');
+        $rootScope.$digest();   // Send the request
+        $rootScope.$evalAsync.reset();
+        $httpBackend.flush(null, false);
+        expect($rootScope.$evalAsync).toHaveBeenCalledOnce();
 
         $exceptionHandler.errors = [];
       }));
@@ -1921,9 +1927,7 @@ describe('$http', function() {
 
 describe('$http with $applyAsync', function() {
   var $http, $httpBackend, $rootScope, $browser, log;
-  beforeEach(module(function($httpProvider) {
-    $httpProvider.useApplyAsync(true);
-  }, provideLog));
+  beforeEach(module(provideLog));
 
 
   beforeEach(inject(['$http', '$httpBackend', '$rootScope', '$browser', 'log', function(http, backend, scope, browser, logger) {
@@ -1939,15 +1943,14 @@ describe('$http with $applyAsync', function() {
   }]));
 
 
-  it('should schedule coalesced apply on response', function() {
+  it('should defer response handling', function() {
     var handler = jasmine.createSpy('handler');
     $httpBackend.expect('GET', '/template1.html').respond(200, '<h1>Header!</h1>', {});
     $http.get('/template1.html').then(handler);
     // Ensure requests are sent
     $rootScope.$digest();
 
     $httpBackend.flush(null, false);
-    expect($rootScope.$applyAsync).toHaveBeenCalledOnce();
     expect(handler).not.toHaveBeenCalled();
 
     $browser.defer.flush();