X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fajax.js;h=35c030247e1baf5c19da21997ac30af9b5a01563;hb=4424bda377336342ce04ab5299bf1ce624cdb7b1;hp=d0f2e435cde61714777e9a58e2ef9e3473d6f6ca;hpb=9fa9a570762c2b6dc6131b28b13547964d91be3e;p=jquery.git diff --git a/test/unit/ajax.js b/test/unit/ajax.js index d0f2e43..35c0302 100644 --- a/test/unit/ajax.js +++ b/test/unit/ajax.js @@ -280,53 +280,34 @@ test("jQuery.ajax() - error callbacks", function() { test(".ajax() - headers" , function() { - // No multiple line headers in IE - expect( jQuery.browser.msie ? 3 : 5 ); + expect( 2 ); stop(); var requestHeaders = { - Simple: "value", - "Something-Else": "other value", - Other: "something else" + siMPle: "value", + "SometHing-elsE": "other value", + OthEr: "something else" }, list = [], - i, - sync = 2; + i; for( i in requestHeaders ) { - list.push( i.toLowerCase() ); + list.push( i ); } - list = list.join( "_" ); - - jQuery.ajax(url("data/headers.request.php?keys="+list), { + jQuery.ajax(url("data/headers.php?keys="+list.join( "_" ) ), { headers: requestHeaders, - success: function( data ) { + success: function( data , _ , xhr ) { var tmp = []; for ( i in requestHeaders ) { - tmp.push( i.toLowerCase() , ": " , requestHeaders[ i ] , "\n" ); + tmp.push( i , ": " , requestHeaders[ i ] , "\n" ); } tmp = tmp.join( "" ); equals( data , tmp , "Headers were sent" ); - if ( ! --sync ) start(); - } - }); - - jQuery.ajax({ - url: url("data/headers.php"), - success: function( _1 , _2 , xhr ){ - ok(true, "success"); - equals( xhr.getResponseHeader( "Single-Line" ) , "Hello World" , "Single line header" ); - // No multiple line headers in IE - if ( ! jQuery.browser.msie ) { - // Each browser has its own unique way to deal with spaces after line breaks - // in multiple line headers, so we use regular expressions - ok( /^Hello\s+World$/.test( xhr.getResponseHeader( "Multiple-Line" ) ) , "Multiple line" ); - ok( /^Hello\s+Beautiful\s+World$/.test( xhr.getResponseHeader( "Multiple-Multiple-Line" ) ) , "Multiple multiple line" ); - } - if ( ! --sync ) start(); + equals( xhr.getResponseHeader( "Sample-Header" ) , "Hello World" , "Sample header received" ); + start(); }, error: function(){ ok(false, "error"); } });