<!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][9120] trunk/tests/phpunit: Unit Tests, Groups: update the group factory to set the group's `creator_id` if one was not passed to the factory.</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/9120">9120</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/9120","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>2014-11-03 18:14:06 +0000 (Mon, 03 Nov 2014)</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, Groups: update the group factory to set the group's `creator_id` if one was not passed to the factory.
This is a quicker way of updating hundreds of unit tests where we've previously had a bug that was creating Groups without a valid group creator being set. See <a href="http://buddypress.trac.wordpress.org/ticket/5983">#5983</a> for related changes.
A few tests are counting the number of users in specific circumstances, so those eight tests have been individually updated so that they pass a valid `creator_id` without us having to refactor the entire test.
The `test_group_has_no_members` test has also been removed as it is impossible for a group to have no members. This test used to work because of this bug.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitincludesfactoryphp">trunk/tests/phpunit/includes/factory.php</a></li>
<li><a href="#trunktestsphpunittestcasesgroupsclassbpgroupmemberqueryphp">trunk/tests/phpunit/testcases/groups/class-bp-group-member-query.php</a></li>
<li><a href="#trunktestsphpunittestcasesgroupstemplatephp">trunk/tests/phpunit/testcases/groups/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitincludesfactoryphp"></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/factory.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/factory.php 2014-11-03 16:57:28 UTC (rev 9119)
+++ trunk/tests/phpunit/includes/factory.php 2014-11-03 18:14:06 UTC (rev 9120)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,7 +70,22 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function create_object( $args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $args['creator_id'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args['creator_id'] = get_current_user_id();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_user_logged_in() ) {
+ $args['creator_id'] = get_current_user_id();
+
+ // Create a user. This is based on from BP_UnitTestCase->create_user().
+ } else {
+ $last_activity = date( 'Y-m-d H:i:s', strtotime( bp_core_current_time() ) - 60 * 60 * 24 * 365 );
+ $user_factory = new WP_UnitTest_Factory_For_User();
+ $args['creator_id'] = $this->factory->user->create( array( 'role' => 'subscriber' ) );
+
+ bp_update_user_last_activity( $args['creator_id'] , $last_activity );
+
+ if ( bp_is_active( 'xprofile' ) ) {
+ $user = new WP_User( $args['creator_id'] );
+ xprofile_set_field_data( 1, $args['creator_id'] , $user->display_name );
+ }
+ }
</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"> $group_id = groups_create_group( $args );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,7 +94,6 @@
</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"> groups_update_groupmeta( $group_id, 'total_member_count', 1 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> $last_activity = isset( $args['last_activity'] ) ? $args['last_activity'] : bp_core_current_time();
</span><span class="cx" style="display: block; padding: 0 10px"> groups_update_groupmeta( $group_id, 'last_activity', $last_activity );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestcasesgroupsclassbpgroupmemberqueryphp"></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/class-bp-group-member-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/groups/class-bp-group-member-query.php 2014-11-03 16:57:28 UTC (rev 9119)
+++ trunk/tests/phpunit/testcases/groups/class-bp-group-member-query.php 2014-11-03 18:14:06 UTC (rev 9120)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,10 +118,12 @@
</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_with_group_role_admin() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $g = $this->factory->group->create();
</del><span class="cx" style="display: block; padding: 0 10px"> $u1 = $this->create_user();
</span><span class="cx" style="display: block; padding: 0 10px"> $u2 = $this->create_user();
</span><span class="cx" style="display: block; padding: 0 10px"> $u3 = $this->create_user();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $g = $this->factory->group->create( array(
+ 'creator_id' => $u1
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $time = time();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_user_to_group( $u1, $g, array( 'date_modified' => gmdate( 'Y-m-d H:i:s', $time - 100 ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,10 +170,12 @@
</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_with_group_role_member_admin() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $g = $this->factory->group->create();
</del><span class="cx" style="display: block; padding: 0 10px"> $u1 = $this->create_user();
</span><span class="cx" style="display: block; padding: 0 10px"> $u2 = $this->create_user();
</span><span class="cx" style="display: block; padding: 0 10px"> $u3 = $this->create_user();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $g = $this->factory->group->create( array(
+ 'creator_id' => $u1,
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $time = time();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_user_to_group( $u1, $g, array( 'date_modified' => gmdate( 'Y-m-d H:i:s', $time - 100 ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -193,10 +197,12 @@
</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_with_group_role_mod_admin() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $g = $this->factory->group->create();
</del><span class="cx" style="display: block; padding: 0 10px"> $u1 = $this->create_user();
</span><span class="cx" style="display: block; padding: 0 10px"> $u2 = $this->create_user();
</span><span class="cx" style="display: block; padding: 0 10px"> $u3 = $this->create_user();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $g = $this->factory->group->create( array(
+ 'creator_id' => $u1,
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $time = time();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_user_to_group( $u1, $g, array( 'date_modified' => gmdate( 'Y-m-d H:i:s', $time - 100 ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -218,10 +224,12 @@
</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_with_group_role_member_mod_admin() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $g = $this->factory->group->create();
</del><span class="cx" style="display: block; padding: 0 10px"> $u1 = $this->create_user();
</span><span class="cx" style="display: block; padding: 0 10px"> $u2 = $this->create_user();
</span><span class="cx" style="display: block; padding: 0 10px"> $u3 = $this->create_user();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $g = $this->factory->group->create( array(
+ 'creator_id' => $u1,
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $time = time();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_user_to_group( $u1, $g, array( 'date_modified' => gmdate( 'Y-m-d H:i:s', $time - 100 ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,11 +251,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_with_group_role_member_mod_admin_banned() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $g = $this->factory->group->create();
</del><span class="cx" style="display: block; padding: 0 10px"> $u1 = $this->create_user();
</span><span class="cx" style="display: block; padding: 0 10px"> $u2 = $this->create_user();
</span><span class="cx" style="display: block; padding: 0 10px"> $u3 = $this->create_user();
</span><span class="cx" style="display: block; padding: 0 10px"> $u4 = $this->create_user();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $g = $this->factory->group->create( array(
+ 'creator_id' => $u1,
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $time = time();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_user_to_group( $u1, $g, array( 'date_modified' => gmdate( 'Y-m-d H:i:s', $time - 100 ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -295,19 +305,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array( $u1, ), $ids );
</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 function test_group_has_no_members() {
- $g = $this->factory->group->create();
- $u1 = $this->create_user();
-
- $query_members = new BP_Group_Member_Query( array(
- 'group_id' => $g,
- 'group_role' => array( 'member', 'mod', 'admin' ),
- ) );
-
- $ids = wp_parse_id_list( array_keys( $query_members->results ) );
- $this->assertEquals( array(), $ids );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> public function test_group_has_no_members_of_role_mod() {
</span><span class="cx" style="display: block; padding: 0 10px"> $g = $this->factory->group->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $u1 = $this->create_user();
</span></span></pre></div>
<a id="trunktestsphpunittestcasesgroupstemplatephp"></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/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/groups/template.php 2014-11-03 16:57:28 UTC (rev 9119)
+++ trunk/tests/phpunit/testcases/groups/template.php 2014-11-03 18:14:06 UTC (rev 9120)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,9 +131,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group bp_group_has_members
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_bp_group_has_members_vanilla() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $g = $this->factory->group->create();
</del><span class="cx" style="display: block; padding: 0 10px"> $u1 = $this->create_user();
</span><span class="cx" style="display: block; padding: 0 10px"> $u2 = $this->create_user();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $g = $this->factory->group->create( array(
+ 'creator_id' => $u1,
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_user_to_group( $u1, $g );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>