library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Ajax: don't expect cross-origin tests run in envs which not support it

Browse Source 
Follow-up to b078a62013
This commit is contained in:
Oleg Gaidarenko 2015-10-13 00:00:38 +03:00
parent 239169bb2e
commit 39cdb8c9aa
1 changed files with 20 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
test/unit/ajax.js
View File

@ -71,21 +71,6 @@ QUnit.module( "ajax", {
}; };
} ); } );
ajaxTest( "jQuery.ajax() - do not execute js (crossOrigin)", 2, function( assert ) {
return {
create: function( options ) {
options.crossDomain = true;
return jQuery.ajax( url( "data/script.php?header=ecma" ), options );
},
success: function() {
assert.ok( true, "success" );
},
complete: function() {
assert.ok( true, "complete" );
}
};
} );
ajaxTest( "jQuery.ajax() - execute js for crossOrigin when dataType option is provided", 3, ajaxTest( "jQuery.ajax() - execute js for crossOrigin when dataType option is provided", 3,
function( assert ) { function( assert ) {
return { return {
@ -113,6 +98,11 @@ QUnit.module( "ajax", {
success: function() { success: function() {
assert.ok( true, "success" ); assert.ok( true, "success" );
}, },
fail: function() {
if (jQuery.support.cors === false) {
assert.ok( true, "fail" );
}
},
complete: function() { complete: function() {
assert.ok( true, "complete" ); assert.ok( true, "complete" );
} }
@ -1777,22 +1767,21 @@ QUnit.module( "ajax", {
done: function( data ) { done: function( data ) {
assert.ok( false, "done: " + data ); assert.ok( false, "done: " + data );
}, },
fail: function( jqXHR, status, error ) { fail: function( jqXHR, status, error ) {
assert.ok( true, "exception caught: " + error ); assert.ok( true, "exception caught: " + error );
assert.strictEqual( jqXHR.status, 0, "proper status code" ); assert.strictEqual( jqXHR.status, 0, "proper status code" );
assert.strictEqual( status, "error", "proper status" ); assert.strictEqual( status, "error", "proper status" );
} }
}, { }, {
url: "http://domain.org:80d", url: "http://domain.org:80d",
done: function( data ) { done: function( data ) {
assert.ok( false, "done: " + data ); assert.ok( false, "done: " + data );
}, },
fail: function( _, status, error ) { fail: function( _, status, error ) {
assert.ok( true, "fail: " + status + " - " + error ); assert.ok( true, "fail: " + status + " - " + error );
} }
} ]; } ];
} } );
);
ajaxTest( "gh-2587 - when content-type not xml, but looks like one", 1, function( assert ) { ajaxTest( "gh-2587 - when content-type not xml, but looks like one", 1, function( assert ) {
return { return {