diff options
| author | Oleg Gaidarenko <markelog@gmail.com> | 2015-10-13 00:00:38 +0300 |
|---|---|---|
| committer | Oleg Gaidarenko <markelog@gmail.com> | 2015-10-13 00:00:38 +0300 |
| commit | 39cdb8c9aa0fde68f733553ba050a2ba9d86474c (patch) | |
| tree | ed2d0f4936a333a1dbf73cf058ddf9e5a57d968e | |
| parent | 239169bb2ede6ea6287d82d1d13b0c354f451749 (diff) | |
| download | jquery-39cdb8c9aa0fde68f733553ba050a2ba9d86474c.tar.gz jquery-39cdb8c9aa0fde68f733553ba050a2ba9d86474c.zip | |
Ajax: don't expect cross-origin tests run in envs which not support it
Follow-up to b078a62013782c7424a4a61a240c23c4c0b42614
| -rw-r--r-- | test/unit/ajax.js | 51 |
1 files changed, 20 insertions, 31 deletions
diff --git a/test/unit/ajax.js b/test/unit/ajax.js index ec3e07613..d39b86a0f 100644 --- a/test/unit/ajax.js +++ b/test/unit/ajax.js @@ -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, function( assert ) { return { @@ -113,6 +98,11 @@ 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" ); } @@ -1777,22 +1767,21 @@ QUnit.module( "ajax", { 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://domain.org:80d", - 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 { |