kylefang/angular.js
1
0
Fork 0
mirror of https://github.com/zhigang1992/angular.js.git synced 2026-04-23 11:37:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor($http) Use onload/onerror/onabort instead of onreadystatechange

Browse Source 
Closes #9329
This commit is contained in:
Rouven Weßling
2014-09-27 19:42:48 +02:00
committed by Igor Minar
parent f52203ce71
commit 40d8da80ce
2 changed files with 38 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
test/ng/httpBackendSpec.js
View File

@@ -87,27 +87,7 @@ describe('$httpBackend', function() {
$backend('GET', '/some-url', null, callback);
xhr = MockXhr.$$lastInstance;
xhr.statusText = 'OK';
xhr.readyState = 4;
xhr.onreadystatechange();
expect(callback).toHaveBeenCalledOnce();
});
it('should not touch xhr.statusText when request is aborted on IE9 or lower', function() {
callback.andCallFake(function(status, response, headers, statusText) {
expect(statusText).toBe((!msie || msie >= 10) ? 'OK' : '');
});
$backend('GET', '/url', null, callback, {}, 2000);
xhr = MockXhr.$$lastInstance;
spyOn(xhr, 'abort');
fakeTimeout.flush();
expect(xhr.abort).toHaveBeenCalledOnce();
xhr.status = 0;
xhr.readyState = 4;
xhr.statusText = 'OK';
xhr.onreadystatechange();
xhr.onload();
expect(callback).toHaveBeenCalledOnce();
});
@@ -118,8 +98,7 @@ describe('$httpBackend', function() {
$backend('GET', '/some-url', null, callback);
xhr = MockXhr.$$lastInstance;
xhr.readyState = 4;
xhr.onreadystatechange();
xhr.onload();
expect(callback).toHaveBeenCalledOnce();
});
@@ -133,23 +112,7 @@ describe('$httpBackend', function() {
xhr = MockXhr.$$lastInstance;
xhr.status = 1223;
xhr.readyState = 4;
xhr.onreadystatechange();
expect(callback).toHaveBeenCalledOnce();
});
// onreadystatechange might by called multiple times
// with readyState === 4 on mobile webkit caused by
// xhrs that are resolved while the app is in the background (see #5426).
it('should not process onreadystatechange callback with readyState == 4 more than once', function() {
$backend('GET', 'URL', null, callback);
xhr = MockXhr.$$lastInstance;
xhr.status = 200;
xhr.readyState = 4;
xhr.onreadystatechange();
xhr.onreadystatechange();
xhr.onload();
expect(callback).toHaveBeenCalledOnce();
});
@@ -195,8 +158,7 @@ describe('$httpBackend', function() {
expect(xhr.abort).toHaveBeenCalledOnce();
xhr.status = 0;
xhr.readyState = 4;
xhr.onreadystatechange();
xhr.onabort();
expect(callback).toHaveBeenCalledOnce();
});
@@ -215,8 +177,7 @@ describe('$httpBackend', function() {
expect(xhr.abort).toHaveBeenCalledOnce();
xhr.status = 0;
xhr.readyState = 4;
xhr.onreadystatechange();
xhr.onabort();
expect(callback).toHaveBeenCalledOnce();
});
@@ -234,8 +195,7 @@ describe('$httpBackend', function() {
expect(xhr.abort).toHaveBeenCalledOnce();
xhr.status = 0;
xhr.readyState = 4;
xhr.onreadystatechange();
xhr.onabort();
expect(callback).toHaveBeenCalledOnce();
}));
@@ -250,8 +210,7 @@ describe('$httpBackend', function() {
spyOn(xhr, 'abort');
xhr.status = 200;
xhr.readyState = 4;
xhr.onreadystatechange();
xhr.onload();
expect(callback).toHaveBeenCalledOnce();
$timeout.flush();
@@ -271,8 +230,7 @@ describe('$httpBackend', function() {
expect(fakeTimeout.delays[0]).toBe(2000);
xhr.status = 200;
xhr.readyState = 4;
xhr.onreadystatechange();
xhr.onload();
expect(callback).toHaveBeenCalledOnce();
expect(fakeTimeout.delays.length).toBe(0);
@@ -280,33 +238,6 @@ describe('$httpBackend', function() {
});
it('should register onreadystatechange callback before sending', function() {
// send() in IE6, IE7 is sync when serving from cache
function SyncXhr() {
xhr = this;
this.open = this.setRequestHeader = noop;
this.send = function() {
this.status = 200;
this.responseText = 'response';
this.readyState = 4;
this.onreadystatechange();
};
this.getAllResponseHeaders = valueFn('');
}
callback.andCallFake(function(status, response) {
expect(status).toBe(200);
expect(response).toBe('response');
});
$backend = createHttpBackend($browser, function() { return new SyncXhr(); });
$backend('GET', '/url', null, callback);
expect(callback).toHaveBeenCalledOnce();
});
it('should set withCredentials', function() {
$backend('GET', '/some.url', null, callback, {}, null, true);
expect(MockXhr.$$lastInstance.withCredentials).toBe(true);
@@ -326,8 +257,7 @@ describe('$httpBackend', function() {
});
xhrInstance.response = {some: 'object'};
xhrInstance.readyState = 4;
xhrInstance.onreadystatechange();
xhrInstance.onload();
expect(callback).toHaveBeenCalledOnce();
});
@@ -347,8 +277,7 @@ describe('$httpBackend', function() {
});
xhrInstance.responseText = responseText;
xhrInstance.readyState = 4;
xhrInstance.onreadystatechange();
xhrInstance.onload();
expect(callback).toHaveBeenCalledOnce();
});
@@ -436,8 +365,7 @@ describe('$httpBackend', function() {
xhr = MockXhr.$$lastInstance;
xhr.status = status;
xhr.responseText = content;
xhr.readyState = 4;
xhr.onreadystatechange();
xhr.onload();
}