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

Timestamp:

11/14/2014 02:01:22 PM (10 years ago)

Author:

boonebgorges

Message:

Move automated test mail handlers to setUpBeforeClass().

In many cases, creating data in BuddyPress (such as friendships) will generate
an email notification. In order to avoid errors when generating fixtures, our
automated suite places some filters on 'wp_mail'. However, these filters were
previously added during setUp(), which is too late for test classes that
create fixtures during setUpBeforeClass().

See #6009.

File:

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

trunk/tests/phpunit/includes/testcase.php

@@ -12 +12 @@
 
     protected $temp_has_bp_moderate = array();
-    protected $cached_SERVER_NAME = null;
+    protected static $cached_SERVER_NAME = null;
+
+    public static function setUpBeforeClass() {
+        // Fake WP mail globals, to avoid errors
+        add_filter( 'wp_mail', array( 'BP_UnitTestCase', 'setUp_wp_mail' ) );
+        add_filter( 'wp_mail_from', array( 'BP_UnitTestCase', 'tearDown_wp_mail' ) );
+    }
 
     public function setUp() {
@@ -30 +36 @@
         }
 
-        // Fake WP mail globals, to avoid errors
-        add_filter( 'wp_mail', array( $this, 'setUp_wp_mail' ) );
-        add_filter( 'wp_mail_from', array( $this, 'tearDown_wp_mail' ) );
 
         $this->factory = new BP_UnitTest_Factory;
@@ -403 +406 @@
      * Set up globals necessary to avoid errors when using wp_mail()
      */
-    public function setUp_wp_mail( $args ) {
+    public static function setUp_wp_mail( $args ) {
         if ( isset( $_SERVER['SERVER_NAME'] ) ) {
-            $this->cached_SERVER_NAME = $_SERVER['SERVER_NAME'];
+            self::$cached_SERVER_NAME = $_SERVER['SERVER_NAME'];
         }
 
@@ -417 +420 @@
      * Tear down globals set up in setUp_wp_mail()
      */
-    public function tearDown_wp_mail( $args ) {
-        if ( ! empty( $this->cached_SERVER_NAME ) ) {
-            $_SERVER['SERVER_NAME'] = $this->cached_SERVER_NAME;
+    public static function tearDown_wp_mail( $args ) {
+        if ( ! empty( self::$cached_SERVER_NAME ) ) {
+            $_SERVER['SERVER_NAME'] = self::$cached_SERVER_NAME;
             unset( $this->cached_SERVER_NAME );
         } else {