Changeset 35350

Timestamp:

10/21/2015 11:51:45 PM (11 years ago)

Author:

johnbillion

Message:

Initialise $_SERVER['SERVER_NAME'] during the test bootstrap to avoid individual tests having to do it.

Fixes #34394

Location:

trunk/tests/phpunit

Files:

• includes/bootstrap.php (modified) (1 diff)
• includes/install.php (modified) (1 diff)
• includes/testcase.php (modified) (2 diffs)
• tests/comment.php (modified) (1 diff)
• tests/mail.php (modified) (1 diff)
• wp-mail-real-test.php (modified) (1 diff)

trunk/tests/phpunit/includes/bootstrap.php

@@ -38 +38 @@
 $_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';
 

trunk/tests/phpunit/includes/install.php

@@ -16 +16 @@
 $_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';
 

trunk/tests/phpunit/includes/testcase.php

@@ -111 +111 @@
                 $this->expectDeprecated();
                 add_filter( 'wp_die_handler', array( $this, 'get_wp_die_handler' ) );
-
-                add_filter( 'wp_mail', array( $this, 'set_wp_mail_globals' ) );
         }
 
@@ -670 +668 @@
 
         /**
-         * When `wp_mail()` is called, make sure `$_SERVER['SERVER_NAME']` is faked.
-         *
-         * @since 4.3.0
-         *
-         * @param array $args `wp_mail()` arguments.
-         * @return array $args
-         */
-        public function set_wp_mail_globals( $args ) {
-                if ( ! isset( $_SERVER['SERVER_NAME'] ) ) {
-                        $_SERVER['SERVER_NAME'] = 'example.com';
-                        add_action( 'phpmailer_init', array( $this, 'tear_down_wp_mail_globals' ) );
-                }
-
-                return $args;
-        }
-
-        /**
-         * Tear down the faked `$_SERVER['SERVER_NAME']` global used in `wp_mail()`.
-         *
-         * @since 4.3.0
-         */
-        public function tear_down_wp_mail_globals() {
-                unset( $_SERVER['SERVER_NAME'] );
-        }
-
-        /**
          * Multisite-agnostic way to delete a user from the database.
          *

trunk/tests/phpunit/tests/comment.php

@@ -381 +381 @@
         public function setup_notify_comment(){
                 /**
-                 * Mock some server variables.
-                 */
-                $_SERVER['SERVER_NAME'] = 'phpunit.wordpress.dev';
-                $_SERVER['REMOTE_ADDR'] = '127.0.0.1';
-
-                /**
                  * Prevent flood alert from firing.
                  */

trunk/tests/phpunit/tests/mail.php

@@ -189 +189 @@
                 $message  = "Test Message";
                 $headers  = "From: ";
-                $expected = "From: WordPress <wordpress@example.com>";
+                $expected = "From: WordPress <wordpress@" . WP_TESTS_DOMAIN . ">";
 
                 wp_mail( $to, $subject, $message, $headers );

trunk/tests/phpunit/wp-mail-real-test.php

@@ -73 +73 @@
 $headers[] = "CC: {$cc}";
 
-$_SERVER['SERVER_NAME'] = 'example.com';
 wp_mail( $to, $subject, $message, $headers );