Added missing commas.
[jquery.git] / test / unit / ajax.js
index beec2c5..9713506 100644 (file)
@@ -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 : 6 );
-
-       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(!supports, "error"); },
-                       complete: function(){ ok(true, "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);
 });
 
@@ -409,136 +371,6 @@ test("jQuery.ajax() - abort", function() {
        equals( xhr.readyState, 0, "XHR readyState indicates successful abortion" );
 });
 
-test("jQuery.ajax() - readyState (success)", function() {
-       expect( 1 );
-
-       jQuery.ajaxSetup({ timeout: 0 });
-
-       stop();
-
-       var control = "";
-
-       setTimeout(function(){
-               jQuery.ajax({
-                       url: url("data/name.html"),
-                       beforeSend: function( xhr ) {
-                               xhr.onreadystatechange = function() {
-                                       control += xhr.readyState;
-                               }
-                       },
-                       complete: function(){
-                               setTimeout( function() {
-                                       equals( control , "1234" , "onreadystatechange was properly called" );
-                               }, 13 );
-                               start();
-                       }
-               });
-       }, 13);
-});
-
-test("jQuery.ajax() - readyState (abort)", function() {
-       expect( 2 );
-
-       jQuery.ajaxSetup({ timeout: 0 });
-
-       stop();
-
-       var control = "";
-
-       setTimeout(function(){
-
-               jQuery.ajaxSetup({ timeout: 500 });
-
-               jQuery.ajax({
-                       url: url("data/name.php?wait=5"),
-                       beforeSend: function( xhr ) {
-                               xhr.onreadystatechange = function() {
-                                       control += xhr.readyState;
-                               }
-                       },
-                       complete: function( xhr ){
-                               setTimeout( function() {
-                                       equals( control , "14" , "onreadystatechange was properly called" );
-                                       equals( xhr.readyState, 0 , "readyState is 0" );
-                               }, 13 );
-                               start();
-                       }
-               });
-       }, 13);
-});
-
-test("jQuery.xhr() - reuse", function() {
-       expect( 15 );
-
-       jQuery.ajaxSetup({ timeout: 0 });
-
-       stop();
-
-       var number = 0;
-
-       setTimeout(function(){
-               jQuery('#foo').ajaxStart(function(){
-                       ok( true, "ajaxStart" );
-               }).ajaxStop(function(){
-                       ok( true, "ajaxStop" );
-                       start();
-               }).ajaxSend(function(){
-                       number++;
-                       ok( true, "ajaxSend (" + number +")" );
-               }).ajaxComplete(function(){
-                       ok( true, "ajaxComplete (" + number +")" );
-               }).ajaxError(function(){
-                       ok( false, "ajaxError (" + number +")" );
-               }).ajaxSuccess(function(){
-                       ok( true, "ajaxSuccess (" + number +")" );
-               });
-
-               jQuery.ajax({
-                       url: url("data/name.html"),
-                       beforeSend: function(){ ok(true, "beforeSend (1)"); },
-                       success: function( _1 , _2 , xhr ){
-                               ok(true, "success (1)");
-                               xhr.complete(function() {
-                                       ok(true, "complete (1bis)");
-                               });
-                               xhr.open( "GET", url("data/name.html") );
-                               xhr.success( function(){ ok(true, "beforeSend (2)"); } )
-                               xhr.send( null, {
-                                       success: function(){ ok(true, "success (2)"); },
-                                       error: function(){ ok(false, "error (2)"); },
-                                       complete: function(){ ok(true, "complete (2)"); }
-                               } );
-                       },
-                       error: function(){ ok(false, "error (1)"); },
-                       complete: function(){ ok(true, "complete (1)"); }
-               });
-       }, 13);
-});
-
-test("jQuery.xhr() - early binding", function() {
-       expect( 2 );
-
-       jQuery.ajaxSetup({ timeout: 0 });
-
-       stop();
-
-       jQuery.xhr()
-               .success( function(){ ok(true, "success"); } )
-               .error( function(){ ok(false, "error"); } )
-               .complete( function(){ ok(true, "complete"); start(); } )
-               .open( "GET", url("data/name.html") )
-               .send();
-});
-
-test("jQuery.xhr() - get native implementation", function() {
-
-       var xhr = jQuery.xhr(true);
-
-       ok( xhr.readyState !== undefined , "implements XMLHttpRequest" );
-       ok( ! jQuery.isFunction( xhr.success ) , "is not jQuery's abstraction" );
-
-});
-
 test("Ajax events with context", function() {
        expect(14);
 
@@ -606,7 +438,7 @@ test("jQuery.ajax context modification", function() {
 
        stop();
 
-       var obj = {}
+       var obj = {};
 
        jQuery.ajax({
                url: url("data/name.html"),
@@ -653,34 +485,6 @@ test("jQuery.ajax() - disabled globals", function() {
        });
 });
 
-test("jQuery.xhr() - disabled globals through xhr.send(data , false)", function() {
-       expect( 2 );
-       stop();
-
-       jQuery('#foo').ajaxStart(function(){
-               ok( false, "ajaxStart" );
-       }).ajaxStop(function(){
-               ok( false, "ajaxStop" );
-       }).ajaxSend(function(){
-               ok( false, "ajaxSend" );
-       }).ajaxComplete(function(){
-               ok( false, "ajaxComplete" );
-       }).ajaxError(function(){
-               ok( false, "ajaxError" );
-       }).ajaxSuccess(function(){
-               ok( false, "ajaxSuccess" );
-       });
-
-       jQuery.xhr()
-               .success(function(){ ok(true, "success"); })
-               .error(function(){ ok(false, "error"); })
-               .complete(function(){
-                 ok(true, "complete");
-                 setTimeout(function(){ start(); }, 13);
-               })
-               .open("GET", url("data/name.html")).send(undefined, false);
-});
-
 test("jQuery.ajax - xml: non-namespace elements inside namespaced elements", function() {
        expect(3);
        stop();
@@ -707,6 +511,10 @@ test("jQuery.ajax - xml: non-namespace elements inside namespaced elements (over
                equals( jQuery("jsconf", resp).length, 1, 'jsconf in responseXML' );
                equals( jQuery("thing", resp).length, 2, 'things in responseXML' );
                start();
+         },
+         error: function(_1,_2,error) {
+               ok( false, error );
+               start();
          }
        });
 });
@@ -842,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();
@@ -1482,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' );
@@ -1714,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() {
@@ -1727,7 +1535,7 @@ test("data option: empty bodies for non-GET requests", function() {
                        equals( result, "" );
                        start();
                }
-       })
+       });
 });
 
 test("jQuery.ajax - If-Modified-Since support", function() {
@@ -1752,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();
                        },
@@ -1799,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();
                        },
@@ -1831,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();
+       }
 
 });