aboutsummaryrefslogtreecommitdiffstats
path: root/test/service/xhr.cacheSpec.js
diff options
context:
space:
mode:
authorMisko Hevery2011-03-23 09:33:29 -0700
committerVojta Jina2011-08-02 01:00:03 +0200
commit8f0dcbab804180828d6859b1340c86cf161209fb (patch)
treed13d47d47a1889cb7c96a87cecacd2e25307d51c /test/service/xhr.cacheSpec.js
parent1f4b417184ce53af15474de065400f8a686430c5 (diff)
downloadangular.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/xhr.cacheSpec.js')
-rw-r--r--test/service/xhr.cacheSpec.js14
1 files changed, 7 insertions, 7 deletions
diff --git a/test/service/xhr.cacheSpec.js b/test/service/xhr.cacheSpec.js
index f4654cd4..7bf5d40b 100644
--- a/test/service/xhr.cacheSpec.js
+++ b/test/service/xhr.cacheSpec.js
@@ -4,7 +4,7 @@ describe('$xhr.cache', function() {
var scope, $browser, $browserXhr, $xhrErr, cache, log;
beforeEach(function() {
- scope = angular.scope({}, null, {'$xhr.error': $xhrErr = jasmine.createSpy('$xhr.error')});
+ scope = angular.scope(angularService, {'$xhr.error': $xhrErr = jasmine.createSpy('$xhr.error')});
$browser = scope.$service('$browser');
$browserXhr = $browser.xhr;
cache = scope.$service('$xhr.cache');
@@ -126,22 +126,22 @@ describe('$xhr.cache', function() {
it('should call eval after callbacks for both cache hit and cache miss execute', function() {
- var evalSpy = this.spyOn(scope, '$eval').andCallThrough();
+ var flushSpy = this.spyOn(scope, '$flush').andCallThrough();
$browserXhr.expectGET('/url').respond('+');
cache('GET', '/url', null, callback);
- expect(evalSpy).not.toHaveBeenCalled();
+ expect(flushSpy).not.toHaveBeenCalled();
$browserXhr.flush();
- expect(evalSpy).toHaveBeenCalled();
+ expect(flushSpy).toHaveBeenCalled();
- evalSpy.reset(); //reset the spy
+ flushSpy.reset(); //reset the spy
cache('GET', '/url', null, callback);
- expect(evalSpy).not.toHaveBeenCalled();
+ expect(flushSpy).not.toHaveBeenCalled();
$browser.defer.flush();
- expect(evalSpy).toHaveBeenCalled();
+ expect(flushSpy).toHaveBeenCalled();
});
it('should call the error callback on error if provided', function() {