<!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>[675] Introduce _destroy_user() and _destroy_users() methods for WPTestCase, as a complement to _make_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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://unit-tests.trac.wordpress.org/changeset/675">675</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-04-12 14:54:26 +0000 (Thu, 12 Apr 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce _destroy_user() and _destroy_users() methods for WPTestCase, as a complement to _make_user().
wp_delete_user() only removes a user from a site in multisite; it does not delete the user from the DB. _destroy_user() will run wpmu_delete_user() in multisite for the desired effect, and wp_delete_user() otherwise.
_destroy_users() will iterate over the $this->user_ids created by _make_user(), destroying each.
Fixes the entire set of XML-RPC tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#wptestcasetest_import_wpphp">wp-testcase/test_import_wp.php</a></li>
<li><a href="#wptestcasetest_includes_pluggablephp">wp-testcase/test_includes_pluggable.php</a></li>
<li><a href="#wptestcasetest_includes_postphp">wp-testcase/test_includes_post.php</a></li>
<li><a href="#wptestcasetest_userphp">wp-testcase/test_user.php</a></li>
<li><a href="#wptestcasetest_user_capabilitiesphp">wp-testcase/test_user_capabilities.php</a></li>
<li><a href="#wptestlibbasephp">wp-testlib/base.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="wptestcasetest_import_wpphp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test_import_wp.php (674 => 675)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test_import_wp.php 2012-04-12 14:49:49 UTC (rev 674)
+++ wp-testcase/test_import_wp.php 2012-04-12 14:54:26 UTC (rev 675)
</span><span class="lines">@@ -224,11 +224,11 @@
</span><span class="cx"> $this->_delete_all_posts();
</span><span class="cx">
</span><span class="cx"> if ( $user = get_user_by( 'login', 'admin' ) )
</span><del>- wp_delete_user( $user->ID );
</del><ins>+ $this->_destroy_user( $user->ID );
</ins><span class="cx"> if ( $user = get_user_by( 'login', 'editor' ) )
</span><del>- wp_delete_user( $user->ID );
</del><ins>+ $this->_destroy_user( $user->ID );
</ins><span class="cx"> if ( $user = get_user_by( 'login', 'author' ) )
</span><del>- wp_delete_user( $user->ID );
</del><ins>+ $this->_destroy_user( $user->ID );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_small_import() {
</span></span></pre></div>
<a id="wptestcasetest_includes_pluggablephp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test_includes_pluggable.php (674 => 675)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test_includes_pluggable.php 2012-04-12 14:49:49 UTC (rev 674)
+++ wp-testcase/test_includes_pluggable.php 2012-04-12 14:54:26 UTC (rev 675)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function tearDown() {
</span><del>- wp_delete_user( $this->user_id );
</del><ins>+ $this->_destroy_user( $this->user_id );
</ins><span class="cx"> parent::tearDown();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -264,8 +264,7 @@
</span><span class="cx"> function tearDown() {
</span><span class="cx"> parent::tearDown();
</span><span class="cx"> // delete any users that were created during tests
</span><del>- foreach ( $this->user_ids as $id )
- wp_delete_user( $id );
</del><ins>+ $this->_destroy_users();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // #13317
</span></span></pre></div>
<a id="wptestcasetest_includes_postphp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test_includes_post.php (674 => 675)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test_includes_post.php 2012-04-12 14:49:49 UTC (rev 674)
+++ wp-testcase/test_includes_post.php 2012-04-12 14:54:26 UTC (rev 675)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> parent::tearDown();
</span><span class="cx"> foreach ($this->post_ids as $id)
</span><span class="cx"> wp_delete_post($id);
</span><del>- wp_delete_user( $this->author_id );
</del><ins>+ $this->_destroy_user( $this->author_id );
</ins><span class="cx"> wp_set_current_user( $this->old_current_user );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="wptestcasetest_userphp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test_user.php (674 => 675)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test_user.php 2012-04-12 14:49:49 UTC (rev 674)
+++ wp-testcase/test_user.php 2012-04-12 14:54:26 UTC (rev 675)
</span><span class="lines">@@ -17,8 +17,7 @@
</span><span class="cx"> function tearDown() {
</span><span class="cx"> parent::tearDown();
</span><span class="cx"> // delete any users that were created during tests
</span><del>- foreach ( $this->user_ids as $id )
- wp_delete_user( $id );
</del><ins>+ $this->_destroy_users();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> public function deprecated_handler( $function, $message, $version ) {
</span><span class="lines">@@ -340,7 +339,7 @@
</span><span class="cx"> $this->assertEquals( array( 1 ), array_keys( $blogs ) );
</span><span class="cx">
</span><span class="cx"> // Non-existent users don't have blogs.
</span><del>- wp_delete_user( $user_id );
</del><ins>+ $this->_destroy_user( $user_id );
</ins><span class="cx"> $this->assertFalse( get_blogs_of_user( $user_id ) );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="wptestcasetest_user_capabilitiesphp"></a>
<div class="modfile"><h4>Modified: wp-testcase/test_user_capabilities.php (674 => 675)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testcase/test_user_capabilities.php 2012-04-12 14:49:49 UTC (rev 674)
+++ wp-testcase/test_user_capabilities.php 2012-04-12 14:54:26 UTC (rev 675)
</span><span class="lines">@@ -17,9 +17,7 @@
</span><span class="cx"> function tearDown() {
</span><span class="cx"> parent::tearDown();
</span><span class="cx"> // delete any users that were created during tests
</span><del>- foreach ($this->user_ids as $id)
- wp_delete_user($id);
-
</del><ins>+ $this->_destroy_users();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function _flush_roles() {
</span></span></pre></div>
<a id="wptestlibbasephp"></a>
<div class="modfile"><h4>Modified: wp-testlib/base.php (674 => 675)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testlib/base.php 2012-04-12 14:49:49 UTC (rev 674)
+++ wp-testlib/base.php 2012-04-12 14:54:26 UTC (rev 675)
</span><span class="lines">@@ -397,6 +397,17 @@
</span><span class="cx"> return $id;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function _destroy_user( $user_id ) {
+ if ( is_multisite() )
+ wpmu_delete_user( $user_id );
+ else
+ wp_delete_user( $user_id );
+ }
+
+ function _destroy_users() {
+ array_map( array( $this, '_destroy_user' ), $this->user_ids );
+ }
+
</ins><span class="cx"> /**
</span><span class="cx"> * Checks if track ticket #$ticket_id is resolved
</span><span class="cx"> *
</span><span class="lines">@@ -636,8 +647,7 @@
</span><span class="cx"> wp_ob_end_flush_all();
</span><span class="cx"> parent::tearDown();
</span><span class="cx"> // delete any users that were created during tests
</span><del>- foreach ($this->user_ids as $id)
- wp_delete_user($id);
</del><ins>+ $this->_destroy_users();
</ins><span class="cx">
</span><span class="cx"> remove_filter( 'pre_option_enable_xmlrpc', '__return_true' );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>