Fixed #2046 by forcing the dataType to 'html' in the .load() function.

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

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 84d3518..c231673 100644 (file)
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -317,6 +317,19 @@ test("load('url selector')", function() {
        });
 });
 
+test("load(String, Function) with ajaxSetup on dataType json, see #2046", function() {
+       expect(1);
+       stop();
+       $.ajaxSetup({ dataType: "json" });
+       $("#first").ajaxComplete(function (e, xml, s) {
+               equals( s.dataType, "html", "Verify the load() dataType was html" );
+               $("#first").unbind("ajaxComplete");
+               $.ajaxSetup({ dataType: "" });
+               start();
+       });
+       $('#first').load("data/test3.html");
+});
+
 test("load(String, Function) - simple: inject text into DOM", function() {
        expect(2);
        stop();
@@ -332,15 +345,15 @@ test("load(String, Function) - check scripts", function() {
        window.testFoo = undefined;
        window.foobar = null;
        var verifyEvaluation = function() {
-         equals( foobar, "bar", 'Check if script src was evaluated after load' );
-         equals( $('#ap').html(), 'bar', 'Check if script evaluation has modified DOM');
-         start();
+               equals( foobar, "bar", 'Check if script src was evaluated after load' );
+               equals( $('#ap').html(), 'bar', 'Check if script evaluation has modified DOM');
+                start();
        };
        $('#first').load(url('data/test.html'), function() {
-         ok( $('#first').html().match(/^html text/), 'Check content after loading html' );
-         equals( $('#foo').html(), 'foo', 'Check if script evaluation has modified DOM');
-         equals( testFoo, "foo", 'Check if script was evaluated after load' );
-         setTimeout(verifyEvaluation, 600);
+               ok( $('#first').html().match(/^html text/), 'Check content after loading html' );
+               equals( $('#foo').html(), 'foo', 'Check if script evaluation has modified DOM');
+               equals( testFoo, "foo", 'Check if script was evaluated after load' );
+               setTimeout(verifyEvaluation, 600);
        });
 });
 
@@ -349,9 +362,9 @@ test("load(String, Function) - check file with only a script tag", function() {
        stop();
        testFoo = undefined;
        $('#first').load(url('data/test2.html'), function() {
-         ok( $('#foo').html() == 'foo', 'Check if script evaluation has modified DOM');
-         ok( testFoo == "foo", 'Check if script was evaluated after load' );
-         start();
+               ok( $('#foo').html() == 'foo', 'Check if script evaluation has modified DOM');
+               ok( testFoo == "foo", 'Check if script was evaluated after load' );
+               start();
        });
 });
 
@@ -372,6 +385,7 @@ test("$.get(String, Hash, Function) - parse xml and use text() on nodes", functi
 test("$.getScript(String, Function) - with callback", function() {
        expect(2);
        stop();
+       window.foobar = null;
        $.getScript(url("data/test.js"), function() {
                equals( foobar, "bar", 'Check if script was evaluated' );
                setTimeout(start, 100);
@@ -398,6 +412,10 @@ test("$.ajax() - JSONP, Local", function() {
                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();
                }
        });
 
@@ -407,6 +425,10 @@ test("$.ajax() - JSONP, Local", function() {
                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();
                }
        });
 
@@ -417,6 +439,10 @@ test("$.ajax() - JSONP, Local", function() {
                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();
                }
        });
 
@@ -427,6 +453,10 @@ test("$.ajax() - JSONP, Local", function() {
                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();
                }
        });
 
@@ -437,6 +467,10 @@ test("$.ajax() - JSONP, Local", function() {
                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();
                }
        });
 
@@ -448,6 +482,10 @@ test("$.ajax() - JSONP, Local", function() {
                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();
                }
        });
 
@@ -459,6 +497,10 @@ test("$.ajax() - JSONP, Local", function() {
                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();
                }
        });
 });
@@ -479,6 +521,10 @@ test("$.ajax() - JSONP, Remote", function() {
                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();
                }
        });
 
@@ -488,6 +534,10 @@ test("$.ajax() - JSONP, Remote", function() {
                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();
                }
        });
 
@@ -498,6 +548,10 @@ test("$.ajax() - JSONP, Remote", function() {
                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();
                }
        });
 
@@ -508,6 +562,10 @@ test("$.ajax() - JSONP, Remote", function() {
                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();
                }
        });
 });
@@ -519,6 +577,46 @@ test("$.ajax() - script, Remote", function() {
 
        stop();
 
+       window.foobar = null;
+       $.ajax({
+               url: base + "data/test.js",
+               dataType: "script",
+               success: function(data){
+                       ok( foobar, "Script results returned (GET, no callback)" );
+                       start();
+               }
+       });
+});
+
+test("$.ajax() - script, Remote with POST", function() {
+       expect(3);
+
+       var base = window.location.href.replace(/\?.*$/, "");
+
+       stop();
+
+       window.foobar = null;
+       $.ajax({
+               url: base + "data/test.js",
+               type: "POST",
+               dataType: "script",
+               success: function(data, status){
+                       ok( foobar, "Script results returned (GET, no callback)" );
+                       equals( status, "success", "Script results returned (GET, no callback)" );
+                       start();
+               }
+       });
+});
+
+test("$.ajax() - script, Remote with scheme-less URL", function() {
+       expect(2);
+
+       var base = window.location.href.replace(/\?.*$/, "");
+       base = base.replace(/^.*?\/\//, "//");
+
+       stop();
+
+       window.foobar = null;
        $.ajax({
                url: base + "data/test.js",
                dataType: "script",