Changeset 36715

Timestamp:

02/25/2016 09:59:56 PM (9 years ago)

Author:

johnbillion

Message:

Unify the initialisation of $_SERVER variables during test bootstrap. This abstracts the (re-)initialisation into a function that can be used inside of tests too, before assertions are performed.

See #35954

Location:

trunk/tests/phpunit/includes

Files:

• bootstrap.php (modified) (3 diffs)
• functions.php (modified) (1 diff)
• install.php (modified) (1 diff)

trunk/tests/phpunit/includes/bootstrap.php

@@ -23 +23 @@
 }
 require_once $config_file_path;
+require_once dirname( __FILE__ ) . '/functions.php';
+
+tests_reset_SERVER();
 
 define( 'WP_TESTS_TABLE_PREFIX', $table_prefix );
@@ -37 +40 @@
 define( 'WP_MEMORY_LIMIT', -1 );
 define( 'WP_MAX_MEMORY_LIMIT', -1 );
-
-$_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
-$_SERVER['HTTP_HOST'] = WP_TESTS_DOMAIN;
-$_SERVER['SERVER_NAME'] = WP_TESTS_DOMAIN;
-$_SERVER['REQUEST_METHOD'] = 'GET';
-$_SERVER['REMOTE_ADDR'] = '127.0.0.1';
 
 $PHP_SELF = $GLOBALS['PHP_SELF'] = $_SERVER['PHP_SELF'] = '/index.php';
@@ -68 +65 @@
 }
 unset( $multisite );
-
-require_once dirname( __FILE__ ) . '/functions.php';
 
 $GLOBALS['_wp_die_disabled'] = false;

trunk/tests/phpunit/includes/functions.php

@@ -1 +1 @@
 <?php
+
+/**
+ * Resets various `$_SERVER` variables that can get altered during tests.
+ */
+function tests_reset_SERVER() {
+    $_SERVER['HTTP_HOST']       = WP_TESTS_DOMAIN;
+    $_SERVER['REMOTE_ADDR']     = '127.0.0.1';
+    $_SERVER['REQUEST_METHOD']  = 'GET';
+    $_SERVER['SERVER_NAME']     = WP_TESTS_DOMAIN;
+    $_SERVER['SERVER_PORT']     = '80';
+    $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
+
+    unset( $_SERVER['HTTP_REFERER'] );
+    unset( $_SERVER['HTTPS'] );
+}
 
 // For adding hooks before loading WP

trunk/tests/phpunit/includes/install.php

@@ -14 +14 @@
 require_once dirname( __FILE__ ) . '/functions.php';
 
-$_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
-$_SERVER['HTTP_HOST'] = WP_TESTS_DOMAIN;
-$_SERVER['SERVER_NAME'] = WP_TESTS_DOMAIN;
-$_SERVER['REQUEST_METHOD'] = 'GET';
-$_SERVER['REMOTE_ADDR'] = '127.0.0.1';
+tests_reset_SERVER();
 
 $PHP_SELF = $GLOBALS['PHP_SELF'] = $_SERVER['PHP_SELF'] = '/index.php';