<!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>[29937] trunk/tests/phpunit/tests: Improve and reduce tests for get_blogs_of_user()</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="https://core.trac.wordpress.org/changeset/29937">29937</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/29937","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jeremyfelt</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-10-17 03:01:21 +0000 (Fri, 17 Oct 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'>Improve and reduce tests for get_blogs_of_user()
* Create half as many factory sites. See <a href="https://core.trac.wordpress.org/ticket/30017">#30017</a>
* Test the removal of a user from multiple sites.
* Expand tests to include second parameter for flagged sites.
* Remove duplicate test for deleted user.
Fixes <a href="https://core.trac.wordpress.org/ticket/29996">#29996</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsusermultisitephp">trunk/tests/phpunit/tests/user/multisite.php</a></li>
<li><a href="#trunktestsphpunittestsuserphp">trunk/tests/phpunit/tests/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsusermultisitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user/multisite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/multisite.php 2014-10-17 02:27:44 UTC (rev 29936)
+++ trunk/tests/phpunit/tests/user/multisite.php 2014-10-17 03:01:21 UTC (rev 29937)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,27 +40,40 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $user2->ID, $post->post_author );
</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">+ /**
+ * Test the returned data from get_blogs_of_user()
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_get_blogs_of_user() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Logged out users don't have blogs.
- $this->assertEquals( array(), get_blogs_of_user( 0 ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $user1_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blog_ids = $this->factory->blog->create_many( 10, array( 'user_id' => $user1_id ) );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $blog_ids as $blog_id )
- $this->assertInternalType( 'int', $blog_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Maintain a list of 6 total sites and include the primary network site.
+ $blog_ids = $this->factory->blog->create_many( 5, array( 'user_id' => $user1_id ) );
+ $blog_ids = array_merge( array( 1 ), $blog_ids );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blogs_of_user = array_keys( get_blogs_of_user( $user1_id, false ) );
- sort( $blogs_of_user );
- $this->assertEquals ( array_merge( array( 1 ), $blog_ids), $blogs_of_user );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // All sites are new and not marked as spam, archived, or deleted.
+ $blog_ids_of_user = array_keys( get_blogs_of_user( $user1_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( remove_user_from_blog( $user1_id, 1 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // User should be a member of the created sites and the network's initial site.
+ $this->assertEquals( $blog_ids, $blog_ids_of_user );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blogs_of_user = array_keys( get_blogs_of_user( $user1_id, false ) );
- sort( $blogs_of_user );
- $this->assertEquals ( $blog_ids, $blogs_of_user );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( remove_user_from_blog( $user1_id, $blog_ids[0] ) );
+ $this->assertTrue( remove_user_from_blog( $user1_id, $blog_ids[2] ) );
+ $this->assertTrue( remove_user_from_blog( $user1_id, $blog_ids[4] ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( get_blogs_of_user( $user1_id, false ) as $blog ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unset( $blog_ids[0] );
+ unset( $blog_ids[2] );
+ unset( $blog_ids[4] );
+ sort( $blog_ids );
+
+ $blogs_of_user = get_blogs_of_user( $user1_id, false );
+
+ // The user should still be a member of all remaining sites.
+ $blog_ids_of_user = array_keys( $blogs_of_user );
+ $this->assertEquals( $blog_ids, $blog_ids_of_user );
+
+ // Each site retrieved should match the expected structure.
+ foreach ( $blogs_of_user as $blog_id => $blog ) {
+ $this->assertEquals( $blog_id, $blog->userblog_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( isset( $blog->userblog_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( isset( $blog->blogname ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( isset( $blog->domain ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,11 +85,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( isset( $blog->deleted ) );
</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">- // Non-existent users don't have blogs.
- wpmu_delete_user( $user1_id );
- $user = new WP_User( $user1_id );
- $this->assertFalse( $user->exists(), 'WP_User->exists' );
- $this->assertEquals( array(), get_blogs_of_user( $user1_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Mark each remaining site as spam, archived, and deleted.
+ update_blog_details( $blog_ids[0], array( 'spam' => 1 ) );
+ update_blog_details( $blog_ids[1], array( 'archived' => 1 ) );
+ update_blog_details( $blog_ids[2], array( 'deleted' => 1 ) );
+
+ // Passing true as the second parameter should retrieve ALL sites, even if marked.
+ $blog_ids_of_user = array_keys( get_blogs_of_user( $user1_id, true ) );
+ $this->assertEquals( $blog_ids, $blog_ids_of_user );
+
+ unset( $blog_ids[0] );
+ unset( $blog_ids[1] );
+ unset( $blog_ids[2] );
+ sort( $blog_ids );
+
+ // Passing false (the default) as the second parameter should retrieve only good sites.
+ $blog_ids_of_user = array_keys( get_blogs_of_user( $user1_id, false ) );
+ $this->assertEquals( $blog_ids, $blog_ids_of_user );
</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="trunktestsphpunittestsuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user.php 2014-10-17 02:27:44 UTC (rev 29936)
+++ trunk/tests/phpunit/tests/user.php 2014-10-17 03:01:21 UTC (rev 29937)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -375,6 +375,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wpmu_delete_user( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> wp_delete_user( $user_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $user = new WP_User( $user_id );
+ $this->assertFalse( $user->exists(), 'WP_User->exists' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( array(), get_blogs_of_user( $user_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>