fix(ngMocks): pass eventHandlers to $httpBackend if passThrough is active

andreyjkee · Narretz · commit 253cb8d4e912 · 2016-04-21T23:08:39.000+02:00
Closes angular#14471
diff --git a/src/ngMock/angular-mocks.js b/src/ngMock/angular-mocks.js
@@ -1393,7 +1393,7 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) {
           // if $browser specified, we do auto flush all requests
           ($browser ? $browser.defer : responsesPush)(wrapResponse(definition));
         } else if (definition.passThrough) {
-          $delegate(method, url, data, callback, headers, timeout, withCredentials, responseType);
+          $delegate(method, url, data, callback, headers, timeout, withCredentials, responseType, eventHandlers, uploadEventHandlers);
         } else throw new Error('No response defined !');
         return;
       }
diff --git a/test/ngMock/angular-mocksSpec.js b/test/ngMock/angular-mocksSpec.js
@@ -2133,11 +2133,14 @@ describe('ngMockE2E', function() {
 
     describe('passThrough()', function() {
       it('should delegate requests to the real backend when passThrough is invoked', function() {
+        var eventHandlers = {progress: angular.noop};
+        var uploadEventHandlers = {progress: angular.noop};
+
         hb.when('GET', /\/passThrough\/.*/).passThrough();
-        hb('GET', '/passThrough/23', null, callback, {}, null, true, 'blob');
+        hb('GET', '/passThrough/23', null, callback, {}, null, true, 'blob', eventHandlers, uploadEventHandlers);
 
         expect(realHttpBackend).toHaveBeenCalledOnceWith(
-            'GET', '/passThrough/23', null, callback, {}, null, true, 'blob');
+            'GET', '/passThrough/23', null, callback, {}, null, true, 'blob', eventHandlers, uploadEventHandlers);
       });
 
       it('should be able to override a respond definition with passThrough', function() {
@@ -2146,7 +2149,7 @@ describe('ngMockE2E', function() {
         hb('GET', '/passThrough/23', null, callback, {}, null, true);
 
         expect(realHttpBackend).toHaveBeenCalledOnceWith(
-            'GET', '/passThrough/23', null, callback, {}, null, true, undefined);
+            'GET', '/passThrough/23', null, callback, {}, null, true, undefined, undefined, undefined);
       });
 
       it('should be able to override a respond definition with passThrough', inject(function($browser) {

Original file line number	Diff line number	Diff line change
`@@ -1393,7 +1393,7 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) {`
`1393`	`1393`	`// if $browser specified, we do auto flush all requests`
`1394`	`1394`	`($browser ? $browser.defer : responsesPush)(wrapResponse(definition));`
`1395`	`1395`	`} else if (definition.passThrough) {`
`1396`		`- $delegate(method, url, data, callback, headers, timeout, withCredentials, responseType);`
	`1396`	`+ $delegate(method, url, data, callback, headers, timeout, withCredentials, responseType, eventHandlers, uploadEventHandlers);`
`1397`	`1397`	`} else throw new Error('No response defined !');`
`1398`	`1398`	`return;`
`1399`	`1399`	`}`