From 92d8971ef23c469d04b027dbbc2bb648f9cfa687 Mon Sep 17 00:00:00 2001
From: Andrew Schmadel <aschmadel@learningobjects.com>
Date: Mon, 19 Oct 2015 10:31:43 -0400
Subject: [PATCH] fix(ngMockE2E): allow $httpBackend.passThrough() to work when
 ngMock is loaded

Allow $httpBackend.passThrough() to work normally when ngMock is loaded
concurrently with ngMockE2E, as is typically the case when writing tests with
angular.mock.module()

Fixes #1434
---
 src/ngMock/angular-mocks.js      | 1 +
 test/ngMock/angular-mocksSpec.js | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/ngMock/angular-mocks.js b/src/ngMock/angular-mocks.js
index c63b33d921f0..3125a9cc2163 100644
--- a/src/ngMock/angular-mocks.js
+++ b/src/ngMock/angular-mocks.js
@@ -2129,6 +2129,7 @@ angular.module('ngMock', ['ng']).provider({
  * the {@link ngMockE2E.$httpBackend e2e $httpBackend} mock.
  */
 angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) {
+  $provide.value('$httpBackend', angular.injector(['ng']).get('$httpBackend'));
   $provide.decorator('$httpBackend', angular.mock.e2e.$httpBackendDecorator);
 }]);
 
diff --git a/test/ngMock/angular-mocksSpec.js b/test/ngMock/angular-mocksSpec.js
index 806b37036dcf..831334274c98 100644
--- a/test/ngMock/angular-mocksSpec.js
+++ b/test/ngMock/angular-mocksSpec.js
@@ -1846,12 +1846,12 @@ describe('ngMockE2E', function() {
     var hb, realHttpBackend, callback;
 
     beforeEach(function() {
-      module(function($provide) {
-        callback = jasmine.createSpy('callback');
+      callback = jasmine.createSpy('callback');
+      angular.module('ng').config(function($provide) {
         realHttpBackend = jasmine.createSpy('real $httpBackend');
         $provide.value('$httpBackend', realHttpBackend);
-        $provide.decorator('$httpBackend', angular.mock.e2e.$httpBackendDecorator);
       });
+      module('ngMockE2E');
       inject(function($injector) {
         hb = $injector.get('$httpBackend');
       });