<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][7664] trunk/tests: Always fake $_SERVER['SERVER_NAME'] when invoking wp_mail() during tests</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/7664">7664</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-12-12 20:43:28 +0000 (Thu, 12 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Always fake $_SERVER['SERVER_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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsincludestestcasephp">trunk/tests/includes/testcase.php</a></li>
<li><a href="#trunkteststestcasesfriendsclassbpfriendsfriendshipphp">trunk/tests/testcases/friends/class-bp-friends-friendship.php</a></li>
<li><a href="#trunkteststestcasesgroupsfunctionsphp">trunk/tests/testcases/groups/functions.php</a></li>
<li><a href="#trunkteststestcasesmemberstemplatephp">trunk/tests/testcases/members/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsincludestestcasephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/includes/testcase.php (7663 => 7664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/includes/testcase.php 2013-12-10 02:02:12 UTC (rev 7663)
+++ trunk/tests/includes/testcase.php 2013-12-12 20:43:28 UTC (rev 7664)
</span><span class="lines">@@ -11,6 +11,7 @@
</span><span class="cx"> class BP_UnitTestCase extends WP_UnitTestCase {
</span><span class="cx">
</span><span class="cx"> protected $temp_has_bp_moderate = array();
</span><ins>+ protected $cached_SERVER_NAME = null;
</ins><span class="cx">
</span><span class="cx"> public function setUp() {
</span><span class="cx"> parent::setUp();
</span><span class="lines">@@ -23,6 +24,10 @@
</span><span class="cx"> global $wpdb;
</span><span class="cx"> $wpdb->query( "TRUNCATE TABLE {$wpdb->users}" );
</span><span class="cx">
</span><ins>+ // 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' ) );
+
</ins><span class="cx"> $this->factory = new BP_UnitTest_Factory;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -304,14 +309,29 @@
</span><span class="cx"> /**
</span><span class="cx"> * Set up globals necessary to avoid errors when using wp_mail()
</span><span class="cx"> */
</span><del>- public function setUp_wp_mail() {
</del><ins>+ public function setUp_wp_mail( $args ) {
+ if ( isset( $_SERVER['SERVER_NAME'] ) ) {
+ $this->cached_SERVER_NAME = $_SERVER['SERVER_NAME'];
+ }
+
</ins><span class="cx"> $_SERVER['SERVER_NAME'] = 'example.com';
</span><ins>+
+ // passthrough
+ return $args;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Tear down globals set up in setUp_wp_mail()
</span><span class="cx"> */
</span><del>- public function tearDown_wp_mail() {
- unset( $_SERVER['SERVER_NAME'] );
</del><ins>+ 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;
</ins><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkteststestcasesfriendsclassbpfriendsfriendshipphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/testcases/friends/class-bp-friends-friendship.php (7663 => 7664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/friends/class-bp-friends-friendship.php 2013-12-10 02:02:12 UTC (rev 7663)
+++ trunk/tests/testcases/friends/class-bp-friends-friendship.php 2013-12-12 20:43:28 UTC (rev 7664)
</span><span class="lines">@@ -92,11 +92,7 @@
</span><span class="cx"> public function test_check_is_friend_pending() {
</span><span class="cx"> $u1 = $this->create_user();
</span><span class="cx"> $u2 = $this->create_user();
</span><del>-
- $this->setUp_wp_mail();
</del><span class="cx"> friends_add_friend( $u1, $u2, false );
</span><del>- $this->tearDown_wp_mail();
-
</del><span class="cx"> $this->assertEquals( 'pending', BP_Friends_Friendship::check_is_friend( $u1, $u2 ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -106,11 +102,7 @@
</span><span class="cx"> public function test_check_is_friend_awaiting_response() {
</span><span class="cx"> $u1 = $this->create_user();
</span><span class="cx"> $u2 = $this->create_user();
</span><del>-
- $this->setUp_wp_mail();
</del><span class="cx"> friends_add_friend( $u1, $u2, false );
</span><del>- $this->tearDown_wp_mail();
-
</del><span class="cx"> $this->assertEquals( 'awaiting_response', BP_Friends_Friendship::check_is_friend( $u2, $u1 ) );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkteststestcasesgroupsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/testcases/groups/functions.php (7663 => 7664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/groups/functions.php 2013-12-10 02:02:12 UTC (rev 7663)
+++ trunk/tests/testcases/groups/functions.php 2013-12-12 20:43:28 UTC (rev 7664)
</span><span class="lines">@@ -226,10 +226,8 @@
</span><span class="cx"> $u2 = $this->create_user();
</span><span class="cx"> $g = $this->factory->group->create( array( 'creator_id' => $u1 ) );
</span><span class="cx">
</span><del>- $this->setUp_wp_mail();
</del><span class="cx"> groups_send_membership_request( $u2, $g );
</span><span class="cx"> groups_accept_membership_request( 0, $u2, $g );
</span><del>- $this->tearDown_wp_mail();
</del><span class="cx">
</span><span class="cx"> $this->assertEquals( 2, groups_get_groupmeta( $g, 'total_member_count' ) );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkteststestcasesmemberstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/testcases/members/template.php (7663 => 7664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/members/template.php 2013-12-10 02:02:12 UTC (rev 7663)
+++ trunk/tests/testcases/members/template.php 2013-12-12 20:43:28 UTC (rev 7664)
</span><span class="lines">@@ -44,9 +44,7 @@
</span><span class="cx"> $u1 = $this->create_user();
</span><span class="cx"> $u2 = $this->create_user();
</span><span class="cx">
</span><del>- $this->setUp_wp_mail();
</del><span class="cx"> friends_add_friend( $u1, $u2 );
</span><del>- $this->tearDown_wp_mail();
</del><span class="cx">
</span><span class="cx"> $old_user = get_current_user_id();
</span><span class="cx"> $this->set_current_user( $u2 );
</span></span></pre>
</div>
</div>
</body>
</html>