Fixed #2174 by removing the s.dataType == "json" check for possible cross domain...

[jquery.git] / test / unit / ajax.js

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index c231673..15c4ed7 100644 (file)
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -449,7 +449,7 @@ test("$.ajax() - JSONP, Local", function() {
        $.ajax({
                url: "data/jsonp.php",
                dataType: "jsonp",
-               data: { callback: "?" },
+               jsonp: "callback",
                success: function(data){
                        ok( data.data, "JSON results returned (GET, data obj callback)" );
                        plus();
@@ -492,7 +492,7 @@ test("$.ajax() - JSONP, Local", function() {
        $.ajax({
                type: "POST",
                url: "data/jsonp.php",
-               data: { callback: "?" },
+               jsonp: "callback",
                dataType: "jsonp",
                success: function(data){
                        ok( data.data, "JSON results returned (POST, data obj callback)" );
@@ -558,7 +558,7 @@ test("$.ajax() - JSONP, Remote", function() {
        $.ajax({
                url: base + "data/jsonp.php",
                dataType: "jsonp",
-               data: { callback: "?" },
+               jsonp: "callback",
                success: function(data){
                        ok( data.data, "JSON results returned (GET, data obj callback)" );
                        plus();
@@ -649,15 +649,15 @@ test("$.getJSON(String, Function) - JSON object", function() {
        });
 });
 
-test("$.getJSON(String, Function) - Remote JSON object with assignment", function() {
+test("$.getJSON(String, Function) - JSON object with absolute url to local content", function() {
        expect(2);
 
        var base = window.location.href.replace(/\?.*$/, "");
 
        stop();
-       $.getJSON(base + "data/json_assigned_obj.js", function() {
-         ok( typeof json_assigned_obj == "object", 'Check JSON loaded' );
-         equals( json_assigned_obj.test, "worked", 'Check JSON obj.test' );
+       $.getJSON(url(base + "data/json.php"), function(json) {
+         ok( json.data.lang == 'en', 'Check JSON: lang' );
+         ok( json.data.length == 25, 'Check JSON: length' );
          start();
        });
 });