<!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][7034] trunk/tests/testcases/members/functions.php: Fixes issue in test_bp_core_delete_account() with super-user granting</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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/7034">7034</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-05-09 11:22:05 +0000 (Thu, 09 May 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes issue in test_bp_core_delete_account() with super-user granting</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkteststestcasesmembersfunctionsphp">trunk/tests/testcases/members/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkteststestcasesmembersfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/testcases/members/functions.php (7033 => 7034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/members/functions.php 2013-05-09 10:59:26 UTC (rev 7033)
+++ trunk/tests/testcases/members/functions.php 2013-05-09 11:22:05 UTC (rev 7034)
</span><span class="lines">@@ -18,6 +18,27 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * We can't use grant_super_admin() because we will need to modify
+ * the list more than once, and grant_super_admin() can only be run
+ * once because of its global check
+ */
+ public function grant_super_admin( $user_id ) {
+ global $super_admins;
+ if ( ! is_multisite() ) {
+ return;
+ }
+
+ $user = get_userdata( $user_id );
+ $super_admins[] = $user->user_login;
+ }
+
+ public function restore_admins() {
+ // We assume that the global can be wiped out
+ // @see grant_super_admin()
+ unset( $GLOBALS['super_admins'] );
+ }
+
+ /**
</ins><span class="cx"> * ticket BP4915
</span><span class="cx"> */
</span><span class="cx"> public function test_bp_core_delete_account() {
</span><span class="lines">@@ -27,12 +48,7 @@
</span><span class="cx">
</span><span class="cx"> // Create an admin for testing
</span><span class="cx"> $admin_user = $this->factory->user->create( array( 'role' => 'administrator' ) );
</span><del>- if ( is_multisite() ) {
- if ( ! function_exists( 'grant_super_admin' ) ) {
- require_once( ABSPATH . '/wp-admin/includes/ms.php' );
- }
- grant_super_admin( $admin_user );
- }
</del><ins>+ $this->grant_super_admin( $admin_user );
</ins><span class="cx">
</span><span class="cx"> // 1. Admin can delete user account
</span><span class="cx"> $this->set_current_user( $admin_user );
</span><span class="lines">@@ -44,6 +60,7 @@
</span><span class="cx">
</span><span class="cx"> // 2. Admin cannot delete superadmin account
</span><span class="cx"> $user2 = $this->factory->user->create( array( 'role' => 'administrator' ) );
</span><ins>+ $this->grant_super_admin( $user2 );
</ins><span class="cx"> bp_core_delete_account( $user2 );
</span><span class="cx"> $maybe_user = new WP_User( $user2 );
</span><span class="cx"> $this->assertNotEquals( 0, $maybe_user->ID );
</span></span></pre>
</div>
</div>
</body>
</html>