Added missing commas.

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

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 1a1ec33..9713506 100644 (file)
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -70,44 +70,6 @@ test("jQuery.ajax() - success callbacks - (url, options) syntax", function() {
        }, 13);
 });
 
-test("jQuery.ajax() - success/error callbacks (remote)", function() {
-
-       var supports = jQuery.support.cors;
-       
-       expect( supports ? 9 : 4 );
-
-       jQuery.ajaxSetup({ timeout: 0 });
-
-       stop();
-
-       setTimeout(function(){
-               jQuery('#foo').ajaxStart(function(){
-                       ok( true, "ajaxStart" );
-               }).ajaxStop(function(){
-                       ok( true, "ajaxStop" );
-                       start();
-               }).ajaxSend(function(){
-                       ok( supports , "ajaxSend" );
-               }).ajaxComplete(function(){
-                       ok( true, "ajaxComplete" );
-               }).ajaxError(function(){
-                       ok( ! supports, "ajaxError" );
-               }).ajaxSuccess(function(){
-                       ok( supports, "ajaxSuccess" );
-               });
-
-               jQuery.ajax({
-                       // JULIAN TODO: Get an url especially for jQuery
-                       url: "http://rockstarapps.com/test.php",
-                       dataType: "text",
-                       beforeSend: function(){ ok(supports, "beforeSend"); },
-                       success: function( val ){ ok(supports, "success"); ok(supports && val.length, "data received"); },
-                       error: function(_ , a , b ){ ok(false, "error"); },
-                       complete: function(){ ok(supports, "complete"); }
-               });
-       }, 13);
-});
-
 test("jQuery.ajax() - success callbacks (late binding)", function() {
        expect( 8 );
 
@@ -173,7 +135,7 @@ test("jQuery.ajax() - success callbacks (oncomplete binding)", function() {
                                .error(function(){ ok(false, "error"); })
                                .complete(function(){ start(); });
                        }
-               })
+               });
        }, 13);
 });
 
@@ -211,7 +173,7 @@ test("jQuery.ajax() - success callbacks (very late binding)", function() {
                                        .complete(function(){ start(); });
                                },100);
                        }
-               })
+               });
        }, 13);
 });
 
@@ -476,7 +438,7 @@ test("jQuery.ajax context modification", function() {
 
        stop();
 
-       var obj = {}
+       var obj = {};
 
        jQuery.ajax({
                url: url("data/name.html"),
@@ -688,20 +650,20 @@ test("serialize()", function() {
                'Check input serialization as query string');
 
        equals( jQuery('#testForm').serialize(),
-               'T3=%3F%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=',
+               'T3=%3F%0D%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=',
                'Check form serialization as query string');
 
        equals( jQuery('#testForm :input').serialize(),
-               'T3=%3F%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=',
+               'T3=%3F%0D%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=',
                'Check input serialization as query string');
 
        equals( jQuery('#form, #testForm').serialize(),
-               "action=Test&radio2=on&check=on&hidden=&foo%5Bbar%5D=&name=name&search=search&email=dave%40jquery.com&number=43&select1=&select2=3&select3=1&select3=2&select5=3&T3=%3F%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=",
+               "action=Test&radio2=on&check=on&hidden=&foo%5Bbar%5D=&name=name&search=search&email=dave%40jquery.com&number=43&select1=&select2=3&select3=1&select3=2&select5=3&T3=%3F%0D%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=",
                'Multiple form serialization as query string');
 
   /* Temporarily disabled. Opera 10 has problems with form serialization.
        equals( jQuery('#form, #testForm :input').serialize(),
-               "action=Test&radio2=on&check=on&hidden=&foo%5Bbar%5D=&name=name&search=search&email=dave%40jquery.com&number=43&select1=&select2=3&select3=1&select3=2&T3=%3F%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=",
+               "action=Test&radio2=on&check=on&hidden=&foo%5Bbar%5D=&name=name&search=search&email=dave%40jquery.com&number=43&select1=&select2=3&select3=1&select3=2&T3=%3F%0D%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=",
                'Mixed form/input serialization as query string');
        */
        jQuery("#html5email, #html5number").remove();
@@ -1328,12 +1290,12 @@ test("jQuery.ajax() - json by content-type disabled with options", function() {
        jQuery.ajax({
                url: url("data/json.php"),
                data: { header: "json", json: "array" },
-               autoDataType: {
+               contents: {
                        json: false
                },
                success: function( text ) {
                        equals( typeof text , "string" , "json wasn't auto-determined" );
-                       var json = this.dataConverters["text json"]( text );
+                       var json = jQuery.parseJSON( text );
                        ok( json.length >= 2, "Check length");
                        equals( json[0].name, 'John', 'Check JSON: first, name' );
                        equals( json[0].age, 21, 'Check JSON: first, age' );
@@ -1560,7 +1522,7 @@ test("data option: evaluate function values (#2806)", function() {
                        equals( result, "key=value" );
                        start();
                }
-       })
+       });
 });
 
 test("data option: empty bodies for non-GET requests", function() {
@@ -1573,7 +1535,7 @@ test("data option: empty bodies for non-GET requests", function() {
                        equals( result, "" );
                        start();
                }
-       })
+       });
 });
 
 test("jQuery.ajax - If-Modified-Since support", function() {
@@ -1598,7 +1560,7 @@ test("jQuery.ajax - If-Modified-Since support", function() {
                                                ok(true, "Opera is incapable of doing .setRequestHeader('If-Modified-Since').");
                                        } else {
                                                equals(status, "notmodified");
-                                               ok(data == null, "response body should be empty")
+                                               ok(data == null, "response body should be empty");
                                        }
                                        start();
                        },
@@ -1645,7 +1607,7 @@ test("jQuery.ajax - Etag support", function() {
                                                ok(true, "Opera is incapable of doing .setRequestHeader('If-None-Match').");
                                        } else {
                                                equals(status, "notmodified");
-                                               ok(data == null, "response body should be empty")
+                                               ok(data == null, "response body should be empty");
                                        }
                                        start();
                        },
@@ -1677,19 +1639,25 @@ test("jQuery ajax - failing cross-domain", function() {
 
        var i = 2;
 
-       jQuery.ajax({
-               url: 'http://somewebsitethatdoesnotexist.com',
+       if ( jQuery.ajax({
+               url: 'http://somewebsitethatdoesnotexist-67864863574657654.com',
                success: function(){ ok( false , "success" ); },
                error: function(xhr,_,e){ ok( true , "file not found: " + xhr.status + " => " + e ); },
                complete: function() { if ( ! --i ) start(); }
-       });
+       }) === false ) {
+               ok( true , "no transport" );
+               if ( ! --i ) start();
+       }
 
-       jQuery.ajax({
+       if ( jQuery.ajax({
                url: 'http://www.google.com',
                success: function(){ ok( false , "success" ); },
                error: function(xhr,_,e){ ok( true , "access denied: " + xhr.status + " => " + e ); },
                complete: function() { if ( ! --i ) start(); }
-       });
+       }) === false ) {
+               ok( true , "no transport" );
+               if ( ! --i ) start();
+       }
 
 });