diff options
| author | Misko Hevery | 2011-11-01 21:09:54 -0700 | 
|---|---|---|
| committer | Misko Hevery | 2011-11-14 16:39:32 -0800 | 
| commit | ed36b9da3be338fe9eb36f3eeea901d6f51cd768 (patch) | |
| tree | ffdc924e4b1fc1c6912674c82e029bf975ca9fca /test/AngularSpec.js | |
| parent | c925f8a6578e05c8136c206f2fd98eeaaf1c0f16 (diff) | |
| download | angular.js-ed36b9da3be338fe9eb36f3eeea901d6f51cd768.tar.bz2 | |
refactor(injector): switch to injector 2.0 introduce modules
Diffstat (limited to 'test/AngularSpec.js')
| -rw-r--r-- | test/AngularSpec.js | 29 | 
1 files changed, 15 insertions, 14 deletions
| diff --git a/test/AngularSpec.js b/test/AngularSpec.js index a957fcf7..8902c2a9 100644 --- a/test/AngularSpec.js +++ b/test/AngularSpec.js @@ -375,9 +375,9 @@ describe('angular', function() {    describe('angular service', function() { -    it('should override services', inject(function(service){ -      service('fake', function() { return 'old'; }); -      service('fake', function() { return 'new'; }); +    it('should override services', inject(function($provide){ +      $provide.value('fake', 'old'); +      $provide.value('fake', 'new');      }, function(fake) {        expect(fake).toEqual('new');      })); @@ -401,22 +401,23 @@ describe('angular', function() {        expect(result.third).toBeTruthy();      }); -    it('should inject dependencies specified by $inject', function() { -      angular.service('svc1', function() { return 'svc1'; }); -      angular.service('svc2', function(svc1) { return 'svc2-' + svc1; }, {$inject: ['svc1']}); -      expect(createInjector()('svc2')).toEqual('svc2-svc1'); -    }); -      it('should inject dependencies specified by $inject and ignore function argument name', function() { -      angular.service('svc1', function() { return 'svc1'; }); -      angular.service('svc2', function(foo) { return 'svc2-' + foo; }, {$inject: ['svc1']}); -      expect(createInjector()('svc2')).toEqual('svc2-svc1'); +      expect(angular.injector(function($provide){ +        $provide.factory('svc1', function() { return 'svc1'; }); +        $provide.factory('svc2', ['svc1', function(s) { return 'svc2-' + s; }]); +      })('svc2')).toEqual('svc2-svc1');      });      it('should eagerly instantiate a service if $eager is true', function() {        var log = []; -      angular.service('svc1', function() { log.push('svc1'); }, {$eager: true}); -      createInjector(angularService); +      angular.injector(function($provide){ +        $provide.service('svc1', function() { +          this.$get = function(){ +            log.push('svc1'); +          } +          this.$eager = true; +        }); +      });        expect(log).toEqual(['svc1']);      });    }); | 
