From a13b5ed3bc337a493029815c595b89c39eb95af6 Mon Sep 17 00:00:00 2001 From: Igor Minar Date: Wed, 28 Dec 2011 09:26:22 -0800 Subject: fix($http): fix and cleanup $http and friends $http: - use promises internally - get rid of XhrFuture that was previously used internally - get rid of $browser.defer calls for async stuff (serving from cache), promises will take care of asynchronicity - fix transformation bugs (when caching requested + multiple request pending + error is returned) - get rid of native header parsing and instead just lazily parse the header string $httpBackend: - don't return raw/mock XMLHttpRequest object (we don't use it for anything anymore) - call the callback with response headers string mock $httpBackend: - unify response api for expect and when - call the callback with response headers string - changed the expect/when failure error message so that EXPECTED and GOT values are aligned Conflicts: src/service/http.js test/service/compilerSpec.js test/service/httpSpec.js --- test/widgetsSpec.js | 9 --------- 1 file changed, 9 deletions(-) (limited to 'test/widgetsSpec.js') diff --git a/test/widgetsSpec.js b/test/widgetsSpec.js index e8ff4b27..09d807b5 100644 --- a/test/widgetsSpec.js +++ b/test/widgetsSpec.js @@ -72,7 +72,6 @@ describe('widget', function() { $rootScope.childScope.name = 'misko'; $rootScope.url = 'myUrl'; $rootScope.$digest(); - $browser.defer.flush(); expect(element.text()).toEqual('misko'); })); @@ -86,7 +85,6 @@ describe('widget', function() { $rootScope.childScope.name = 'igor'; $rootScope.url = 'myUrl'; $rootScope.$digest(); - $browser.defer.flush(); expect(element.text()).toEqual('igor'); @@ -103,7 +101,6 @@ describe('widget', function() { element = $compile(element)($rootScope); $rootScope.url = 'myUrl'; $rootScope.$digest(); - $browser.defer.flush(); // TODO(misko): because we are using scope==this, the eval gets registered // during the flush phase and hence does not get called. @@ -125,7 +122,6 @@ describe('widget', function() { $rootScope.url = 'myUrl'; $rootScope.$digest(); - $browser.defer.flush(); expect(element.text()).toEqual('my partial'); expect($rootScope.loaded).toBe(true); @@ -141,7 +137,6 @@ describe('widget', function() { $rootScope.url = 'myUrl'; $rootScope.$digest(); - $browser.defer.flush(); expect($rootScope.$$childHead).toBeTruthy(); $rootScope.url = null; @@ -166,7 +161,6 @@ describe('widget', function() { $rootScope.url = 'myUrl'; $rootScope.$digest(); - $browser.defer.flush(); expect(element.text()).toEqual('my partial'); dealoc($rootScope); })); @@ -199,7 +193,6 @@ describe('widget', function() { }); $rootScope.$digest(); - $browser.defer.flush(); expect(element.text()).toBe('my partial'); })); @@ -746,7 +739,6 @@ describe('widget', function() { $rootScope.log = []; $location.path('/foo'); $rootScope.$apply(); - $browser.defer.flush(); expect($rootScope.log).toEqual(['parent', 'init', 'child']); })); @@ -801,7 +793,6 @@ describe('widget', function() { }); $rootScope.$digest(); - $browser.defer.flush(); expect(element.text()).toBe('my partial'); })); }); -- cgit v1.2.3