Merge pull request #22 from B8li/master

Fix bug when injecting $location.

Author: philippd

.jshintrc

@@ -1,5 +1,5 @@
 {
-  "predef": ["describe", "it", "beforeEach", "waitsFor", "expect", "angular"],
+  "predef": ["describe", "it", "beforeEach", "waitsFor", "expect", "angular", "spyOn", "jasmine"],
   "esnext": false,
   "bitwise": true,
   "curly": true,

src/deferred-bootstrap.js

@@ -5,11 +5,10 @@ var isObject = angular.isObject,
   isArray = angular.isArray,
   isString = angular.isString,
   forEach = angular.forEach,
-  ngInjector = angular.injector(['ng']),
-  $q = ngInjector.get('$q'),
-  bodyElement,
   loadingClass = 'deferred-bootstrap-loading',
-  errorClass = 'deferred-bootstrap-error';
+  errorClass = 'deferred-bootstrap-error',
+  bodyElement,
+  $q;
 
 function addLoadingClass () {
   bodyElement.addClass(loadingClass);
@@ -63,16 +62,22 @@ function checkConfig (config) {
     throw new Error('\'config.onError\' must be a function.');
   }
 }
+function provideRootElement (modules, element) {
+  element = angular.element(element);
+  modules.unshift(['$provide', function($provide) {
+    $provide.value('$rootElement', element);
+  }]);
+}
 
-function createInjector (injectorModules) {
+function createInjector (injectorModules, element) {
+  var modules = ['ng'];
   if (isString(injectorModules)) {
-    return angular.injector(['ng', injectorModules]);
-  } else if (isArray(injectorModules) && injectorModules.length === 1 && injectorModules[0] === 'ng') {
-    return ngInjector;
-  } else {
-    injectorModules.unshift('ng');
-    return angular.injector(injectorModules);
+    modules.push(injectorModules);
+  } else if (isArray(injectorModules)) {
+    modules = modules.concat(injectorModules);
   }
+  provideRootElement(modules, element);
+  return angular.injector(modules, element);
 }
 
 function doBootstrap (element, module) {
@@ -101,7 +106,8 @@ function bootstrap (configParam) {
 
   addLoadingClass();
   checkConfig(config);
-  injector = createInjector(injectorModules);
+  injector = createInjector(injectorModules, element);
+  $q = injector.get('$q');
 
   function callResolveFn (resolveFunction, constantName, moduleName) {
     var result;

test/deferred-bootstrap.spec.js

@@ -17,7 +17,7 @@ function itAsync(title, func) {
   });
 }
 
-/* global checkConfig, isPromise, loadingClass, errorClass */
+/* global checkConfig, createInjector, isPromise, loadingClass, errorClass */
 describe('deferredBootstrapper', function () {
 
   it('should provide bootstrap function', function () {
@@ -35,6 +35,29 @@ describe('deferredBootstrapper', function () {
       bodyElement = window.document.body;
     });
 
+    itAsync('should inject $location', function (done) {
+      bootstrap({
+        element: bodyElement,
+        module: APP_NAME,
+        resolve: {
+          LOCATION: function ($http, $q, $location) {
+            var deferred = $q.defer();
+
+            deferred.resolve($location);
+
+            return deferred.promise;
+          }
+        }
+      });
+
+      angular.module(APP_NAME, [])
+        .config(function (LOCATION) {
+          expect(LOCATION).toBeDefined();
+
+          done();
+        });
+    });
+
     itAsync('should resolve with the value returned from the defined constant', function (done) {
       bootstrap({
         element: bodyElement,
@@ -422,6 +445,57 @@ describe('deferredBootstrapper', function () {
 
   });
 
+  describe('createInjector()', function () {
+    var element;
+
+    beforeEach(function () {
+      angular.module('module1', []);
+      angular.module('module2', []);
+      element = angular.element('<div></div>');
+    });
+
+    it('should create injector with given module as string', function () {
+      // given
+      var modules = 'module1';
+      spyOn(angular, 'injector').andCallThrough();
+
+      // when
+      createInjector(modules, element);
+      var injectorModules = angular.injector.mostRecentCall.args[0];
+
+      // then
+      expect(injectorModules.indexOf('ng')).not.toBe(-1);
+      expect(injectorModules.indexOf('module1')).not.toBe(-1);
+    });
+
+    it('should create injector with given modules as array', function () {
+      // given
+      var modules = ['module1', 'module2'];
+      spyOn(angular, 'injector').andCallThrough();
+
+      // when
+      createInjector(modules, element);
+      var injectorModules = angular.injector.mostRecentCall.args[0];
+
+      // then
+      expect(injectorModules.indexOf('ng')).not.toBe(-1);
+      expect(injectorModules.indexOf('module1')).not.toBe(-1);
+      expect(injectorModules.indexOf('module2')).not.toBe(-1);
+    });
+
+    it('should create injector with given element', function () {
+      // given
+      var modules = 'module1';
+      spyOn(angular, 'injector').andCallThrough();
+
+      // when
+      createInjector(modules, element);
+
+      // then
+      expect(angular.injector).toHaveBeenCalledWith(jasmine.any(Object), element);
+    });
+  });
+
   describe('isPromise()', function () {
 
     it('should check if object is a promise', function () {