<!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>[25381] trunk/tests/phpunit/tests/mail.php: Avoid a notice and clean up setting/unsetting of globals by moving them into `setUp()` and `tearDown()` methods in `Tests_Mail`.</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://core.trac.wordpress.org/changeset/25381">25381</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2013-09-12 04:46:49 +0000 (Thu, 12 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Avoid a notice and clean up setting/unsetting of globals by moving them into `setUp()` and `tearDown()` methods in `Tests_Mail`.
See <a href="http://core.trac.wordpress.org/ticket/25282">#25282</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsmailphp">trunk/tests/phpunit/tests/mail.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsmailphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/mail.php (25380 => 25381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/mail.php 2013-09-12 04:40:13 UTC (rev 25380)
+++ trunk/tests/phpunit/tests/mail.php 2013-09-12 04:46:49 UTC (rev 25381)
</span><span class="lines">@@ -1,5 +1,4 @@
</span><span class="cx"> <?php
</span><del>-
</del><span class="cx"> /**
</span><span class="cx"> * @group pluggable
</span><span class="cx"> * @group mail
</span><span class="lines">@@ -7,8 +6,15 @@
</span><span class="cx"> class Tests_Mail extends WP_UnitTestCase {
</span><span class="cx"> function setUp() {
</span><span class="cx"> parent::setUp();
</span><ins>+ $_SERVER['SERVER_NAME'] = 'example.com';
+ unset( $GLOBALS['phpmailer']->mock_sent );
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ function tearDown() {
+ parent::tearDown();
+ unset( $_SERVER['SERVER_NAME'] );
+ }
+
</ins><span class="cx"> function test_wp_mail_custom_boundaries() {
</span><span class="cx"> $to = 'user@example.com';
</span><span class="cx"> $subject = 'Test email with custom boundaries';
</span><span class="lines">@@ -57,29 +63,23 @@
</span><span class="cx"> $body .= '------=_Part_4892_25692638.1192452070893--' . "\n";
</span><span class="cx"> $body .= "\n";
</span><span class="cx">
</span><del>- unset($GLOBALS['phpmailer']->mock_sent);
- $_SERVER['SERVER_NAME'] = 'example.com';
</del><span class="cx"> wp_mail($to, $subject, $body, $headers);
</span><span class="cx">
</span><span class="cx"> // We need some better assertions here but these catch the failure for now.
</span><span class="cx"> $this->assertEquals($body, $GLOBALS['phpmailer']->mock_sent[0]['body']);
</span><span class="cx"> $this->assertTrue(strpos($GLOBALS['phpmailer']->mock_sent[0]['header'], 'boundary="----=_Part_4892_25692638.1192452070893"') > 0);
</span><span class="cx"> $this->assertTrue(strpos($GLOBALS['phpmailer']->mock_sent[0]['header'], 'charset=') > 0);
</span><del>- unset( $_SERVER['SERVER_NAME'] );
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @ticket 15448
</span><span class="cx"> */
</span><span class="cx"> function test_wp_mail_plain_and_html() {
</span><del>-
</del><span class="cx"> $to = 'user@example.com';
</span><span class="cx"> $subject = 'Test email with plain text and html versions';
</span><span class="cx"> $messages = array( 'text/plain' => 'Here is some plain text.',
</span><span class="cx"> 'text/html' =>'<html><head></head><body>Here is the HTML ;-)<body></html>' );
</span><span class="cx">
</span><del>- unset($GLOBALS['phpmailer']->mock_sent);
- $_SERVER['SERVER_NAME'] = 'example.com';
</del><span class="cx"> wp_mail( $to, $subject, $messages );
</span><span class="cx">
</span><span class="cx"> preg_match( '/boundary="(.*)"/', $GLOBALS['phpmailer']->mock_sent[0]['header'], $matches);
</span><span class="lines">@@ -103,14 +103,12 @@
</span><span class="cx"> ';
</span><span class="cx"> // We need some better assertions here but these test the behaviour for now.
</span><span class="cx"> $this->assertEquals($body, $GLOBALS['phpmailer']->mock_sent[0]['body']);
</span><del>- unset( $_SERVER['SERVER_NAME'] );
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @ticket 17305
</span><span class="cx"> */
</span><span class="cx"> function test_wp_mail_rfc2822_addresses() {
</span><del>-
</del><span class="cx"> $to = "Name <address@tld.com>";
</span><span class="cx"> $from = "Another Name <another_address@different-tld.com>";
</span><span class="cx"> $cc = "The Carbon Guy <cc@cc.com>";
</span><span class="lines">@@ -121,8 +119,6 @@
</span><span class="cx"> $headers[] = "CC: {$cc}";
</span><span class="cx"> $headers[] = "BCC: {$bcc}";
</span><span class="cx">
</span><del>- unset($GLOBALS['phpmailer']->mock_sent);
- $_SERVER['SERVER_NAME'] = 'example.com';
</del><span class="cx"> wp_mail( $to, $subject, $message, $headers );
</span><span class="cx">
</span><span class="cx"> // WordPress 3.2 and later correctly split the address into the two parts and send them seperately to PHPMailer
</span><span class="lines">@@ -133,22 +129,17 @@
</span><span class="cx"> $this->assertEquals('The Carbon Guy', $GLOBALS['phpmailer']->mock_sent[0]['cc'][0][1]);
</span><span class="cx"> $this->assertEquals('bcc@bcc.com', $GLOBALS['phpmailer']->mock_sent[0]['bcc'][0][0]);
</span><span class="cx"> $this->assertEquals('The Blind Carbon Guy', $GLOBALS['phpmailer']->mock_sent[0]['bcc'][0][1]);
</span><del>-
</del><span class="cx"> $this->assertEquals($message . "\n", $GLOBALS['phpmailer']->mock_sent[0]['body']);
</span><del>- unset( $_SERVER['SERVER_NAME'] );
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @ticket 17305
</span><span class="cx"> */
</span><span class="cx"> function test_wp_mail_multiple_rfc2822_to_addresses() {
</span><del>-
</del><span class="cx"> $to = "Name <address@tld.com>, Another Name <another_address@different-tld.com>";
</span><span class="cx"> $subject = "RFC2822 Testing";
</span><span class="cx"> $message = "My RFC822 Test Message";
</span><span class="cx">
</span><del>- unset($GLOBALS['phpmailer']->mock_sent);
- $_SERVER['SERVER_NAME'] = 'example.com';
</del><span class="cx"> wp_mail( $to, $subject, $message );
</span><span class="cx">
</span><span class="cx"> // WordPress 3.2 and later correctly split the address into the two parts and send them seperately to PHPMailer
</span><span class="lines">@@ -157,9 +148,7 @@
</span><span class="cx"> $this->assertEquals('Name', $GLOBALS['phpmailer']->mock_sent[0]['to'][0][1]);
</span><span class="cx"> $this->assertEquals('another_address@different-tld.com', $GLOBALS['phpmailer']->mock_sent[0]['to'][1][0]);
</span><span class="cx"> $this->assertEquals('Another Name', $GLOBALS['phpmailer']->mock_sent[0]['to'][1][1]);
</span><del>-
</del><span class="cx"> $this->assertEquals($message . "\n", $GLOBALS['phpmailer']->mock_sent[0]['body']);
</span><del>- unset( $_SERVER['SERVER_NAME'] );
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_wp_mail_multiple_to_addresses() {
</span><span class="lines">@@ -167,33 +156,25 @@
</span><span class="cx"> $subject = "RFC2822 Testing";
</span><span class="cx"> $message = "My RFC822 Test Message";
</span><span class="cx">
</span><del>- unset($GLOBALS['phpmailer']->mock_sent);
- $_SERVER['SERVER_NAME'] = 'example.com';
</del><span class="cx"> wp_mail( $to, $subject, $message );
</span><span class="cx">
</span><span class="cx"> $this->assertEquals('address@tld.com', $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0]);
</span><span class="cx"> $this->assertEquals('another_address@different-tld.com', $GLOBALS['phpmailer']->mock_sent[0]['to'][1][0]);
</span><span class="cx"> $this->assertEquals($message . "\n", $GLOBALS['phpmailer']->mock_sent[0]['body']);
</span><del>- unset( $_SERVER['SERVER_NAME'] );
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @ticket 18463
</span><span class="cx"> */
</span><span class="cx"> function test_wp_mail_to_address_no_name() {
</span><del>-
</del><span class="cx"> $to = "<address@tld.com>";
</span><span class="cx"> $subject = "RFC2822 Testing";
</span><span class="cx"> $message = "My RFC822 Test Message";
</span><span class="cx">
</span><del>- unset($GLOBALS['phpmailer']->mock_sent);
- $_SERVER['SERVER_NAME'] = 'example.com';
</del><span class="cx"> wp_mail( $to, $subject, $message );
</span><span class="cx">
</span><span class="cx"> $this->assertEquals('address@tld.com', $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0]);
</span><del>-
</del><span class="cx"> $this->assertEquals($message . "\n", $GLOBALS['phpmailer']->mock_sent[0]['body']);
</span><del>- unset( $_SERVER['SERVER_NAME'] );
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>