X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fajax.js;h=c01edc04406c1b45827027bed6ab8f06d411f30b;hb=9b9d270e3d697d8129147d03807c4e37b23120b7;hp=87430c93a28cede36a018269531875d5bac5a927;hpb=317888464def39e245fac49d463f283c6be16d53;p=jquery.git

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 87430c9..c01edc0 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -281,10 +281,39 @@ test("jQuery.ajax() - error callbacks", function() {
 test(".ajax() - headers" , function() {
 
 	// No multiple line headers in IE
-	expect( jQuery.browser.msie ? 2 : 4 );
+	expect( jQuery.browser.msie ? 3 : 5 );
 	
 	stop();
 	
+	var requestHeaders = {
+		Simple: "value",
+		"Something-Else": "other value",
+		Other: "something else"
+		},
+		list = [],
+		i,
+		sync = 2;
+		
+	for( i in requestHeaders ) {
+		list.push( i.toLowerCase() );
+	}
+	
+	list = list.join( "_" );
+	
+	jQuery.ajax(url("data/headers.request.php?keys="+list), {
+		headers: requestHeaders,
+		success: function( data ) {
+			var tmp = [];
+			for ( i in requestHeaders ) {
+				tmp.push( i.toLowerCase() , ": " , 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 ){
@@ -297,11 +326,11 @@ test(".ajax() - headers" , function() {
 				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" );
 			}
-			start();
+			if ( ! --sync ) start();
 		},
 		error: function(){ ok(false, "error"); }
 	});
-	
+		
 });
 
 test(".ajax() - hash", function() {
@@ -1813,23 +1842,6 @@ test("jQuery.ajax - Etag support", function() {
 	});
 });
 
-test("jQuery ajax - headers", function() {
-
-	stop();
-	
-	jQuery.ajax(url("data/css.php?wait=1&id=headers"), {
-		headers: {
-			testKey: "testValue"
-		},
-		beforeSend: function( xhr ) {
-			equals( xhr.getRequestHeader("testKey") , "testValue" , "Headers properly set" );
-			setTimeout( start , 13 );
-			return false;
-		}
-	});
-	
-});
-
 test("jQuery ajax - failing cross-domain", function() {
 
 	expect( 2 );