<!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][11882] trunk: Unit Tests: Run `'bp_template_redirect'` hook in `go_to()` method.</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/11882">11882</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/11882","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>r-a-y</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-03-04 21:35:46 +0000 (Sun, 04 Mar 2018)</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: Run `'bp_template_redirect'` hook in `go_to()` method.
In PHPUnit, we mock page visits with the `go_to()` method, however we
previously only ran the `'bp_init'` hook, which sets up various internal
page routing properties, but doesn't run any screen hooks.
This commit adds the `'bp_template_redirect'` hook to the `go_to()` method,
which allows hooks like `'bp_actions'` and `'bp_screens'` to run. In order
for those hooks to run without errors in PHPUnit, we need to adjust our
`bp_core_redirect()` function so it doesn't kill execution. Also, for
PHPUnit, we do not allow redirects to occur since they cause 'headers
already sent' notices.
Lastly, we can adjust some unit tests to just use the `go_to()` method,
instead of needing to manually call a screen hook.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/7703">#7703</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcorefunctionsphp">trunk/src/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunktestsphpunitincludesloaderphp">trunk/tests/phpunit/includes/loader.php</a></li>
<li><a href="#trunktestsphpunitincludestestcasephp">trunk/tests/phpunit/includes/testcase.php</a></li>
<li><a href="#trunktestsphpunittestcasesactivitynotificationsphp">trunk/tests/phpunit/testcases/activity/notifications.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-functions.php 2018-03-04 21:13:24 UTC (rev 11881)
+++ trunk/src/bp-core/bp-core-functions.php 2018-03-04 21:35:46 UTC (rev 11882)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1037,7 +1037,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> buddypress()->no_status_set = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_safe_redirect( $location, $status );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- die;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // If PHPUnit is running, do not kill execution.
+ if ( ! defined( 'BP_TESTS_DIR' ) ) {
+ die;
+ }
</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"> /**
</span></span></pre></div>
<a id="trunktestsphpunitincludesloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/loader.php 2018-03-04 21:13:24 UTC (rev 11881)
+++ trunk/tests/phpunit/includes/loader.php 2018-03-04 21:35:46 UTC (rev 11882)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,6 +8,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Bootstrap BP
</span><span class="cx" style="display: block; padding: 0 10px"> require dirname( __FILE__ ) . '/../../../src/bp-loader.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Bail from redirects as they throw 'headers already sent' warnings.
+tests_add_filter( 'wp_redirect', '__return_false' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once( dirname( __FILE__ ) . '/mock-mailer.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> function _bp_mock_mailer( $class ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return 'BP_UnitTest_Mailer';
</span></span></pre></div>
<a id="trunktestsphpunitincludestestcasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/testcase.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/testcase.php 2018-03-04 21:13:24 UTC (rev 11881)
+++ trunk/tests/phpunit/includes/testcase.php 2018-03-04 21:35:46 UTC (rev 11882)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -193,6 +193,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> parent::go_to( $url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'bp_init' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ do_action( 'bp_template_redirect' );
</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"> /**
</span></span></pre></div>
<a id="trunktestsphpunittestcasesactivitynotificationsphp"></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/activity/notifications.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/activity/notifications.php 2018-03-04 21:13:24 UTC (rev 11881)
+++ trunk/tests/phpunit/testcases/activity/notifications.php 2018-03-04 21:35:46 UTC (rev 11882)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,9 +50,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array( $this->a1 ), wp_list_pluck( $notifications, 'item_id' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Go to the activity permalink page
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->go_to( bp_activity_get_permalink( $this->a1 ) );
- $activity = bp_activity_get_specific( array( 'activity_ids' => $this->a1, 'show_hidden' => true, 'spam' => 'ham_only', ) );
- do_action( 'bp_activity_screen_single_activity_permalink', $activity['activities'][0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->go_to( bp_core_get_user_domain( $this->u1 ) . 'activity/' . $this->a1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $notifications = BP_Notifications_Notification::get( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $this->u1,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,9 +78,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_current_user( 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Go to the activity permalink page
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->go_to( bp_activity_get_permalink( $this->a1 ) );
- $activity = bp_activity_get_specific( array( 'activity_ids' => $this->a1, 'show_hidden' => true, 'spam' => 'ham_only', ) );
- do_action( 'bp_activity_screen_single_activity_permalink', $activity['activities'][0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->go_to( bp_core_get_user_domain( $this->u1 ) . 'activity/' . $this->a1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $notifications = BP_Notifications_Notification::get( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $this->u1,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,9 +108,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_current_user( $this->u2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Go to the activity permalink page
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->go_to( bp_activity_get_permalink( $this->a1 ) );
- $activity = bp_activity_get_specific( array( 'activity_ids' => $this->a1, 'show_hidden' => true, 'spam' => 'ham_only', ) );
- do_action( 'bp_activity_screen_single_activity_permalink', $activity['activities'][0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->go_to( bp_core_get_user_domain( $this->u1 ) . 'activity/' . $this->a1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $notifications = BP_Notifications_Notification::get( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $this->u1,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,7 +136,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Go to the My Activity page
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( bp_core_get_user_domain( $this->u1 ) . bp_get_activity_slug() . '/mentions/' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- do_action( 'bp_activity_screen_mentions' );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $notifications = BP_Notifications_Notification::get( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $this->u1,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +164,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Go to the My Activity page
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( bp_core_get_user_domain( $this->u1 ) . bp_get_activity_slug() . '/mentions/' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- do_action( 'bp_activity_screen_mentions' );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $notifications = BP_Notifications_Notification::get( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $this->u1,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -203,7 +195,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Go to the My Activity page
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( bp_core_get_user_domain( $this->u1 ) . bp_get_activity_slug() . '/mentions/' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- do_action( 'bp_activity_screen_mentions' );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $notifications = BP_Notifications_Notification::get( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $this->u1,
</span></span></pre>
</div>
</div>
</body>
</html>