<!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>[Tests][1300] trunk: Re-implement the mock PHPMailer.</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/1300/tests">1300</a></dd>
<dt>Author</dt> <dd>SergeyBiryukov</dd>
<dt>Date</dt> <dd>2013-06-29 22:31:15 +0000 (Sat, 29 Jun 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Re-implement the mock PHPMailer. props ocean90. fixes <a href="http://core.trac.wordpress.org/ticket/24662">#24662</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkincludesbootstrapphp">trunk/includes/bootstrap.php</a></li>
<li><a href="#trunkincludesmockmailerphp">trunk/includes/mock-mailer.php</a></li>
<li><a href="#trunktestsmailphp">trunk/tests/mail.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkincludesbootstrapphp"></a>
<div class="modfile"><h4>Modified: trunk/includes/bootstrap.php (1299 => 1300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/includes/bootstrap.php 2013-06-29 13:58:06 UTC (rev 1299)
+++ trunk/includes/bootstrap.php 2013-06-29 22:31:15 UTC (rev 1300)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> global $table_prefix, $wp_embed, $wp_locale, $_wp_deprecated_widgets_callbacks, $wp_widget_factory;
</span><span class="cx">
</span><span class="cx"> // These are still needed
</span><del>-global $wpdb, $current_site, $current_blog, $wp_rewrite, $shortcode_tags, $wp;
</del><ins>+global $wpdb, $current_site, $current_blog, $wp_rewrite, $shortcode_tags, $wp, $phpmailer;
</ins><span class="cx">
</span><span class="cx"> if ( !is_readable( $config_file_path ) ) {
</span><span class="cx"> die( "ERROR: wp-tests-config.php is missing! Please use wp-tests-config-sample.php to create a config file.\n" );
</span><span class="lines">@@ -41,6 +41,10 @@
</span><span class="cx">
</span><span class="cx"> $multisite = (int) ( defined( 'WP_TESTS_MULTISITE') && WP_TESTS_MULTISITE );
</span><span class="cx">
</span><ins>+// Override the PHPMailer
+require_once( dirname( __FILE__ ) . '/mock-mailer.php' );
+$phpmailer = new MockPHPMailer();
+
</ins><span class="cx"> system( WP_PHP_BINARY . ' ' . escapeshellarg( dirname( __FILE__ ) . '/install.php' ) . ' ' . escapeshellarg( $config_file_path ) . ' ' . $multisite );
</span><span class="cx">
</span><span class="cx"> if ( $multisite ) {
</span></span></pre></div>
<a id="trunkincludesmockmailerphp"></a>
<div class="modfile"><h4>Modified: trunk/includes/mock-mailer.php (1299 => 1300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/includes/mock-mailer.php 2013-06-29 13:58:06 UTC (rev 1299)
+++ trunk/includes/mock-mailer.php 2013-06-29 22:31:15 UTC (rev 1300)
</span><span class="lines">@@ -1,41 +1,26 @@
</span><span class="cx"> <?php
</span><ins>+require_once( ABSPATH . '/wp-includes/class-phpmailer.php' );
</ins><span class="cx">
</span><del>-require_once(ABSPATH . '/wp-includes/class-phpmailer.php');
-
</del><span class="cx"> class MockPHPMailer extends PHPMailer {
</span><span class="cx"> var $mock_sent = array();
</span><span class="cx">
</span><span class="cx"> // override the Send function so it doesn't actually send anything
</span><span class="cx"> function Send() {
</span><del>- if ( (count($this->to) + count($this->cc) + count($this->bcc)) < 1 ) {
- $this->SetError( 'You must provide at least one recipient email address.' );
- return false;
- }
</del><ins>+ try {
+ if ( ! $this->PreSend() )
+ return false;
</ins><span class="cx">
</span><del>- // Set whether the message is multipart/alternative
- if( ! empty($this->AltBody) )
- $this->ContentType = 'multipart/alternative';
</del><ins>+ $this->mock_sent[] = array(
+ 'to' => $this->to,
+ 'cc' => $this->cc,
+ 'bcc' => $this->bcc,
+ 'header' => $this->MIMEHeader,
+ 'body' => $this->MIMEBody,
+ );
</ins><span class="cx">
</span><del>- $this->error_count = 0; // reset errors
- $this->SetMessageType();
- $header = $this->CreateHeader();
- $body = $this->CreateBody();
-
- if ( $body == '' ) {
- $this->SetError( 'Message body empty' );
</del><ins>+ return true;
+ } catch ( phpmailerException $e ) {
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
- $this->mock_sent[] = array(
- 'to' => $this->to,
- 'cc' => $this->cc,
- 'bcc' => $this->bcc,
- 'header' => $header,
- 'body' => $body,
- );
-
- return true;
- }
</del><ins>+ }
</ins><span class="cx"> }
</span><del>-
-?>
</del></span></pre></div>
<a id="trunktestsmailphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/mail.php (1299 => 1300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/mail.php 2013-06-29 13:58:06 UTC (rev 1299)
+++ trunk/tests/mail.php 2013-06-29 22:31:15 UTC (rev 1300)
</span><span class="lines">@@ -3,7 +3,6 @@
</span><span class="cx"> /**
</span><span class="cx"> * @group pluggable
</span><span class="cx"> * @group mail
</span><del>- * @ticket UT47
</del><span class="cx"> */
</span><span class="cx"> class Tests_Mail extends WP_UnitTestCase {
</span><span class="cx"> function setUp() {
</span><span class="lines">@@ -65,7 +64,7 @@
</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><del>- $this->assertTrue(strpos($GLOBALS['phpmailer']->mock_sent[0]['header'], 'charset=""') > 0);
</del><ins>+ $this->assertTrue(strpos($GLOBALS['phpmailer']->mock_sent[0]['header'], 'charset=') > 0);
</ins><span class="cx"> unset( $_SERVER['SERVER_NAME'] );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>