Simplified headers tests: removed multiline headers (support is far too servers ...

diff --git a/test/data/headers.php b/test/data/headers.php
index 598cadcde00f40052810894498523af453ceb887..f2c21c0ccffcd316cd578a800aa7433fd7c20c94 100644 (file)
--- a/test/data/headers.php
+++ b/test/data/headers.php
@@ -1,5 +1,20 @@
 <?php
 
-header( "Multiple-Line: Hello\n World" );
-header( "Multiple-Multiple-Line: Hello\n Beautiful\n\t World" );
-header( "Single-Line: Hello World" );
\ No newline at end of file
+header( "Sample-Header: Hello World" );
+
+$headers = array();
+
+foreach( $_SERVER as $key => $value ) { 
+       
+       if ( substr( $key , 0 , 5 ) == "HTTP_" ) { 
+               
+               $key = str_replace( "_" , "-" , substr( $key , 5) );
+               $headers[ $key ] = $value;
+
+       }
+       
+} 
+
+foreach( explode( "_" , $_GET[ "keys" ] ) as $key ) {
+       echo "$key: " . $headers[ strtoupper( $key ) ] . "\n";
+}

diff --git a/test/data/headers.request.php b/test/data/headers.request.php
deleted file mode 100644 (file)
index 4725093..0000000
--- a/test/data/headers.request.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-$headers = array();
-
-foreach( $_SERVER as $key => $value ) { 
-       
-       if ( substr( $key , 0 , 5 ) == "HTTP_" ) { 
-               
-               $key = str_replace( " " , "-" , ucwords( strtolower( str_replace( "_" , " " , substr( $key , 5) ) ) ) );
-               $headers[ $key ] = $value;
-
-       }
-       
-} 
-
-foreach( explode( "_" , $_GET[ "keys" ] ) as $key ) {
-       echo "$key: " . $headers[ str_replace( " " , "-" , ucwords( strtolower( str_replace( "-" , " " , $key ) ) ) ) ] . "\n";
-}

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index b11342f3f61a1df616dab412b3a726256f69d39f..35c030247e1baf5c19da21997ac30af9b5a01563 100644 (file)
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -280,8 +280,7 @@ 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();
        
@@ -291,18 +290,15 @@ test(".ajax() - headers" , function() {
                OthEr: "something else"
                },
                list = [],
-               i,
-               sync = 2;
+               i;
                
        for( i in requestHeaders ) {
                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 , ": " , requestHeaders[ i ] , "\n" );
@@ -310,23 +306,8 @@ test(".ajax() - headers" , function() {
                        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"); }
        });