Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-05-22 21:25:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

added exception handling to $xhr

Browse source
This commit is contained in:
Misko Hevery 2010-05-19 12:00:44 -07:00
parent f2abbfd394
commit 31b35b141f
2 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/services.js
View file

@ -196,7 +196,7 @@ angularService('$route', function(location, params){
return $route; return $route;
}, {inject: ['$location']}); }, {inject: ['$location']});
angularService('$xhr', function($browser, $error){ angularService('$xhr', function($browser, $error, $log){
var self = this; var self = this;
return function(method, url, post, callback){ return function(method, url, post, callback){
if (isFunction(post)) { if (isFunction(post)) {
@ -218,12 +218,14 @@ angularService('$xhr', function($browser, $error){
{method: method, url:url, data:post, callback:callback}, {method: method, url:url, data:post, callback:callback},
{status: code, body:response}); {status: code, body:response});
} }
} catch (e) {
$log.error(e);
} finally { } finally {
self.$eval(); self.$eval();
} }
}); });
}; };
}, {inject:['$browser', '$xhr.error']}); }, {inject:['$browser', '$xhr.error', '$log']});
angularService('$xhr.error', function($log){ angularService('$xhr.error', function($log){
return function(request, response){ return function(request, response){

27
test/servicesSpec.js
View file

@ -1,10 +1,12 @@
describe("service", function(){ describe("service", function(){
var scope, xhrErrorHandler; var scope, $xhrError, $log;
beforeEach(function(){ beforeEach(function(){
xhrErrorHandler = jasmine.createSpy('$xhr.error'); $xhrError = jasmine.createSpy('$xhr.error');
$log = {};
scope = createScope(null, angularService, { scope = createScope(null, angularService, {
'$xhr.error': xhrErrorHandler '$xhr.error': $xhrError,
'$log': $log
}); });
}); });
@ -201,13 +203,22 @@ describe("service", function(){
xhr.expectPOST('/req', 'MyData').respond(500, 'MyError'); xhr.expectPOST('/req', 'MyData').respond(500, 'MyError');
scope.$xhr('POST', '/req', 'MyData', callback); scope.$xhr('POST', '/req', 'MyData', callback);
xhr.flush(); xhr.flush();
var cb = xhrErrorHandler.mostRecentCall.args[0].callback; var cb = $xhrError.mostRecentCall.args[0].callback;
expect(typeof cb).toEqual('function'); expect(typeof cb).toEqual('function');
expect(xhrErrorHandler).wasCalledWith( expect($xhrError).wasCalledWith(
{url:'/req', method:'POST', data:'MyData', callback:cb}, {url:'/req', method:'POST', data:'MyData', callback:cb},
{status:500, body:'MyError'}); {status:500, body:'MyError'});
}); });
it('should handle exceptions in callback', function(){
$log.error = jasmine.createSpy('$log.error');
xhr.expectGET('/reqGET').respond('first');
scope.$xhr('GET', '/reqGET', null, function(){ throw "MyException"; });
xhr.flush();
expect($log.error).wasCalledWith("MyException");
});
describe('bulk', function(){ describe('bulk', function(){
it('should collect requests', function(){ it('should collect requests', function(){
scope.$xhr.bulk.urls["/"] = {match:/.*/}; scope.$xhr.bulk.urls["/"] = {match:/.*/};
@ -241,10 +252,10 @@ describe("service", function(){
scope.$xhr.bulk.flush(function(){ log += 'DONE';}); scope.$xhr.bulk.flush(function(){ log += 'DONE';});
xhr.flush(); xhr.flush();
expect(xhrErrorHandler).wasCalled(); expect($xhrError).wasCalled();
var cb = xhrErrorHandler.mostRecentCall.args[0].callback; var cb = $xhrError.mostRecentCall.args[0].callback;
expect(typeof cb).toEqual('function'); expect(typeof cb).toEqual('function');
expect(xhrErrorHandler).wasCalledWith( expect($xhrError).wasCalledWith(
{url:'/req1', method:'GET', data:null, callback:cb}, {url:'/req1', method:'GET', data:null, callback:cb},
{status:404, body:'NotFound'}); {status:404, body:'NotFound'});