aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMisko Hevery2012-01-13 14:19:10 -0800
committerMisko Hevery2012-01-13 14:28:43 -0800
commit5cdfe45aa3e50fabad44009c1b8511253c6e4915 (patch)
treeeb921be6b173d5fd3a9cd1f0a95b5e1cace37fd8 /test
parent16a40c626fc3da688596928afa028a596204a683 (diff)
downloadangular.js-5cdfe45aa3e50fabad44009c1b8511253c6e4915.tar.bz2
feat(module): add runtime block
Diffstat (limited to 'test')
-rw-r--r--test/InjectorSpec.js12
-rw-r--r--test/loaderSpec.js14
2 files changed, 20 insertions, 6 deletions
diff --git a/test/InjectorSpec.js b/test/InjectorSpec.js
index 4817dc32..c6e9f178 100644
--- a/test/InjectorSpec.js
+++ b/test/InjectorSpec.js
@@ -247,6 +247,18 @@ describe('injector', function() {
expect(log).toEqual('abc');
});
+ it('should execute runBlocks after injector creation', function() {
+ var log = '';
+ angular.module('a', [], function(){ log += 'a'; }).run(function() { log += 'A'; });
+ angular.module('b', ['a'], function(){ log += 'b'; }).run(function() { log += 'B'; });
+ createInjector([
+ 'b',
+ valueFn(function() { log += 'C'; }),
+ [valueFn(function() { log += 'D'; })]
+ ]);
+ expect(log).toEqual('abABCD');
+ });
+
describe('$provide', function() {
describe('value', function() {
it('should configure $provide values', function() {
diff --git a/test/loaderSpec.js b/test/loaderSpec.js
index e419a198..ac48c34e 100644
--- a/test/loaderSpec.js
+++ b/test/loaderSpec.js
@@ -27,26 +27,28 @@ describe('module loader', function() {
it('should record calls', function() {
var otherModule = window.angular.module('other', []);
- otherModule.init('otherInit');
+ otherModule.config('otherInit');
- var myModule = window.angular.module('my', ['other'], 'init');
+ var myModule = window.angular.module('my', ['other'], 'config');
- myModule.
+ expect(myModule.
service('sk', 'sv').
factory('fk', 'fv').
value('k', 'v').
filter('f', 'ff').
- init('init2');
+ config('init2').
+ run('runBlock')).toBe(myModule);
expect(myModule.requires).toEqual(['other']);
- expect(myModule.invokeQueue).toEqual([
- ['$injector', 'invoke', ['init'] ],
+ expect(myModule._invokeQueue).toEqual([
+ ['$injector', 'invoke', ['config'] ],
['$provide', 'service', ['sk', 'sv'] ],
['$provide', 'factory', ['fk', 'fv'] ],
['$provide', 'value', ['k', 'v'] ],
['$filterProvider', 'register', ['f', 'ff'] ],
['$injector', 'invoke', ['init2'] ]
]);
+ expect(myModule._runBlocks).toEqual(['runBlock']);
});