Changeset 35350 for trunk/tests/phpunit/includes/testcase.php

Timestamp:

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

Author:

johnbillion

Message:

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

Fixes #34394

File:

• trunk/tests/phpunit/includes/testcase.php (modified) (2 diffs)

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.
      *