Skip to content

Commit 228ab3d

Browse files
jaubourgjaubourg
committed
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.
1 parent 3ab2634 commit 228ab3d

38 files changed

Lines changed: 828 additions & 1301 deletions

‎test/.jshintrc‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,15 @@
4141
"ajaxTest": true,
4242
"testIframe": true,
4343
"testIframeWithCallback": true,
44+
"createComplexHTML": true,
4445
"createDashboardXML": true,
46+
"createWithFriesXML": true,
4547
"createXMLFragment": true,
4648
"moduleTeardown": true,
49+
"testBar": true,
4750
"testFoo": true,
48-
"url": true,
51+
"url": true,
52+
"service": true,
4953
"t": true,
5054
"q": true,
5155
"amdDefined": true,

‎test/data/ajax/echo/index.php‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?php
2+
3+
$requestArray = "REQUEST";
4+
5+
if ( isset( $_REQUEST["requestArray"] ) ) {
6+
$requestArray = $_REQUEST["requestArray"];
7+
}
8+
9+
$requestArray =& ${"_$requestArray"};
10+
11+
$response = array(
12+
"status" => "200",
13+
"statusText" => "",
14+
"contentType" => "text/plain",
15+
"content" => "",
16+
"callback" => "",
17+
"delay" => 0
18+
);
19+
20+
foreach( $response as $field => &$value ) {
21+
if ( isset( $requestArray[ $field ] ) ) {
22+
$value = $requestArray[ $field ];
23+
}
24+
}
25+
26+
if ( is_array( $response["content"] ) ) {
27+
$response["content"] = http_build_query( $response["content"] );
28+
}
29+
30+
if ( !$response["callback"] && preg_match( '/index.php\/([^\/\?&]+)/', $_SERVER["REQUEST_URI"], $match ) ) {
31+
$response["callback"] = $match[ 1 ];
32+
}
33+
34+
header("HTTP/1.1 $response[status] $response[statusText]");
35+
header("Content-Type: $response[contentType]");
36+
37+
if ( $response["delay"] ) {
38+
sleep( $response["delay"] );
39+
}
40+
41+
echo $response["callback"]
42+
? "$response[callback](" . json_encode("$response[content]") . ");"
43+
: "$response[content]";

‎test/data/ajax/headers/cache/index.php‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?php
2+
$headers = array(
3+
4+
"If-Modified-Since" => array(
5+
"request" => "HTTP_IF_MODIFIED_SINCE",
6+
"response" => "Last-Modified",
7+
),
8+
"If-None-Match" => array(
9+
"request" => "HTTP_IF_NONE_MATCH",
10+
"response" => "Etag",
11+
),
12+
13+
);
14+
15+
$header = $_REQUEST["header"];
16+
$value = $_REQUEST["value"];
17+
18+
if ( $header === "If-None-Match" ) {
19+
$value = md5( $value );
20+
}
21+
22+
$headers = $headers[ $header ];
23+
24+
$requestHeader = isset( $_SERVER[ $headers["request"] ] ) ? stripslashes($_SERVER[ $headers["request"] ]) : false;
25+
if ( $requestHeader === $value ) {
26+
header("HTTP/1.0 304 Not Modified");
27+
} else {
28+
header("$headers[response]: $value");
29+
echo $requestHeader ? "OK: $value": "FAIL";
30+
}

‎test/data/ajax/headers/request/index.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?php
2+
3+
$headers = array();
4+
5+
foreach( $_SERVER as $key => $value ) {
6+
$key = str_replace( "_" , "-" , substr($key,0,5) == "HTTP_" ? substr($key,5) : $key );
7+
$headers[ $key ] = $value;
8+
}
9+
10+
foreach( explode( "," , $_GET["headers"] ) as $key ) {
11+
echo "$key: " . @$headers[ strtoupper( $key ) ] . "\n";
12+
}

‎test/data/ajax/headers/response/index.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?php
2+
3+
foreach( $_REQUEST as $header => $value ) {
4+
@header("$header: $value");
5+
}

‎test/data/atom+xml.php‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎test/data/badcall.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎test/data/badjson.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎test/data/cleanScript.html‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎test/data/dashboard.xml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)