<!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][10541] trunk/tests/phpunit/testcases/core/class-bp-email.php: Unit Tests, Emails: don't un-hook core email actions for unit 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/10541">10541</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/10541","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>djpaul</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-02-07 12:01:24 +0000 (Sun, 07 Feb 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Unit Tests, Emails: don't un-hook core email actions for unit tests.
The missing default properties cause confusion when writing new tests, and the absence could cause a badly-written test to pass.
The change updates the affected unit tests to correctly handle the default properties.
See <a href="http://buddypress.trac.wordpress.org/ticket/6592">#6592</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestcasescoreclassbpemailphp">trunk/tests/phpunit/testcases/core/class-bp-email.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestcasescoreclassbpemailphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/core/class-bp-email.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/core/class-bp-email.php 2016-02-07 11:10:17 UTC (rev 10540)
+++ trunk/tests/phpunit/testcases/core/class-bp-email.php 2016-02-07 12:01:24 UTC (rev 10541)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,17 +19,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'display_name' => 'Unit Test2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_email' => 'test2@example.com',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- remove_filter( 'bp_email_get_headers', 'bp_email_set_default_headers', 6, 4 );
- remove_filter( 'bp_email_get_tokens', 'bp_email_set_default_tokens', 6, 4 );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function tearDown() {
- add_filter( 'bp_email_get_tokens', 'bp_email_set_default_tokens', 6, 4 );
- add_filter( 'bp_email_get_headers', 'bp_email_set_default_headers', 6, 4 );
- parent::tearDown();
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> public function test_valid_subject() {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = 'test';
</span><span class="cx" style="display: block; padding: 0 10px"> $email = new BP_Email( 'activity-at-message' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,28 +58,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_tokens() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $original = array( 'test1' => 'hello', 'test2' => 'world' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $email = new BP_Email( 'activity-at-message' );
+ $default_tokens = $email->get_tokens();
+ $tokens = array( 'test1' => 'hello', 'test2' => 'world' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $email = new BP_Email( 'activity-at-message' );
- $email->set_tokens( $original );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $email->set_tokens( $tokens );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( 'test1', 'test2' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array_keys( $tokens + $default_tokens ),
</ins><span class="cx" style="display: block; padding: 0 10px"> array_keys( $email->get_tokens() )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( 'hello', 'world' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array_values( $tokens + $default_tokens ),
</ins><span class="cx" style="display: block; padding: 0 10px"> array_values( $email->get_tokens() )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_headers() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $email = new BP_Email( 'activity-at-message' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $email = new BP_Email( 'activity-at-message' );
+ $default_headers = $email->get_headers();
+ $headers = array( 'custom_header' => 'custom_value' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $headers = array( 'custom_header' => 'custom_value' );
</del><span class="cx" style="display: block; padding: 0 10px"> $email->set_headers( $headers );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $headers, $email->get_headers() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $this->assertSame( $headers + $default_headers, $email->get_headers() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_validation() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,11 +94,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_invalid_characters_are_stripped_from_tokens() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $email = new BP_Email( 'activity-at-message' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $email = new BP_Email( 'activity-at-message' );
+ $default_tokens = $email->get_tokens();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $email->set_tokens( array( 'te{st}1' => 'hello world' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( 'test1' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array_keys( array( 'test1' => 'hello world' ) + $default_tokens ),
</ins><span class="cx" style="display: block; padding: 0 10px"> array_keys( $email->get_tokens() )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,12 +128,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_invalid_headers() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $email = new BP_Email( 'activity-at-message' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $email = new BP_Email( 'activity-at-message' );
+ $default_headers = $email->get_headers();
+ $headers = array( 'custom:header' => 'custom:value' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $headers = array( 'custom:header' => 'custom:value' );
</del><span class="cx" style="display: block; padding: 0 10px"> $email->set_headers( $headers );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotSame( $headers, $email->get( 'headers' ) );
- $this->assertSame( array( 'customheader' => 'customvalue' ), $email->get_headers() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $this->assertNotSame( $headers + $default_headers, $email->get( 'headers' ) );
+ $this->assertSame( array( 'customheader' => 'customvalue' ) + $default_headers, $email->get( 'headers' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_validation_with_missing_required_data() {
</span></span></pre>
</div>
</div>
</body>
</html>