From cfca6d3836476a233cf349abc5f433f1ba7b8feb Mon Sep 17 00:00:00 2001 From: jaubourg Date: Sun, 16 Jan 2011 05:36:20 +0100 Subject: [PATCH] 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. --- test/unit/ajax.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/unit/ajax.js b/test/unit/ajax.js index 2e8a455..f26ebad 100644 --- a/test/unit/ajax.js +++ b/test/unit/ajax.js @@ -1117,10 +1117,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(16); + expect(17); var count = 0; - function plus(){ if ( ++count == 16 ) start(); } + function plus(){ if ( ++count == 17 ) start(); } stop(); @@ -1343,15 +1343,15 @@ jQuery.each( [ "Same Domain", "Cross Domain" ] , function( crossDomain , label ) jsonpCallback: "XXX", crossDomain: crossDomain, 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){ - console.log(data); ok( data.data, "JSON results returned (GET, custom callback name with no url manipulation)" ); plus(); }, error: function(data){ - console.log(data); ok( false, "Ajax error JSON (GET, custom callback name with no url manipulation)" ); plus(); } -- 1.7.10.4