ajax test: Removed test for extending with null.

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

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index c231673..fc2ab9e 100644 (file)
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -136,6 +136,27 @@ test("$.ajax - beforeSend", function() {
        });
 });
 
+test("$.ajax - beforeSend, cancel request (#2688)", function() {
+       expect(2);
+       var request = $.ajax({
+               url: url("data/name.html"), 
+               beforeSend: function() {
+                       ok( true, "beforeSend got called, canceling" );
+                       return false;
+               },
+               success: function() {
+                       ok( false, "request didn't get canceled" );
+               },
+               complete: function() {
+                       ok( false, "request didn't get canceled" );
+               },
+               error: function() {
+                       ok( false, "request didn't get canceled" );
+               }
+       });
+       ok( request === false, "canceled request must return false instead of XMLHttpRequest instance" );
+});
+
 var foobar;
 
 test("$.ajax - dataType html", function() {
@@ -146,8 +167,8 @@ test("$.ajax - dataType html", function() {
        testFoo = undefined;
 
        var verifyEvaluation = function() {
-         ok( testFoo == "foo", 'Check if script was evaluated for datatype html' );
-         ok( foobar == "bar", 'Check if script src was evaluated for datatype html' );
+         equals( testFoo, "foo", 'Check if script was evaluated for datatype html' );
+         equals( foobar, "bar", 'Check if script src was evaluated for datatype html' );
          start();
        };
 
@@ -277,19 +298,15 @@ test("ajax cache", function () {
 });
 
 test("global ajaxSettings", function() {
-       expect(3);
+       expect(2);
 
        var tmp = jQuery.extend({}, jQuery.ajaxSettings);
-    var orig = { url: "data/with_fries.xml", data: null };
+    var orig = { url: "data/with_fries.xml" };
        var t;
 
        $.ajaxSetup({ data: {foo: 'bar', bar: 'BAR'} });
 
     t = jQuery.extend({}, orig);
-    $.ajax(t);
-       ok( t.url.indexOf('foo') > -1 && t.url.indexOf('bar') > -1, "Check extending null" );
-
-    t = jQuery.extend({}, orig);
        t.data = {};
     $.ajax(t);
        ok( t.url.indexOf('foo') > -1 && t.url.indexOf('bar') > -1, "Check extending {}" );
@@ -362,8 +379,8 @@ 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' );
+               equals( $('#foo').html(), 'foo', 'Check if script evaluation has modified DOM');
+               equals( testFoo, "foo", 'Check if script was evaluated after load' );
                start();
        });
 });
@@ -449,7 +466,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 +509,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 +575,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();
@@ -631,10 +648,10 @@ test("$.getJSON(String, Hash, Function) - JSON array", function() {
        expect(4);
        stop();
        $.getJSON(url("data/json.php"), {json: "array"}, function(json) {
-         ok( json[0].name == 'John', 'Check JSON: first, name' );
-         ok( json[0].age == 21, 'Check JSON: first, age' );
-         ok( json[1].name == 'Peter', 'Check JSON: second, name' );
-         ok( json[1].age == 25, 'Check JSON: second, age' );
+         equals( json[0].name, 'John', 'Check JSON: first, name' );
+         equals( json[0].age, 21, 'Check JSON: first, age' );
+         equals( json[1].name, 'Peter', 'Check JSON: second, name' );
+         equals( json[1].age, 25, 'Check JSON: second, age' );
          start();
        });
 });
@@ -643,21 +660,21 @@ test("$.getJSON(String, Function) - JSON object", function() {
        expect(2);
        stop();
        $.getJSON(url("data/json.php"), function(json) {
-         ok( json.data.lang == 'en', 'Check JSON: lang' );
-         ok( json.data.length == 25, 'Check JSON: length' );
+         equals( json.data.lang, 'en', 'Check JSON: lang' );
+         equals( json.data.length, 25, 'Check JSON: length' );
          start();
        });
 });
 
-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) {
+         equals( json.data.lang, 'en', 'Check JSON: lang' );
+         equals( json.data.length, 25, 'Check JSON: length' );
          start();
        });
 });
@@ -667,15 +684,15 @@ test("$.post(String, Hash, Function) - simple with xml", function() {
        stop();
        $.post(url("data/name.php"), {xml: "5-2"}, function(xml){
          $('math', xml).each(function() {
-                   ok( $('calculation', this).text() == '5-2', 'Check for XML' );
-                   ok( $('result', this).text() == '3', 'Check for XML' );
+                   equals( $('calculation', this).text(), '5-2', 'Check for XML' );
+                   equals( $('result', this).text(), '3', 'Check for XML' );
                 });
        });
 
        $.post(url("data/name.php?xml=5-2"), {}, function(xml){
          $('math', xml).each(function() {
-                   ok( $('calculation', this).text() == '5-2', 'Check for XML' );
-                   ok( $('result', this).text() == '3', 'Check for XML' );
+                   equals( $('calculation', this).text(), '5-2', 'Check for XML' );
+                   equals( $('result', this).text(), '3', 'Check for XML' );
                 });
          start();
        });
@@ -744,7 +761,7 @@ test("$.ajax - simple get", function() {
          type: "GET",
          url: url("data/name.php?name=foo"),
          success: function(msg){
-           ok( msg == 'bar', 'Check for GET' );
+           equals( msg, 'bar', 'Check for GET' );
            start();
          }
        });
@@ -758,7 +775,7 @@ test("$.ajax - simple post", function() {
          url: url("data/name.php"),
          data: "name=peter",
          success: function(msg){
-           ok( msg == 'pan', 'Check for POST' );
+           equals( msg, 'pan', 'Check for POST' );
            start();
          }
        });
@@ -770,7 +787,7 @@ test("ajaxSetup()", function() {
        $.ajaxSetup({
                url: url("data/name.php?name=foo"),
                success: function(msg){
-               ok( msg == 'bar', 'Check for GET' );
+               equals( msg, 'bar', 'Check for GET' );
                        start();
                }
        });
@@ -790,6 +807,22 @@ test("custom timeout does not set error message when timeout occurs, see #970",
        });
 });
 
+test("data option: evaluate function values (#2806)", function() {
+       stop();
+       $.ajax({
+               url: "data/echoQuery.php",
+               data: {
+                       key: function() {
+                               return "value";
+                       }
+               },
+               success: function(result) {
+                       equals( result, "key=value" );
+                       start();
+               }
+       })
+});
+
 }
 
 //}