From 70c76b56437523195e2890f61cd187c0a9072f62 Mon Sep 17 00:00:00 2001 From: Georgios Kalpakas Date: Sat, 13 Feb 2016 23:33:28 +0200 Subject: [PATCH 1/2] fix(ngMock): attach `$injector` to `$rootElement` Fixes #14022 --- src/ngMock/angular-mocks.js | 6 +++--- test/ngMock/angular-mocksSpec.js | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/ngMock/angular-mocks.js b/src/ngMock/angular-mocks.js index 3a843e2bc7ac..7bce01ed45e8 100644 --- a/src/ngMock/angular-mocks.js +++ b/src/ngMock/angular-mocks.js @@ -2089,9 +2089,9 @@ angular.mock.$RAFDecorator = ['$delegate', function($delegate) { * */ angular.mock.$RootElementProvider = function() { - this.$get = function() { - return angular.element('
'); - }; + this.$get = ['$injector', function($injector) { + return angular.element('
').data('$injector', $injector); + }]; }; /** diff --git a/test/ngMock/angular-mocksSpec.js b/test/ngMock/angular-mocksSpec.js index 281b0763abea..638fdffc51be 100644 --- a/test/ngMock/angular-mocksSpec.js +++ b/test/ngMock/angular-mocksSpec.js @@ -1647,6 +1647,10 @@ describe('ngMock', function() { it('should create mock application root', inject(function($rootElement) { expect($rootElement.text()).toEqual(''); })); + + it('should attack the `$injector` to `$rootElement`', inject(function($injector, $rootElement) { + expect($rootElement.injector()).toBe($injector); + })); }); From 49f8934fdfafaf4adc3ede656e9ec2ac67dc8853 Mon Sep 17 00:00:00 2001 From: Georgios Kalpakas Date: Tue, 16 Feb 2016 21:28:15 +0200 Subject: [PATCH 2/2] fixup 1 --- test/ngMock/angular-mocksSpec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ngMock/angular-mocksSpec.js b/test/ngMock/angular-mocksSpec.js index 638fdffc51be..3c32d2920d60 100644 --- a/test/ngMock/angular-mocksSpec.js +++ b/test/ngMock/angular-mocksSpec.js @@ -1648,7 +1648,7 @@ describe('ngMock', function() { expect($rootElement.text()).toEqual(''); })); - it('should attack the `$injector` to `$rootElement`', inject(function($injector, $rootElement) { + it('should attach the `$injector` to `$rootElement`', inject(function($injector, $rootElement) { expect($rootElement.injector()).toBe($injector); })); });