diff options
| author | Misko Hevery | 2011-03-23 09:33:29 -0700 |
|---|---|---|
| committer | Vojta Jina | 2011-08-02 01:00:03 +0200 |
| commit | 8f0dcbab804180828d6859b1340c86cf161209fb (patch) | |
| tree | d13d47d47a1889cb7c96a87cecacd2e25307d51c /test/service/deferSpec.js | |
| parent | 1f4b417184ce53af15474de065400f8a686430c5 (diff) | |
| download | angular.js-8f0dcbab804180828d6859b1340c86cf161209fb.tar.bz2 | |
feat(scope): new and improved scope implementation
- Speed improvements (about 4x on flush phase)
- Memory improvements (uses no function closures)
- Break $eval into $apply, $dispatch, $flush
- Introduced $watch and $observe
Breaks angular.equals() use === instead of ==
Breaks angular.scope() does not take parent as first argument
Breaks scope.$watch() takes scope as first argument
Breaks scope.$set(), scope.$get are removed
Breaks scope.$config is removed
Breaks $route.onChange callback has not "this" bounded
Diffstat (limited to 'test/service/deferSpec.js')
| -rw-r--r-- | test/service/deferSpec.js | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/test/service/deferSpec.js b/test/service/deferSpec.js index 7e59978c..4f651522 100644 --- a/test/service/deferSpec.js +++ b/test/service/deferSpec.js @@ -4,7 +4,7 @@ describe('$defer', function() { var scope, $browser, $defer, $exceptionHandler; beforeEach(function(){ - scope = angular.scope({}, angular.service, + scope = angular.scope(angular.service, {'$exceptionHandler': jasmine.createSpy('$exceptionHandler')}); $browser = scope.$service('$browser'); $defer = scope.$service('$defer'); @@ -41,32 +41,32 @@ describe('$defer', function() { }); - it('should call eval after each callback is executed', function() { - var evalSpy = this.spyOn(scope, '$eval').andCallThrough(); + it('should call $apply after each callback is executed', function() { + var applySpy = this.spyOn(scope, '$apply').andCallThrough(); $defer(function() {}); - expect(evalSpy).not.toHaveBeenCalled(); + expect(applySpy).not.toHaveBeenCalled(); $browser.defer.flush(); - expect(evalSpy).toHaveBeenCalled(); + expect(applySpy).toHaveBeenCalled(); - evalSpy.reset(); //reset the spy; + applySpy.reset(); //reset the spy; $defer(function() {}); $defer(function() {}); $browser.defer.flush(); - expect(evalSpy.callCount).toBe(2); + expect(applySpy.callCount).toBe(2); }); - it('should call eval even if an exception is thrown in callback', function() { - var evalSpy = this.spyOn(scope, '$eval').andCallThrough(); + it('should call $apply even if an exception is thrown in callback', function() { + var applySpy = this.spyOn(scope, '$apply').andCallThrough(); $defer(function() {throw "Test Error";}); - expect(evalSpy).not.toHaveBeenCalled(); + expect(applySpy).not.toHaveBeenCalled(); $browser.defer.flush(); - expect(evalSpy).toHaveBeenCalled(); + expect(applySpy).toHaveBeenCalled(); }); it('should allow you to specify the delay time', function(){ |
