From 8f0dcbab804180828d6859b1340c86cf161209fb Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Wed, 23 Mar 2011 09:33:29 -0700 Subject: 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 --- test/service/cookiesSpec.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'test/service/cookiesSpec.js') diff --git a/test/service/cookiesSpec.js b/test/service/cookiesSpec.js index 3248fe23..cc667b56 100644 --- a/test/service/cookiesSpec.js +++ b/test/service/cookiesSpec.js @@ -6,7 +6,7 @@ describe('$cookies', function() { beforeEach(function() { $browser = new MockBrowser(); $browser.cookieHash['preexisting'] = 'oldCookie'; - scope = angular.scope(null, angular.service, {$browser: $browser}); + scope = angular.scope(angular.service, {$browser: $browser}); scope.$cookies = scope.$service('$cookies'); }); @@ -38,13 +38,13 @@ describe('$cookies', function() { it('should create or update a cookie when a value is assigned to a property', function() { scope.$cookies.oatmealCookie = 'nom nom'; - scope.$eval(); + scope.$flush(); expect($browser.cookies()). toEqual({'preexisting': 'oldCookie', 'oatmealCookie':'nom nom'}); scope.$cookies.oatmealCookie = 'gone'; - scope.$eval(); + scope.$flush(); expect($browser.cookies()). toEqual({'preexisting': 'oldCookie', 'oatmealCookie': 'gone'}); @@ -56,7 +56,7 @@ describe('$cookies', function() { scope.$cookies.nullVal = null; scope.$cookies.undefVal = undefined; scope.$cookies.preexisting = function(){}; - scope.$eval(); + scope.$flush(); expect($browser.cookies()).toEqual({'preexisting': 'oldCookie'}); expect(scope.$cookies).toEqual({'preexisting': 'oldCookie'}); }); @@ -64,13 +64,13 @@ describe('$cookies', function() { it('should remove a cookie when a $cookies property is deleted', function() { scope.$cookies.oatmealCookie = 'nom nom'; - scope.$eval(); + scope.$flush(); $browser.poll(); expect($browser.cookies()). toEqual({'preexisting': 'oldCookie', 'oatmealCookie':'nom nom'}); delete scope.$cookies.oatmealCookie; - scope.$eval(); + scope.$flush(); expect($browser.cookies()).toEqual({'preexisting': 'oldCookie'}); }); @@ -85,16 +85,16 @@ describe('$cookies', function() { //drop if no previous value scope.$cookies.longCookie = longVal; - scope.$eval(); + scope.$flush(); expect(scope.$cookies).toEqual({'preexisting': 'oldCookie'}); //reset if previous value existed scope.$cookies.longCookie = 'shortVal'; - scope.$eval(); + scope.$flush(); expect(scope.$cookies).toEqual({'preexisting': 'oldCookie', 'longCookie': 'shortVal'}); scope.$cookies.longCookie = longVal; - scope.$eval(); + scope.$flush(); expect(scope.$cookies).toEqual({'preexisting': 'oldCookie', 'longCookie': 'shortVal'}); }); }); -- cgit v1.2.3