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 Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 39cdb8c9aa.
This commit is contained in:
Oleg Gaidarenko 2015-11-11 18:54:44 +03:00
parent 3f7cd73822
commit 8dda094c7c
1 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
test/unit/ajax.js
View File

@ -71,6 +71,21 @@ 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,
function( assert ) {
return {
@ -98,11 +113,6 @@ QUnit.module( "ajax", {
success: function() {
assert.ok( true, "success" );
},
fail: function() {
if (jQuery.support.cors === false) {
assert.ok( true, "fail" );
}
},
complete: function() {
assert.ok( true, "complete" );
}
@ -1810,21 +1820,22 @@ if ( typeof window.ArrayBuffer === "undefined" || typeof new XMLHttpRequest().re
done: function( data ) {
assert.ok( false, "done: " + data );
},
fail: function( jqXHR, status, error ) {
assert.ok( true, "exception caught: " + error );
assert.strictEqual( jqXHR.status, 0, "proper status code" );
assert.strictEqual( status, "error", "proper status" );
}
}, {
url: "http://" + externalHost + ":80q",
done: function( data ) {
assert.ok( false, "done: " + data );
},
fail: function( _, status, error ) {
assert.ok( true, "fail: " + status + " - " + error );
}
} ];
} );
fail: function( jqXHR, status, error ) {
assert.ok( true, "exception caught: " + error );
assert.strictEqual( jqXHR.status, 0, "proper status code" );
assert.strictEqual( status, "error", "proper status" );
}
}, {
url: "http://domain.org:80d",
done: function( data ) {
assert.ok( false, "done: " + data );
},
fail: function( _, status, error ) {
assert.ok( true, "fail: " + status + " - " + error );
}
} ];
}
);
ajaxTest( "gh-2587 - when content-type not xml, but looks like one", 1, function( assert ) {
return {