fix(ngMock): pass unexpected request failures in $httpBackend to the error handler

marcin-wosinek · petebacondarwin · commit 1555a4911ad5 · 2017-09-18T21:31:20.000+01:00
Closes angular#16150 Closes angular#15855
diff --git a/src/ng/q.js b/src/ng/q.js
@@ -364,6 +364,10 @@ function qFactory(nextTick, exceptionHandler, errorOnUnhandledRejections) {
           }
         } catch (e) {
           rejectPromise(promise, e);
+          // This error is explicitly marked for being passed to the $exceptionHandler
+          if (e && e.$$passToExceptionHandler === true) {
+            exceptionHandler(e);
+          }
         }
       }
     } finally {
diff --git a/src/ngMock/angular-mocks.js b/src/ngMock/angular-mocks.js
@@ -1438,10 +1438,16 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) {
         return;
       }
     }
-    throw wasExpected ?
+    var error = wasExpected ?
         new Error('No response defined !') :
         new Error('Unexpected request: ' + method + ' ' + url + '\n' +
                   (expectation ? 'Expected ' + expectation : 'No more request expected'));
+
+    // In addition to be being converted to a rejection, this error also needs to be passed to
+    // the $exceptionHandler and be rethrown (so that the test fails).
+    error.$$passToExceptionHandler = true;
+
+    throw error;
   }
 
   /**
diff --git a/test/ngMock/angular-mocksSpec.js b/test/ngMock/angular-mocksSpec.js
@@ -2512,7 +2512,7 @@ describe('ngMock', function() {
 
 describe('ngMockE2E', function() {
   describe('$httpBackend', function() {
-    var hb, realHttpBackend, realHttpBackendBrowser, callback;
+    var hb, realHttpBackend, $http, realHttpBackendBrowser, callback;
 
     beforeEach(function() {
       callback = jasmine.createSpy('callback');
@@ -2525,10 +2525,29 @@ describe('ngMockE2E', function() {
       module('ngMockE2E');
       inject(function($injector) {
         hb = $injector.get('$httpBackend');
+        $http = $injector.get('$http');
       });
     });
 
 
+    it('should throw error when unexpected request - without error callback', function() {
+      expect(function() {
+        $http.get('/some').then(noop);
+
+        hb.verifyNoOutstandingRequest();
+      }).toThrowError('Unexpected request: GET /some\nNo more request expected');
+    });
+
+
+    it('should throw error when unexpected request - with error callback', function() {
+      expect(function() {
+        $http.get('/some').then(noop, noop);
+
+        hb.verifyNoOutstandingRequest();
+      }).toThrowError('Unexpected request: GET /some\nNo more request expected');
+    });
+
+
     describe('passThrough()', function() {
       it('should delegate requests to the real backend when passThrough is invoked', function() {
         var eventHandlers = {progress: angular.noop};

Original file line number	Diff line number	Diff line change
`@@ -364,6 +364,10 @@ function qFactory(nextTick, exceptionHandler, errorOnUnhandledRejections) {`
`364`	`364`	`}`
`365`	`365`	`} catch (e) {`
`366`	`366`	`rejectPromise(promise, e);`
	`367`	`+ // This error is explicitly marked for being passed to the $exceptionHandler`
	`368`	`+ if (e && e.$$passToExceptionHandler === true) {`
	`369`	`+ exceptionHandler(e);`
	`370`	`+ }`
`367`	`371`	`}`
`368`	`372`	`}`
`369`	`373`	`} finally {`
Original file line number	Diff line number	Diff line change
`@@ -1438,10 +1438,16 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) {`
`1438`	`1438`	`return;`
`1439`	`1439`	`}`
`1440`	`1440`	`}`
`1441`		`- throw wasExpected ?`
	`1441`	`+ var error = wasExpected ?`
`1442`	`1442`	`new Error('No response defined !') :`
`1443`	`1443`	`new Error('Unexpected request: ' + method + ' ' + url + '\n' +`
`1444`	`1444`	`(expectation ? 'Expected ' + expectation : 'No more request expected'));`
	`1445`	`+`
	`1446`	`+ // In addition to be being converted to a rejection, this error also needs to be passed to`
	`1447`	`+ // the $exceptionHandler and be rethrown (so that the test fails).`
	`1448`	`+ error.$$passToExceptionHandler = true;`
	`1449`	`+`
	`1450`	`+ throw error;`
`1445`	`1451`	`}`
`1446`	`1452`
`1447`	`1453`	`/**`