Organizes the php scripts used for testing better, so that the whole …

…logic of a unit, server-side and client-side, is contained within the unit itself. Nearly all ajax unit tests take advantage of the new 'framework'. Lots of files got deleted because they became redundant or weren't used anymore.
jquery · Dec 4, 2012 · 228ab3d · Krinkle · Dec 5, 2012 · Krinkle
1 parent 3ab2634
commit 228ab3d
Show file tree

Hide file tree

Showing 38 changed files with 828 additions and 1,301 deletions.
diff --git a/test/.jshintrc b/test/.jshintrc
@@ -41,11 +41,15 @@
     "ajaxTest": true,
     "testIframe": true,
     "testIframeWithCallback": true,
+	"createComplexHTML": true,
     "createDashboardXML": true,
+	"createWithFriesXML": true,
     "createXMLFragment": true,
     "moduleTeardown": true,
+    "testBar": true,
     "testFoo": true,
-    "url": true,
+	"url": true,
+	"service": true,
     "t": true,
     "q": true,
     "amdDefined": true,

diff --git a/test/data/ajax/echo/index.php b/test/data/ajax/echo/index.php
@@ -0,0 +1,43 @@
+<?php
+
+	$requestArray = "REQUEST";
+
+	if ( isset( $_REQUEST["requestArray"] ) ) {
+		$requestArray = $_REQUEST["requestArray"];
+	}
+
+	$requestArray =& ${"_$requestArray"};
+
+	$response = array(
+		"status" => "200",
+		"statusText" => "",
+		"contentType" => "text/plain",
+		"content" => "",
+		"callback" => "",
+		"delay" => 0
+	);
+
+	foreach( $response as $field => &$value ) {
+		if ( isset( $requestArray[ $field ] ) ) {
+			$value = $requestArray[ $field ];
+		}
+	}
+
+	if ( is_array( $response["content"] ) ) {
+		$response["content"] = http_build_query( $response["content"] );
+	}
+
+	if ( !$response["callback"] && preg_match( '/index.php\/([^\/\?&]+)/', $_SERVER["REQUEST_URI"], $match ) ) {
+		$response["callback"] = $match[ 1 ];
+	}
+
+	header("HTTP/1.1 $response[status] $response[statusText]");
+	header("Content-Type: $response[contentType]");
+
+	if ( $response["delay"] ) {
+		sleep( $response["delay"] );
+	}
+
+	echo $response["callback"]
+		? "$response[callback](" . json_encode("$response[content]") . ");"
+		: "$response[content]";
diff --git a/test/data/ajax/headers/cache/index.php b/test/data/ajax/headers/cache/index.php
@@ -0,0 +1,30 @@
+<?php
+$headers = array(
+
+	"If-Modified-Since" => array(
+		"request" => "HTTP_IF_MODIFIED_SINCE",
+		"response" => "Last-Modified",
+	),
+	"If-None-Match" => array(
+		"request" => "HTTP_IF_NONE_MATCH",
+		"response" => "Etag",
+	),	
+
+);
+
+$header = $_REQUEST["header"];
+$value = $_REQUEST["value"];
+
+if ( $header === "If-None-Match" ) {
+	$value = md5( $value );
+}
+
+$headers = $headers[ $header ];
+
+$requestHeader = isset( $_SERVER[ $headers["request"] ] ) ? stripslashes($_SERVER[ $headers["request"] ]) : false;
+if ( $requestHeader === $value ) {
+	header("HTTP/1.0 304 Not Modified");
+} else {
+	header("$headers[response]: $value");
+	echo $requestHeader ? "OK: $value": "FAIL";
+}
diff --git a/test/data/ajax/headers/request/index.php b/test/data/ajax/headers/request/index.php
@@ -0,0 +1,12 @@
+<?php
+
+$headers = array();
+
+foreach( $_SERVER as $key => $value ) {
+	$key = str_replace( "_" , "-" , substr($key,0,5) == "HTTP_" ? substr($key,5) : $key );
+	$headers[ $key ] = $value;
+}
+
+foreach( explode( "," , $_GET["headers"] ) as $key ) {
+	echo "$key: " . @$headers[ strtoupper( $key ) ] . "\n";
+}
diff --git a/test/data/ajax/headers/response/index.php b/test/data/ajax/headers/response/index.php
@@ -0,0 +1,5 @@
+<?php
+
+foreach( $_REQUEST as $header => $value ) {
+	@header("$header: $value");
+}
diff --git a/test/data/atom+xml.php b/test/data/atom+xml.php
diff --git a/test/data/badcall.js b/test/data/badcall.js
diff --git a/test/data/badjson.js b/test/data/badjson.js
diff --git a/test/data/cleanScript.html b/test/data/cleanScript.html
diff --git a/test/data/dashboard.xml b/test/data/dashboard.xml
diff --git a/test/data/echoData.php b/test/data/echoData.php
diff --git a/test/data/echoQuery.php b/test/data/echoQuery.php
diff --git a/test/data/errorWithText.php b/test/data/errorWithText.php
diff --git a/test/data/etag.php b/test/data/etag.php
diff --git a/test/data/evalScript.php b/test/data/evalScript.php
diff --git a/test/data/headers.php b/test/data/headers.php
diff --git a/test/data/if_modified_since.php b/test/data/if_modified_since.php
diff --git a/test/data/json.php b/test/data/json.php
diff --git a/test/data/json_obj.js b/test/data/json_obj.js
diff --git a/test/data/jsonp.php b/test/data/jsonp.php
diff --git a/test/data/name.html b/test/data/name.html
diff --git a/test/data/name.php b/test/data/name.php
diff --git a/test/data/params_html.php b/test/data/params_html.php
diff --git a/test/data/script.php b/test/data/script.php
diff --git a/test/data/statusText.php b/test/data/statusText.php
diff --git a/test/data/test.html b/test/data/test.html
diff --git a/test/data/test.js b/test/data/test.js
diff --git a/test/data/test.php b/test/data/test.php
diff --git a/test/data/test2.html b/test/data/test2.html
diff --git a/test/data/test3.html b/test/data/test3.html