X-Git-Url: http://git.asbjorn.it/?p=jquery.git;a=blobdiff_plain;f=test%2Funit%2Fajax.js;h=abe90c88ea17b9d7eb7c0b559d2812c1412d7775;hp=d01837239b01455de6bfe0226444c165ac2fb081;hb=325dcdc2ab05173f809b9d83af59918b3695cc23;hpb=5ca8f0617f5c94495380ff783452a52eab706d39 diff --git a/test/unit/ajax.js b/test/unit/ajax.js index d018372..abe90c8 100644 --- a/test/unit/ajax.js +++ b/test/unit/ajax.js @@ -1199,10 +1199,10 @@ test("jQuery.getScript(String, Function) - no callback", function() { jQuery.each( [ "Same Domain", "Cross Domain" ] , function( crossDomain , label ) { test("jQuery.ajax() - JSONP, " + label, function() { - expect(17); + expect(16); var count = 0; - function plus(){ if ( ++count == 17 ) start(); } + function plus(){ if ( ++count == 16 ) start(); } stop(); @@ -1310,23 +1310,6 @@ jQuery.each( [ "Same Domain", "Cross Domain" ] , function( crossDomain , label ) url: "data/jsonp.php", dataType: "jsonp", crossDomain: crossDomain, - data: { - callback: "?" - }, - success: function(data){ - ok( data.data, "JSON results returned (GET, processed data callback)" ); - plus(); - }, - error: function(data){ - ok( false, "Ajax error JSON (GET, processed data callback)" ); - plus(); - } - }); - - jQuery.ajax({ - url: "data/jsonp.php", - dataType: "jsonp", - crossDomain: crossDomain, jsonp: "callback", success: function(data){ ok( data.data, "JSON results returned (GET, data obj callback)" );