Changeset 7664

Timestamp:

12/12/2013 08:43:28 PM (11 years ago)

Author:

boonebgorges

Message:

Always fake $_SERVERSERVER_NAME? when invoking wp_mail() during tests

This is a blanket fix for PHP errors that otherwise arise when calling any BP
function that results in an email notification being sent.

Location:

trunk/tests

Files:

• includes/testcase.php (modified) (4 diffs)
• testcases/friends/class-bp-friends-friendship.php (modified) (2 diffs)
• testcases/groups/functions.php (modified) (1 diff)
• testcases/members/template.php (modified) (1 diff)

trunk/tests/includes/testcase.php

@@ -12 +12 @@
 
     protected $temp_has_bp_moderate = array();
+    protected $cached_SERVER_NAME = null;
 
     public function setUp() {
@@ -23 +24 @@
         global $wpdb;
         $wpdb->query( "TRUNCATE TABLE {$wpdb->users}" );
+
+        // 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;
@@ -305 +310 @@
      * Set up globals necessary to avoid errors when using wp_mail()
      */
-    public function setUp_wp_mail() {
+    public function setUp_wp_mail( $args ) {
+        if ( isset( $_SERVER['SERVER_NAME'] ) ) {
+            $this->cached_SERVER_NAME = $_SERVER['SERVER_NAME'];
+        }
+
         $_SERVER['SERVER_NAME'] = 'example.com';
+
+        // passthrough
+        return $args;
     }
 
@@ -312 +324 @@
      * Tear down globals set up in setUp_wp_mail()
      */
-    public function tearDown_wp_mail() {
-        unset( $_SERVER['SERVER_NAME'] );
+    public function tearDown_wp_mail( $args ) {
+        if ( ! empty( $this->cached_SERVER_NAME ) ) {
+            $_SERVER['SERVER_NAME'] = $this->cached_SERVER_NAME;
+            unset( $this->cached_SERVER_NAME );
+        } else {
+            unset( $_SERVER['SERVER_NAME'] );
+        }
+
+        // passthrough
+        return $args;
     }
 }

trunk/tests/testcases/friends/class-bp-friends-friendship.php

@@ -93 +93 @@
         $u1 = $this->create_user();
         $u2 = $this->create_user();
-
-        $this->setUp_wp_mail();
         friends_add_friend( $u1, $u2, false );
-        $this->tearDown_wp_mail();
-
         $this->assertEquals( 'pending', BP_Friends_Friendship::check_is_friend( $u1, $u2 ) );
     }
@@ -107 +103 @@
         $u1 = $this->create_user();
         $u2 = $this->create_user();
-
-        $this->setUp_wp_mail();
         friends_add_friend( $u1, $u2, false );
-        $this->tearDown_wp_mail();
-
         $this->assertEquals( 'awaiting_response', BP_Friends_Friendship::check_is_friend( $u2, $u1 ) );
     }

trunk/tests/testcases/groups/functions.php

@@ -227 +227 @@
         $g = $this->factory->group->create( array( 'creator_id' => $u1 ) );
 
-        $this->setUp_wp_mail();
         groups_send_membership_request( $u2, $g );
         groups_accept_membership_request( 0, $u2, $g );
-        $this->tearDown_wp_mail();
 
         $this->assertEquals( 2, groups_get_groupmeta( $g, 'total_member_count' ) );

trunk/tests/testcases/members/template.php

@@ -45 +45 @@
         $u2 = $this->create_user();
 
-        $this->setUp_wp_mail();
         friends_add_friend( $u1, $u2 );
-        $this->tearDown_wp_mail();
 
         $old_user = get_current_user_id();