From 5cdfe45aa3e50fabad44009c1b8511253c6e4915 Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Fri, 13 Jan 2012 14:19:10 -0800 Subject: feat(module): add runtime block --- test/InjectorSpec.js | 12 ++++++++++++ test/loaderSpec.js | 14 ++++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) (limited to 'test') 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']); }); -- cgit v1.2.3