<!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][11739] trunk/tests/phpunit: Ensure that shared user fixtures are fully cleaned up.</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/11739">11739</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/11739","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-11-03 21:11:52 +0000 (Fri, 03 Nov 2017)</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'>Ensure that shared user fixtures are fully cleaned up.
It's not possible to inherit WP 4.4's user cleanup between tests, because
the the deletion routine runs after the core test suite has unhooked
certain actions (such as BP's that are hooked to `delete_user`). So
we are forced to run necessary cleanup tasks in our own `delete_user()`
method, and ensure that it's this method that is called in every case
where we're cleaning up after statically generated shared fixtures.
Otherwise leftover content in the activity table can leak to other
tests.
See <a href="http://buddypress.trac.wordpress.org/ticket/7620">#7620</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitincludestestcasephp">trunk/tests/phpunit/includes/testcase.php</a></li>
<li><a href="#trunktestsphpunittestcasescoreclassbpmediaextractorphp">trunk/tests/phpunit/testcases/core/class-bp-media-extractor.php</a></li>
<li><a href="#trunktestsphpunittestcasescoresuggestionsnonauthphp">trunk/tests/phpunit/testcases/core/suggestions-nonauth.php</a></li>
<li><a href="#trunktestsphpunittestcasescoresuggestionsphp">trunk/tests/phpunit/testcases/core/suggestions.php</a></li>
<li><a href="#trunktestsphpunittestcasesgroupsfunctionsbpGetUserGroupsphp">trunk/tests/phpunit/testcases/groups/functions/bpGetUserGroups.php</a></li>
<li><a href="#trunktestsphpunittestcasesgroupsfunctionsgroupsCreateGroupphp">trunk/tests/phpunit/testcases/groups/functions/groupsCreateGroup.php</a></li>
<li><a href="#trunktestsphpunittestcasesgroupsfunctionsgroupsIsUserphp">trunk/tests/phpunit/testcases/groups/functions/groupsIsUser.php</a></li>
<li><a href="#trunktestsphpunittestcasesgroupstypesphp">trunk/tests/phpunit/testcases/groups/types.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2017-11-03 21:11:47 UTC (rev 11738)
+++ trunk/tests/phpunit/includes/testcase.php 2017-11-03 21:11:52 UTC (rev 11739)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,13 +25,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected $deactivated_components = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Cribbed from WP so that the self::factory() call comes from this class.
+ *
+ * @since 3.0.0
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public static function setUpBeforeClass() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Fake WP mail globals, to avoid errors
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_mail', array( 'BP_UnitTestCase', 'setUp_wp_mail' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_mail_from', array( 'BP_UnitTestCase', 'tearDown_wp_mail' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- parent::setUpBeforeClass();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $c = self::get_called_class();
+ if ( ! method_exists( $c, 'wpSetUpBeforeClass' ) ) {
+ self::commit_transaction();
+ return;
+ }
+
+ call_user_func( array( $c, 'wpSetUpBeforeClass' ), self::factory() );
+
+ self::commit_transaction();
</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 setUp() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,6 +107,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->deactivated_components = array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Multisite-agnostic way to delete a user from the database.
+ *
+ * @since 3.0.0
+ */
+ public static function delete_user( $user_id ) {
+ $deleted = parent::delete_user( $user_id );
+
+ // When called in tearDownAfterClass(), BP's cleanup functions may no longer be hooked.
+ if ( bp_is_active( 'activity' ) ) {
+ bp_activity_remove_all_user_data( $user_id );
+ }
+
+ return $deleted;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function clean_up_global_scope() {
</span><span class="cx" style="display: block; padding: 0 10px"> buddypress()->bp_nav = buddypress()->bp_options_nav = buddypress()->action_variables = buddypress()->canonical_stack = buddypress()->unfiltered_uri = $GLOBALS['bp_unfiltered_uri'] = array();
</span><span class="cx" style="display: block; padding: 0 10px"> buddypress()->current_component = buddypress()->current_item = buddypress()->current_action = buddypress()->current_member_type = '';
</span></span></pre></div>
<a id="trunktestsphpunittestcasescoreclassbpmediaextractorphp"></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-media-extractor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/core/class-bp-media-extractor.php 2017-11-03 21:11:47 UTC (rev 11738)
+++ trunk/tests/phpunit/testcases/core/class-bp-media-extractor.php 2017-11-03 21:11:52 UTC (rev 11739)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,10 +7,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static $media_extractor = null;
</span><span class="cx" style="display: block; padding: 0 10px"> public static $richtext = '';
</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 static function setUpBeforeClass() {
- parent::setUpBeforeClass();
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function wpSetUpBeforeClass( $f ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::$media_extractor = new BP_Media_Extractor();
</span><span class="cx" style="display: block; padding: 0 10px"> self::$richtext = "Hello world.
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestcasescoresuggestionsnonauthphp"></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/suggestions-nonauth.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/core/suggestions-nonauth.php 2017-11-03 21:11:47 UTC (rev 11738)
+++ trunk/tests/phpunit/testcases/core/suggestions-nonauth.php 2017-11-03 21:11:52 UTC (rev 11739)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,9 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $group_slugs = array();
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $user_ids = array();
</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 static function setUpBeforeClass() {
- parent::setUpBeforeClass();
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function wpSetUpBeforeClass( $factory ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $users = array(
</span><span class="cx" style="display: block; padding: 0 10px"> // user_login, display_name
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'aardvark', 'Bob Smith' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,8 +26,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'zoom', 'Lisa Smithy' ),
</span><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">- $factory = new BP_UnitTest_Factory();
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Create some dummy users.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach( $users as $user_index => $user ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $new_user = $factory->user->create( array(
</span></span></pre></div>
<a id="trunktestsphpunittestcasescoresuggestionsphp"></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/suggestions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/core/suggestions.php 2017-11-03 21:11:47 UTC (rev 11738)
+++ trunk/tests/phpunit/testcases/core/suggestions.php 2017-11-03 21:11:52 UTC (rev 11739)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,11 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $old_user_id = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $user_ids = array();
</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 static function setUpBeforeClass() {
- parent::setUpBeforeClass();
-
- $factory = new BP_UnitTest_Factory();
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function wpSetUpBeforeClass( $factory ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::$old_user_id = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px"> self::$current_user = $factory->user->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'display_name' => 'Katie Parker',
</span></span></pre></div>
<a id="trunktestsphpunittestcasesgroupsfunctionsbpGetUserGroupsphp"></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/groups/functions/bpGetUserGroups.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/groups/functions/bpGetUserGroups.php 2017-11-03 21:11:47 UTC (rev 11738)
+++ trunk/tests/phpunit/testcases/groups/functions/bpGetUserGroups.php 2017-11-03 21:11:52 UTC (rev 11739)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> groups_remove_member( self::$user, self::$groups[2] );
</span><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 static function setUpBeforeClass() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function wpSetUpBeforeClass( $f ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $f = new BP_UnitTest_Factory();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> self::$user = $f->user->create( array(
</span></span></pre></div>
<a id="trunktestsphpunittestcasesgroupsfunctionsgroupsCreateGroupphp"></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/groups/functions/groupsCreateGroup.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/groups/functions/groupsCreateGroup.php 2017-11-03 21:11:47 UTC (rev 11738)
+++ trunk/tests/phpunit/testcases/groups/functions/groupsCreateGroup.php 2017-11-03 21:11:52 UTC (rev 11739)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,6 +12,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> self::$user_id = $factory->user->create();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function wpTearDownAfterClass() {
+ self::delete_user( self::$user_id );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket BP7619
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunktestsphpunittestcasesgroupsfunctionsgroupsIsUserphp"></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/groups/functions/groupsIsUser.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/groups/functions/groupsIsUser.php 2017-11-03 21:11:47 UTC (rev 11738)
+++ trunk/tests/phpunit/testcases/groups/functions/groupsIsUser.php 2017-11-03 21:11:52 UTC (rev 11739)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,9 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> static $admin_user;
</span><span class="cx" style="display: block; padding: 0 10px"> static $groups;
</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 static function setUpBeforeClass() {
- $f = new BP_UnitTest_Factory();
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function wpSetUpBeforeClass( $f ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::$user = $f->user->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_login' => 'groups_is_user',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_email' => 'groups_is_user@example.com',
</span></span></pre></div>
<a id="trunktestsphpunittestcasesgroupstypesphp"></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/groups/types.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/groups/types.php 2017-11-03 21:11:47 UTC (rev 11738)
+++ trunk/tests/phpunit/testcases/groups/types.php 2017-11-03 21:11:52 UTC (rev 11739)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,21 +13,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> buddypress()->groups->types = array();
</span><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 static function setUpBeforeClass() {
- $f = new BP_UnitTest_Factory();
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function wpSetUpBeforeClass( $f ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::$u1 = $f->user->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_email' => 'group-types-tests@example.com',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_login' => 'grouptypestests',
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static function tearDownAfterClass() {
- if ( is_multisite() ) {
- wpmu_delete_user( self::$u1 );
- } else {
- wp_delete_user( self::$u1 );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function wpTearDownAfterClass() {
+ self::delete_user( self::$u1 );
</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_groups_register_type_should_fail_for_existing_group_type() {
</span></span></pre>
</div>
</div>
</body>
</html>