deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed the ajax test regarding the jsonp option set to false and added a test to control the prefilter actually does not tamper with the url.

Browse source
This commit is contained in:
jaubourg 2011-01-16 05:36:20 +01:00
parent 0e93b2e24c
commit cfca6d3836
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
test/unit/ajax.js
View file

@ -1117,10 +1117,10 @@ test("jQuery.getScript(String, Function) - no callback", function() {
jQuery.each( [ "Same Domain", "Cross Domain" ] , function( crossDomain , label ) { jQuery.each( [ "Same Domain", "Cross Domain" ] , function( crossDomain , label ) {
test("jQuery.ajax() - JSONP, " + label, function() { test("jQuery.ajax() - JSONP, " + label, function() {
expect(16); expect(17);
var count = 0; var count = 0;
function plus(){ if ( ++count == 16 ) start(); } function plus(){ if ( ++count == 17 ) start(); }
stop(); stop();
@ -1343,15 +1343,15 @@ jQuery.each( [ "Same Domain", "Cross Domain" ] , function( crossDomain , label )
jsonpCallback: "XXX", jsonpCallback: "XXX",
crossDomain: crossDomain, crossDomain: crossDomain,
beforeSend: function() { beforeSend: function() {
console.log( this.url ); ok( /^data\/jsonp.php\?callback=XXX&_=\d+$/.test( this.url ) ,
"The URL wasn't messed with (GET, custom callback name with no url manipulation)" );
plus();
}, },
success: function(data){ success: function(data){
console.log(data);
ok( data.data, "JSON results returned (GET, custom callback name with no url manipulation)" ); ok( data.data, "JSON results returned (GET, custom callback name with no url manipulation)" );
plus(); plus();
}, },
error: function(data){ error: function(data){
console.log(data);
ok( false, "Ajax error JSON (GET, custom callback name with no url manipulation)" ); ok( false, "Ajax error JSON (GET, custom callback name with no url manipulation)" );
plus(); plus();
} }