Skip to content
This repository was archived by the owner on Mar 13, 2018. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core-ajax.html
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@
lengthComputable: progress.lengthComputable,
loaded: progress.loaded,
total: progress.total
}
};
this.progress = progressProxy;
},

Expand Down Expand Up @@ -408,7 +408,7 @@
} else {
this.progress = {
lengthComputable: false,
}
};
}
}
return this.activeRequest;
Expand Down
6 changes: 3 additions & 3 deletions test/core-ajax-progress.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
var headers = {
"Content-Type": "text/json"
};
var body = '{"content": "plentiful"}'
var body = '{"content": "plentiful"}';
var requests = this.requests = [];
xhr.onCreate = function (xhr) {
xhr.onCreate = function(xhr) {
requests.push(xhr);
// Polymer inspects the xhr object for the precense of onprogress to determine
// whether to attach an event listener.
Expand All @@ -50,7 +50,7 @@
total: total
});
return progress;
}
};

// Fake a file download by sending multiple progress events.
async.series([
Expand Down
6 changes: 3 additions & 3 deletions test/core-ajax-race.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,19 @@
return '{"url": "' + url + '"}';
};
var requests = [];
xhr.onCreate = function (xhr) {
xhr.onCreate = function(xhr) {
requests.push(xhr);
};

// Make request1, then request2. request2 returns first, followed by request1.
async.series([
function(cb) {
ajax.url="http://example.org/request1"
ajax.url = "http://example.org/request1";
cb();
},
animationFrameFlush,
function(cb) {
ajax.url="http://example.org/request2"
ajax.url = "http://example.org/request2";
cb();
},
animationFrameFlush,
Expand Down
112 changes: 56 additions & 56 deletions test/core-ajax.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,43 +40,43 @@
requests = [];
});
suite('handleAs', function() {
suite('text', function(){
suite('text', function() {
var headers = {
"Content-Type": "text/plain"
};
setup(function(done){
setup(function(done) {
async.series([
function(cb){
function(cb) {
ajax.handleAs = 'text';
ajax.url = "http://example.com/text"
ajax.url = "http://example.com/text";
ajax.auto = true;
cb();
},
animationFrameFlush,
function(cb){
function(cb) {
requests[0].respond(200, headers, "test text");
cb();
}
], done);
});
test('Raw text should pass through', function(){
assert.equal(ajax.response, "test text")
test('Raw text should pass through', function() {
assert.equal(ajax.response, "test text");
});
});
suite('xml', function(){
suite('xml', function() {
var headers = {
"Content-Type": "text/xml"
};
setup(function(done){
setup(function(done) {
async.series([
function(cb){
function(cb) {
ajax.handleAs = 'xml';
ajax.url = "http://example.com/xml"
ajax.url = "http://example.com/xml";
ajax.auto = true;
cb();
},
animationFrameFlush,
function(cb){
function(cb) {
requests[0].respond(200, headers,
"<note>" +
"<to>AJ</to>" +
Expand All @@ -88,52 +88,52 @@
}
], done);
});
test('XML should be returned with queryable structure', function(){
test('XML should be returned with queryable structure', function() {
var q = ajax.response.querySelector("note body q");
assert.equal(q.childNodes[0].textContent, "Feed me!");
var to = ajax.response.querySelector("to");
assert.equal(to.childNodes[0].textContent, "AJ");
})});
suite('json', function(){
suite('json', function() {
var headers = {
"Content-Type": "text/json"
};
setup(function(done){
setup(function(done) {
async.series([
function(cb){
function(cb) {
ajax.handleAs = 'json';
ajax.url = "http://example.com/json"
ajax.url = "http://example.com/json";
ajax.auto = true;
cb();
},
animationFrameFlush,
function(cb){
function(cb) {
requests[0].respond(200, headers,
'{"object" : {"list" : [2, 3, {"key": "value"}]}}');
cb();
}
], done);
});
test('JSON should be returned as an Object', function(){
test('JSON should be returned as an Object', function() {
var r = ajax.response;
assert.equal(r.object.list[1], 3);
assert.equal(r.object.list[2].key, "value");
});
});
suite('arraybuffer', function(){
suite('arraybuffer', function() {
var headers = {
"Content-Type": "text/plain"
};
setup(function(done){
setup(function(done) {
async.series([
function(cb){
function(cb) {
ajax.handleAs = 'arraybuffer';
ajax.url = "http://example.com/data"
ajax.url = "http://example.com/data";
ajax.auto = true;
cb();
},
animationFrameFlush,
function(cb){
function(cb) {
var buf = new ArrayBuffer(8*4);
var resp = new Int32Array(buf);
resp[3] = 12;
Expand All @@ -144,7 +144,7 @@
}
], done);
});
test('arraybuffer response should be passed through', function(){
test('arraybuffer response should be passed through', function() {
var r = ajax.response;
var ints = new Int32Array(r);
assert.equal(ints[3], 12);
Expand All @@ -155,123 +155,123 @@
suite('document', function(){});
});
suite('auto', function() {
suiteSetup(function(){
ajax.url = "http://example.com/"
suiteSetup(function() {
ajax.url = "http://example.com/";
ajax.auto = true;
});
test('url change should trigger request', function(done){
test('url change should trigger request', function(done) {
async.series([
function(cb){
function(cb) {
ajax.url = "http://example.com/auto";
cb();
},
animationFrameFlush,
function(cb){
function(cb) {
assert.equal(requests.length, 1);
cb();
}
], done);
});
test('params change should trigger request', function(done){
test('params change should trigger request', function(done) {
async.series([
function(cb){
function(cb) {
ajax.params = {param: "value"};
cb();
},
animationFrameFlush,
function(cb){
function(cb) {
assert.equal(requests.length, 1);
cb();
}
], done);
});
test('body change should trigger request', function(done){
test('body change should trigger request', function(done) {
async.series([
function(cb){
function(cb) {
ajax.method = "POST";
ajax.body = "bodystuff";
cb();
},
animationFrameFlush,
function(cb){
function(cb) {
assert.equal(requests.length, 1);
cb();
}
], done);
});
});
suite('events', function(){
suite('events', function() {
var headers = {
"Content-Type": "text/plain"
};
var body = "somebodytext";
var responded;
setup(function(done){
setup(function(done) {
async.series([
function(cb){
function(cb) {
ajax.auto = false;
cb();
},
animationFrameFlush,
function(cb){;
function(cb) {
ajax.handleAs = 'text';
ajax.url = "http://example.com/text"
ajax.url = "http://example.com/text";
ajax.auto = true;
cb();
},
animationFrameFlush,
], done);
responded = false;
});
suite('core-response', function(){
test('core-response should be fired on success', function(done){
window.addEventListener('core-response', function(response, xhr){
suite('core-response', function() {
test('core-response should be fired on success', function(done) {
window.addEventListener('core-response', function(response, xhr) {
responded = true;
});
requests[0].respond(200, headers, body);
assert.isTrue(responded);
done();
});
test('core-response should not be fired on failure', function(done){
window.addEventListener('core-response', function(response, xhr){
test('core-response should not be fired on failure', function(done) {
window.addEventListener('core-response', function(response, xhr) {
responded = true;
});
requests[0].respond(404, headers, body);
assert.isFalse(responded);
done();
});
});
suite('core-error', function(){
test('core-error should be fired on failure', function(done){
window.addEventListener('core-error', function(response, xhr){
suite('core-error', function() {
test('core-error should be fired on failure', function(done) {
window.addEventListener('core-error', function(response, xhr) {
responded = true;
});
requests[0].respond(404, headers, body);
assert.isTrue(responded);
done();
});
test('core-error should not be fired on success', function(done){
test('core-error should not be fired on success', function(done) {
var responded = false;
window.addEventListener('core-error', function(response, xhr){
window.addEventListener('core-error', function(response, xhr) {
responded = true;
});
requests[0].respond(200, headers, body);
assert.isFalse(responded);
done();
});
});
suite('core-complete', function(){
test('core-complete should be fired on success', function(done){
window.addEventListener('core-complete', function(response, xhr){
suite('core-complete', function() {
test('core-complete should be fired on success', function(done) {
window.addEventListener('core-complete', function(response, xhr) {
responded = true;
});
requests[0].respond(200, headers, body);
assert.isTrue(responded);
done();
});
test('core-complete should be fired on failure', function(done){
test('core-complete should be fired on failure', function(done) {
var responded = false;
window.addEventListener('core-complete', function(response, xhr){
window.addEventListener('core-complete', function(response, xhr) {
responded = true;
});
requests[0].respond(404, headers, body);
Expand Down