X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fajax.js;h=335c2ac4d310348eda37d17a602b9a4d63940c2a;hb=a43a5ca9cf79afcd662df5b9110d7ccba45c0b53;hp=74c6545c5cb9ce6f7d4fb3e5b44a8f192c55d432;hpb=f6e173437e9f94cd4e713e556c6fc8ca68be8384;p=jquery.git

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 74c6545..335c2ac 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -344,7 +344,7 @@ test(".ajax() - retry with jQuery.ajax( this )", function() {
 
 test(".ajax() - headers" , function() {
 
-	expect( 2 );
+	expect( 4 );
 
 	stop();
 
@@ -376,8 +376,14 @@ test(".ajax() - headers" , function() {
 			tmp.push(  "ajax-send: test\n" );
 			tmp = tmp.join( "" );
 
-			equals( data , tmp , "Headers were sent" );
-			equals( xhr.getResponseHeader( "Sample-Header" ) , "Hello World" , "Sample header received" );
+			strictEqual( data , tmp , "Headers were sent" );
+			strictEqual( xhr.getResponseHeader( "Sample-Header" ) , "Hello World" , "Sample header received" );
+			if ( jQuery.browser.mozilla ) {
+				ok( true, "Firefox doesn't support empty headers" );
+			} else {
+				strictEqual( xhr.getResponseHeader( "Empty-Header" ) , "" , "Empty header received" );
+			}
+			strictEqual( xhr.getResponseHeader( "Sample-Header2" ) , "Hello World 2" , "Second sample header received" );
 		},
 		error: function(){ ok(false, "error"); }
 
@@ -922,7 +928,7 @@ test("serialize()", function() {
 });
 
 test("jQuery.param()", function() {
-	expect(25);
+	expect(24);
 
 	equals( !jQuery.ajaxSettings.traditional, true, "traditional flag, falsy by default" );
 
@@ -960,8 +966,6 @@ test("jQuery.param()", function() {
 	// #7945
 	equals( jQuery.param({"jquery": "1.4.2"}), "jquery=1.4.2", "Check that object with a jQuery property get serialized correctly" );
 
-	equals( jQuery.param(jQuery("#form :input")), "action=Test&text2=Test&radio1=on&radio2=on&check=on&=on&hidden=&foo%5Bbar%5D=&name=name&search=search&button=&=foobar&select1=&select2=3&select3=1&select4=1&select5=3", "Make sure jQuery objects are properly serialized");
-
 	jQuery.ajaxSetup({ traditional: true });
 
 	var params = {foo:"bar", baz:42, quux:"All your base are belong to us"};
@@ -1198,6 +1202,21 @@ test("load(String, String, Function)", function() {
 	});
 });
 
+test("jQuery.get(String, Function) - data in ajaxSettings (#8277)", function() {
+	expect(1);
+	stop();
+	jQuery.ajaxSetup({
+		data: "helloworld"
+	});
+	jQuery.get(url('data/echoQuery.php'), function(data) {
+		ok( /helloworld$/.test( data ), 'Data from ajaxSettings was used');
+		jQuery.ajaxSetup({
+			data: null
+		});
+		start();
+	});
+});
+
 test("jQuery.get(String, Hash, Function) - parse xml and use text() on nodes", function() {
 	expect(2);
 	stop();