Revised jsonp unit tests and added a test for when the jsonp option is set to false.

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 49196cb..2e8a455 100644 (file)
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -1114,286 +1114,249 @@ test("jQuery.getScript(String, Function) - no callback", function() {
        });
 });
 
-test("jQuery.ajax() - JSONP, Local", function() {
-       expect(14);
-
-       var count = 0;
-       function plus(){ if ( ++count == 14 ) start(); }
+jQuery.each( [ "Same Domain", "Cross Domain" ] , function( crossDomain , label ) {
 
-       stop();
+       test("jQuery.ajax() - JSONP, " + label, function() {
+               expect(16);
 
-       jQuery.ajax({
-               url: "data/jsonp.php",
-               dataType: "jsonp",
-               success: function(data){
-                       ok( data.data, "JSON results returned (GET, no callback)" );
-                       plus();
-               },
-               error: function(data){
-                       ok( false, "Ajax error JSON (GET, no callback)" );
-                       plus();
-               }
-       });
-
-       jQuery.ajax({
-               url: "data/jsonp.php?callback=?",
-               dataType: "jsonp",
-               success: function(data){
-                       ok( data.data, "JSON results returned (GET, url callback)" );
-                       plus();
-               },
-               error: function(data){
-                       ok( false, "Ajax error JSON (GET, url callback)" );
-                       plus();
-               }
-       });
-
-       jQuery.ajax({
-               url: "data/jsonp.php",
-               dataType: "jsonp",
-               data: "callback=?",
-               success: function(data){
-                       ok( data.data, "JSON results returned (GET, data callback)" );
-                       plus();
-               },
-               error: function(data){
-                       ok( false, "Ajax error JSON (GET, data callback)" );
-                       plus();
-               }
-       });
+               var count = 0;
+               function plus(){ if ( ++count == 16 ) start(); }
 
-       jQuery.ajax({
-               url: "data/jsonp.php?callback=??",
-               dataType: "jsonp",
-               success: function(data){
-                       ok( data.data, "JSON results returned (GET, url context-free callback)" );
-                       plus();
-               },
-               error: function(data){
-                       ok( false, "Ajax error JSON (GET, url context-free callback)" );
-                       plus();
-               }
-       });
+               stop();
 
-       jQuery.ajax({
-               url: "data/jsonp.php",
-               dataType: "jsonp",
-               data: "callback=??",
-               success: function(data){
-                       ok( data.data, "JSON results returned (GET, data context-free callback)" );
-                       plus();
-               },
-               error: function(data){
-                       ok( false, "Ajax error JSON (GET, data context-free callback)" );
-                       plus();
-               }
-       });
+               jQuery.ajax({
+                       url: "data/jsonp.php",
+                       dataType: "jsonp",
+                       crossDomain: crossDomain,
+                       success: function(data){
+                               ok( data.data, "JSON results returned (GET, no callback)" );
+                               plus();
+                       },
+                       error: function(data){
+                               ok( false, "Ajax error JSON (GET, no callback)" );
+                               plus();
+                       }
+               });
 
-       jQuery.ajax({
-               url: "data/jsonp.php/??",
-               dataType: "jsonp",
-               success: function(data){
-                       ok( data.data, "JSON results returned (GET, REST-like)" );
-                       plus();
-               },
-               error: function(data){
-                       ok( false, "Ajax error JSON (GET, REST-like)" );
-                       plus();
-               }
-       });
+               jQuery.ajax({
+                       url: "data/jsonp.php?callback=?",
+                       dataType: "jsonp",
+                       crossDomain: crossDomain,
+                       success: function(data){
+                               ok( data.data, "JSON results returned (GET, url callback)" );
+                               plus();
+                       },
+                       error: function(data){
+                               ok( false, "Ajax error JSON (GET, url callback)" );
+                               plus();
+                       }
+               });
 
-       jQuery.ajax({
-               url: "data/jsonp.php/???json=1",
-               dataType: "jsonp",
-               success: function(data){
-                       strictEqual( jQuery.type(data), "array", "JSON results returned (GET, REST-like with param)" );
-                       plus();
-               },
-               error: function(data){
-                       ok( false, "Ajax error JSON (GET, REST-like with param)" );
-                       plus();
-               }
-       });
+               jQuery.ajax({
+                       url: "data/jsonp.php",
+                       dataType: "jsonp",
+                       crossDomain: crossDomain,
+                       data: "callback=?",
+                       success: function(data){
+                               ok( data.data, "JSON results returned (GET, data callback)" );
+                               plus();
+                       },
+                       error: function(data){
+                               ok( false, "Ajax error JSON (GET, data callback)" );
+                               plus();
+                       }
+               });
 
-       jQuery.ajax({
-               url: "data/jsonp.php",
-               dataType: "jsonp",
-               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?callback=??",
+                       dataType: "jsonp",
+                       crossDomain: crossDomain,
+                       success: function(data){
+                               ok( data.data, "JSON results returned (GET, url context-free callback)" );
+                               plus();
+                       },
+                       error: function(data){
+                               ok( false, "Ajax error JSON (GET, url context-free callback)" );
+                               plus();
+                       }
+               });
 
-       jQuery.ajax({
-               url: "data/jsonp.php",
-               dataType: "jsonp",
-               jsonp: "callback",
-               success: function(data){
-                       ok( data.data, "JSON results returned (GET, data obj callback)" );
-                       plus();
-               },
-               error: function(data){
-                       ok( false, "Ajax error JSON (GET, data obj callback)" );
-                       plus();
-               }
-       });
+               jQuery.ajax({
+                       url: "data/jsonp.php",
+                       dataType: "jsonp",
+                       crossDomain: crossDomain,
+                       data: "callback=??",
+                       success: function(data){
+                               ok( data.data, "JSON results returned (GET, data context-free callback)" );
+                               plus();
+                       },
+                       error: function(data){
+                               ok( false, "Ajax error JSON (GET, data context-free callback)" );
+                               plus();
+                       }
+               });
 
-       jQuery.ajax({
-               url: "data/jsonp.php",
-               dataType: "jsonp",
-               jsonpCallback: "jsonpResults",
-               success: function(data){
-                       ok( data.data, "JSON results returned (GET, custom callback name)" );
-                       plus();
-               },
-               error: function(data){
-                       ok( false, "Ajax error JSON (GET, custom callback name)" );
-                       plus();
-               }
-       });
+               jQuery.ajax({
+                       url: "data/jsonp.php/??",
+                       dataType: "jsonp",
+                       crossDomain: crossDomain,
+                       success: function(data){
+                               ok( data.data, "JSON results returned (GET, REST-like)" );
+                               plus();
+                       },
+                       error: function(data){
+                               ok( false, "Ajax error JSON (GET, REST-like)" );
+                               plus();
+                       }
+               });
 
-       jQuery.ajax({
-               type: "POST",
-               url: "data/jsonp.php",
-               dataType: "jsonp",
-               success: function(data){
-                       ok( data.data, "JSON results returned (POST, no callback)" );
-                       plus();
-               },
-               error: function(data){
-                       ok( false, "Ajax error JSON (GET, data obj callback)" );
-                       plus();
-               }
-       });
+               jQuery.ajax({
+                       url: "data/jsonp.php/???json=1",
+                       dataType: "jsonp",
+                       crossDomain: crossDomain,
+                       success: function(data){
+                               strictEqual( jQuery.type(data), "array", "JSON results returned (GET, REST-like with param)" );
+                               plus();
+                       },
+                       error: function(data){
+                               ok( false, "Ajax error JSON (GET, REST-like with param)" );
+                               plus();
+                       }
+               });
 
-       jQuery.ajax({
-               type: "POST",
-               url: "data/jsonp.php",
-               data: "callback=?",
-               dataType: "jsonp",
-               success: function(data){
-                       ok( data.data, "JSON results returned (POST, data callback)" );
-                       plus();
-               },
-               error: function(data){
-                       ok( false, "Ajax error JSON (POST, data callback)" );
-                       plus();
-               }
-       });
+               jQuery.ajax({
+                       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({
-               type: "POST",
-               url: "data/jsonp.php",
-               jsonp: "callback",
-               dataType: "jsonp",
-               success: function(data){
-                       ok( data.data, "JSON results returned (POST, data obj callback)" );
-                       plus();
-               },
-               error: function(data){
-                       ok( false, "Ajax error JSON (POST, data obj 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)" );
+                               plus();
+                       },
+                       error: function(data){
+                               ok( false, "Ajax error JSON (GET, data obj callback)" );
+                               plus();
+                       }
+               });
 
-       //#7578
-       jQuery.ajax({
-               url: "data/jsonp.php",
-               dataType: "jsonp",
-               beforeSend: function(){
-                       strictEqual( this.cache, false, "cache must be false on JSON request" );
+               window.jsonpResults = function(data) {
+                       ok( data.data, "JSON results returned (GET, custom callback function)" );
+                       window.jsonpResults = undefined;
                        plus();
-                       return false;
-               }
-       });
-});
-
-test("jQuery.ajax() - JSONP - Custom JSONP Callback", function() {
-       expect(1);
-       stop();
-
-       window.jsonpResults = function(data) {
-               ok( data.data, "JSON results returned (GET, custom callback function)" );
-               window.jsonpResults = undefined;
-               start();
-       };
-
-       jQuery.ajax({
-               url: "data/jsonp.php",
-               dataType: "jsonp",
-               jsonpCallback: "jsonpResults"
-       });
-});
-
-test("jQuery.ajax() - JSONP, Remote", function() {
-       expect(4);
+               };
 
-       var count = 0;
-       function plus(){ if ( ++count == 4 ) start(); }
+               jQuery.ajax({
+                       url: "data/jsonp.php",
+                       dataType: "jsonp",
+                       crossDomain: crossDomain,
+                       jsonpCallback: "jsonpResults",
+                       success: function(data){
+                               ok( data.data, "JSON results returned (GET, custom callback name)" );
+                               plus();
+                       },
+                       error: function(data){
+                               ok( false, "Ajax error JSON (GET, custom callback name)" );
+                               plus();
+                       }
+               });
 
-       var base = window.location.href.replace(/[^\/]*$/, "");
+               jQuery.ajax({
+                       type: "POST",
+                       url: "data/jsonp.php",
+                       dataType: "jsonp",
+                       crossDomain: crossDomain,
+                       success: function(data){
+                               ok( data.data, "JSON results returned (POST, no callback)" );
+                               plus();
+                       },
+                       error: function(data){
+                               ok( false, "Ajax error JSON (GET, data obj callback)" );
+                               plus();
+                       }
+               });
 
-       stop();
+               jQuery.ajax({
+                       type: "POST",
+                       url: "data/jsonp.php",
+                       data: "callback=?",
+                       dataType: "jsonp",
+                       crossDomain: crossDomain,
+                       success: function(data){
+                               ok( data.data, "JSON results returned (POST, data callback)" );
+                               plus();
+                       },
+                       error: function(data){
+                               ok( false, "Ajax error JSON (POST, data callback)" );
+                               plus();
+                       }
+               });
 
-       jQuery.ajax({
-               url: base + "data/jsonp.php",
-               dataType: "jsonp",
-               success: function(data){
-                       ok( data.data, "JSON results returned (GET, no callback)" );
-                       plus();
-               },
-               error: function(data){
-                       ok( false, "Ajax error JSON (GET, no callback)" );
-                       plus();
-               }
-       });
+               jQuery.ajax({
+                       type: "POST",
+                       url: "data/jsonp.php",
+                       jsonp: "callback",
+                       dataType: "jsonp",
+                       crossDomain: crossDomain,
+                       success: function(data){
+                               ok( data.data, "JSON results returned (POST, data obj callback)" );
+                               plus();
+                       },
+                       error: function(data){
+                               ok( false, "Ajax error JSON (POST, data obj callback)" );
+                               plus();
+                       }
+               });
 
-       jQuery.ajax({
-               url: base + "data/jsonp.php?callback=?",
-               dataType: "jsonp",
-               success: function(data){
-                       ok( data.data, "JSON results returned (GET, url callback)" );
-                       plus();
-               },
-               error: function(data){
-                       ok( false, "Ajax error JSON (GET, url callback)" );
-                       plus();
-               }
-       });
+               //#7578
+               jQuery.ajax({
+                       url: "data/jsonp.php",
+                       dataType: "jsonp",
+                       crossDomain: crossDomain,
+                       beforeSend: function(){
+                               strictEqual( this.cache, false, "cache must be false on JSON request" );
+                               plus();
+                               return false;
+                       }
+               });
 
-       jQuery.ajax({
-               url: base + "data/jsonp.php",
-               dataType: "jsonp",
-               data: "callback=?",
-               success: function(data){
-                       ok( data.data, "JSON results returned (GET, data callback)" );
-                       plus();
-               },
-               error: function(data){
-                       ok( false, "Ajax error JSON (GET, data callback)" );
-                       plus();
-               }
-       });
+               jQuery.ajax({
+                       url: "data/jsonp.php?callback=XXX",
+                       dataType: "jsonp",
+                       jsonp: false,
+                       jsonpCallback: "XXX",
+                       crossDomain: crossDomain,
+                       beforeSend: function() {
+                               console.log( this.url );
+                       },
+                       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();
+                       }
+               });
 
-       jQuery.ajax({
-               url: base + "data/jsonp.php",
-               dataType: "jsonp",
-               jsonp: "callback",
-               success: function(data){
-                       ok( data.data, "JSON results returned (GET, data obj callback)" );
-                       plus();
-               },
-               error: function(data){
-                       ok( false, "Ajax error JSON (GET, data obj callback)" );
-                       plus();
-               }
        });
 });