X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fajax.js;h=ec28b7c8b8d8989711661e54b69ca8baa7ee4cad;hb=d2384ad03a058370cc5978adaec5691fdee323bb;hp=abe90c88ea17b9d7eb7c0b559d2812c1412d7775;hpb=325dcdc2ab05173f809b9d83af59918b3695cc23;p=jquery.git diff --git a/test/unit/ajax.js b/test/unit/ajax.js index abe90c8..ec28b7c 100644 --- a/test/unit/ajax.js +++ b/test/unit/ajax.js @@ -242,7 +242,7 @@ test("jQuery.ajax() - error callbacks", function() { test("jQuery.ajax() - textStatus and errorThrown values", function() { - var nb = 3; + var nb = 2; expect( 2 * nb ); stop(); @@ -253,6 +253,11 @@ test("jQuery.ajax() - textStatus and errorThrown values", function() { } } + /* + Safari 3.x returns "OK" instead of "Not Found" + Safari 4.x doesn't have this issue so the test should be re-instated once + we drop support for 3.x + jQuery.ajax({ url: url("data/nonExistingURL"), error: function( _ , textStatus , errorThrown ){ @@ -261,6 +266,7 @@ test("jQuery.ajax() - textStatus and errorThrown values", function() { startN(); } }); + */ jQuery.ajax({ url: url("data/name.php?wait=5"), @@ -415,6 +421,18 @@ test(".ajax() - contentType" , function() { }); +test(".ajax() - protocol-less urls", function() { + expect(1); + + jQuery.ajax({ + url: "//somedomain.com", + beforeSend: function( xhr, settings ) { + equals(settings.url, location.protocol + "//somedomain.com", "Make sure that the protocol is added."); + return false; + } + }); +}); + test(".ajax() - hash", function() { expect(3); @@ -1180,10 +1198,11 @@ test("jQuery.get(String, Hash, Function) - parse xml and use text() on nodes", f }); test("jQuery.getScript(String, Function) - with callback", function() { - expect(2); + expect(3); stop(); - jQuery.getScript(url("data/test.js"), function() { + jQuery.getScript(url("data/test.js"), function( data, _, jXHR ) { equals( foobar, "bar", 'Check if script was evaluated' ); + strictEqual( data, jXHR.responseText, "Same-domain script requests returns the source of the script (#8082)" ); setTimeout(start, 100); }); });