fix: compatibility with jasmine

Fixes #94
ocombe · Nov 13, 2014 · d4985e1 · d4985e1
1 parent 95b1aec
commit d4985e1
Show file tree

Hide file tree

Showing 9 changed files with 73 additions and 62 deletions.
diff --git a/dist/ocLazyLoad.js b/dist/ocLazyLoad.js
@@ -34,7 +34,7 @@
       // Let's get the list of loaded modules & components
       init(angular.element(window.document));
 
-      this.$get = ['$timeout', '$log', '$q', '$templateCache', '$http', '$rootElement', '$rootScope', '$cacheFactory', '$interval', function($timeout, $log, $q, $templateCache, $http, $rootElement, $rootScope, $cacheFactory, $interval) {
+      this.$get = ['$log', '$q', '$templateCache', '$http', '$rootElement', '$rootScope', '$cacheFactory', '$interval', function($log, $q, $templateCache, $http, $rootElement, $rootScope, $cacheFactory, $interval) {
         var instanceInjector,
           filesCache = $cacheFactory('ocLazyLoad'),
           uaCssChecked = false,
@@ -49,7 +49,7 @@
 
         // Make this lazy because at the moment that $get() is called the instance injector hasn't been assigned to the rootElement yet
         providers.getInstanceInjector = function() {
-          return (instanceInjector) ? instanceInjector : (instanceInjector = $rootElement.data('$injector'));
+          return (instanceInjector) ? instanceInjector : (instanceInjector = ($rootElement.data('$injector') || angular.injector()));
         };
 
         broadcast = function broadcast(eventName, params) {
@@ -118,12 +118,12 @@
           el.async = 1;
 
           var insertBeforeElem = anchor.lastChild;
-		  if(params.insertBefore) {
-		    var element = angular.element(params.insertBefore);
-		    if(element && element.length > 0) {
-			  insertBeforeElem = element[0];
-		    }
-		  }
+          if(params.insertBefore) {
+            var element = angular.element(params.insertBefore);
+            if(element && element.length > 0) {
+              insertBeforeElem = element[0];
+            }
+          }
           anchor.insertBefore(el, insertBeforeElem);
 
           /*
@@ -592,13 +592,9 @@
                     deferred.reject(e);
                     return;
                   }
-                  $timeout(function() {
-                    deferred.resolve(module);
-                  });
+                  deferred.resolve(module);
                 }, function error(err) {
-                  $timeout(function() {
-                    deferred.reject(err);
-                  });
+                  deferred.reject(err);
                 });
               }
             }, function error(err) {

diff --git a/dist/ocLazyLoad.min.js b/dist/ocLazyLoad.min.js
diff --git a/examples/example1/js/ocLazyLoad.js b/examples/example1/js/ocLazyLoad.js
@@ -34,7 +34,7 @@
       // Let's get the list of loaded modules & components
       init(angular.element(window.document));
 
-      this.$get = ['$timeout', '$log', '$q', '$templateCache', '$http', '$rootElement', '$rootScope', '$cacheFactory', '$interval', function($timeout, $log, $q, $templateCache, $http, $rootElement, $rootScope, $cacheFactory, $interval) {
+      this.$get = ['$log', '$q', '$templateCache', '$http', '$rootElement', '$rootScope', '$cacheFactory', '$interval', function($log, $q, $templateCache, $http, $rootElement, $rootScope, $cacheFactory, $interval) {
         var instanceInjector,
           filesCache = $cacheFactory('ocLazyLoad'),
           uaCssChecked = false,
@@ -49,7 +49,7 @@
 
         // Make this lazy because at the moment that $get() is called the instance injector hasn't been assigned to the rootElement yet
         providers.getInstanceInjector = function() {
-          return (instanceInjector) ? instanceInjector : (instanceInjector = $rootElement.data('$injector'));
+          return (instanceInjector) ? instanceInjector : (instanceInjector = ($rootElement.data('$injector') || angular.injector()));
         };
 
         broadcast = function broadcast(eventName, params) {
@@ -118,12 +118,12 @@
           el.async = 1;
 
           var insertBeforeElem = anchor.lastChild;
-		  if(params.insertBefore) {
-		    var element = angular.element(params.insertBefore);
-		    if(element && element.length > 0) {
-			  insertBeforeElem = element[0];
-		    }
-		  }
+          if(params.insertBefore) {
+            var element = angular.element(params.insertBefore);
+            if(element && element.length > 0) {
+              insertBeforeElem = element[0];
+            }
+          }
           anchor.insertBefore(el, insertBeforeElem);
 
           /*
@@ -592,13 +592,9 @@
                     deferred.reject(e);
                     return;
                   }
-                  $timeout(function() {
-                    deferred.resolve(module);
-                  });
+                  deferred.resolve(module);
                 }, function error(err) {
-                  $timeout(function() {
-                    deferred.reject(err);
-                  });
+                  deferred.reject(err);
                 });
               }
             }, function error(err) {

diff --git a/examples/example2/js/ocLazyLoad.js b/examples/example2/js/ocLazyLoad.js
@@ -34,7 +34,7 @@
       // Let's get the list of loaded modules & components
       init(angular.element(window.document));
 
-      this.$get = ['$timeout', '$log', '$q', '$templateCache', '$http', '$rootElement', '$rootScope', '$cacheFactory', '$interval', function($timeout, $log, $q, $templateCache, $http, $rootElement, $rootScope, $cacheFactory, $interval) {
+      this.$get = ['$log', '$q', '$templateCache', '$http', '$rootElement', '$rootScope', '$cacheFactory', '$interval', function($log, $q, $templateCache, $http, $rootElement, $rootScope, $cacheFactory, $interval) {
         var instanceInjector,
           filesCache = $cacheFactory('ocLazyLoad'),
           uaCssChecked = false,
@@ -49,7 +49,7 @@
 
         // Make this lazy because at the moment that $get() is called the instance injector hasn't been assigned to the rootElement yet
         providers.getInstanceInjector = function() {
-          return (instanceInjector) ? instanceInjector : (instanceInjector = $rootElement.data('$injector'));
+          return (instanceInjector) ? instanceInjector : (instanceInjector = ($rootElement.data('$injector') || angular.injector()));
         };
 
         broadcast = function broadcast(eventName, params) {
@@ -118,12 +118,12 @@
           el.async = 1;
 
           var insertBeforeElem = anchor.lastChild;
-		  if(params.insertBefore) {
-		    var element = angular.element(params.insertBefore);
-		    if(element && element.length > 0) {
-			  insertBeforeElem = element[0];
-		    }
-		  }
+          if(params.insertBefore) {
+            var element = angular.element(params.insertBefore);
+            if(element && element.length > 0) {
+              insertBeforeElem = element[0];
+            }
+          }
           anchor.insertBefore(el, insertBeforeElem);
 
           /*
@@ -592,13 +592,9 @@
                     deferred.reject(e);
                     return;
                   }
-                  $timeout(function() {
-                    deferred.resolve(module);
-                  });
+                  deferred.resolve(module);
                 }, function error(err) {
-                  $timeout(function() {
-                    deferred.reject(err);
-                  });
+                  deferred.reject(err);
                 });
               }
             }, function error(err) {

diff --git a/karma.conf.js b/karma.conf.js
@@ -19,7 +19,8 @@ module.exports.conf = {
     'bower_components/angular-mocks/angular-mocks.js',
     'src/**/*.js',
     'tests/unit/**/*.spec.js',
-    'tests/unit/**/*.mock.js'
+    'tests/unit/**/*.mock.js',
+    {pattern: 'tests/unit/lazyLoad/**/*.js', included: false}
   ],
 
 

diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "example": "examples"
   },
   "scripts": {
-    "test": "karma start tests/unit/karma.conf.js",
+    "test": "karma start karma.conf.js",
     "build": "gulp build"
   },
   "repository": {
@@ -42,4 +42,4 @@
     "semver": "^2.3.1",
     "streamqueue": "^0.1.1"
   }
-}
+}
diff --git a/src/ocLazyLoad.js b/src/ocLazyLoad.js
@@ -27,7 +27,7 @@
       // Let's get the list of loaded modules & components
       init(angular.element(window.document));
 
-      this.$get = ['$timeout', '$log', '$q', '$templateCache', '$http', '$rootElement', '$rootScope', '$cacheFactory', '$interval', function($timeout, $log, $q, $templateCache, $http, $rootElement, $rootScope, $cacheFactory, $interval) {
+      this.$get = ['$log', '$q', '$templateCache', '$http', '$rootElement', '$rootScope', '$cacheFactory', '$interval', function($log, $q, $templateCache, $http, $rootElement, $rootScope, $cacheFactory, $interval) {
         var instanceInjector,
           filesCache = $cacheFactory('ocLazyLoad'),
           uaCssChecked = false,
@@ -42,7 +42,7 @@
 
         // Make this lazy because at the moment that $get() is called the instance injector hasn't been assigned to the rootElement yet
         providers.getInstanceInjector = function() {
-          return (instanceInjector) ? instanceInjector : (instanceInjector = $rootElement.data('$injector'));
+          return (instanceInjector) ? instanceInjector : (instanceInjector = ($rootElement.data('$injector') || angular.injector()));
         };
 
         broadcast = function broadcast(eventName, params) {
@@ -111,12 +111,12 @@
           el.async = 1;
 
           var insertBeforeElem = anchor.lastChild;
-		  if(params.insertBefore) {
-		    var element = angular.element(params.insertBefore);
-		    if(element && element.length > 0) {
-			  insertBeforeElem = element[0];
-		    }
-		  }
+          if(params.insertBefore) {
+            var element = angular.element(params.insertBefore);
+            if(element && element.length > 0) {
+              insertBeforeElem = element[0];
+            }
+          }
           anchor.insertBefore(el, insertBeforeElem);
 
           /*
@@ -585,13 +585,9 @@
                     deferred.reject(e);
                     return;
                   }
-                  $timeout(function() {
-                    deferred.resolve(module);
-                  });
+                  deferred.resolve(module);
                 }, function error(err) {
-                  $timeout(function() {
-                    deferred.reject(err);
-                  });
+                  deferred.reject(err);
                 });
               }
             }, function error(err) {

diff --git a/tests/unit/lazyLoad/testModule.js b/tests/unit/lazyLoad/testModule.js
@@ -0,0 +1,10 @@
+// ngGrid is also lazy loaded by $ocLazyLoad thanks to the module dependency injection !
+angular.module('testModule', []).controller('TestCtrl', function($scope) {
+  console.info('-------  test module ctrl');
+}).config(function() {
+  console.info('config testModule');
+}).config(function() {
+  console.info('config 2 testModule');
+}).run(function() {
+  console.info('run testModule');
+});
diff --git a/tests/unit/specs/ocLazyLoad.spec.js b/tests/unit/specs/ocLazyLoad.spec.js
@@ -2,15 +2,17 @@
 describe('Module: oc.lazyLoad', function() {
   'use strict';
 
-  var $ocLazyLoad;
+  var $ocLazyLoad,
+    $rootScope;
 
   describe('with app1', function() {
 
     beforeEach(function() {
       module('app1');
 
-      inject(function(_$ocLazyLoad_) {
+      inject(function(_$ocLazyLoad_, _$rootScope_) {
         $ocLazyLoad = _$ocLazyLoad_;
+        $rootScope = _$rootScope_;
       });
     });
 
@@ -50,6 +52,20 @@ describe('Module: oc.lazyLoad', function() {
       expect($ocLazyLoad.getModuleConfig('test2')).toEqual({name: 'test2'}); // check if set worked
     });
 
+    it('should be able to lazy load a module', function(done) {
+      $ocLazyLoad.load({
+        name:'testModule',
+        files:['/base/tests/unit/lazyLoad/testModule.js']
+      }).then(function(){
+        done();
+      }, function(err){
+        throw err;
+      });
+      setInterval(function() {
+        $rootScope.$digest();
+      }, 10);
+    })
+
   });
 
   describe('failed configs', function() {