<!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>[Tests][1077] trunk/tests/xmlrpc/wp: As XML-RPC's get_users() currently requires the edit_users cap, set the querying user to be a super administrator so the tests pass in multisite.</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/1077">1077</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-10-07 23:30:53 +0000 (Sun, 07 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>As XML-RPC's get_users() currently requires the edit_users cap, set the querying user to be a super administrator so the tests pass in multisite. see #WP18428.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsxmlrpcwpeditProfilephp">trunk/tests/xmlrpc/wp/editProfile.php</a></li>
<li><a href="#trunktestsxmlrpcwpgetProfilephp">trunk/tests/xmlrpc/wp/getProfile.php</a></li>
<li><a href="#trunktestsxmlrpcwpgetUserphp">trunk/tests/xmlrpc/wp/getUser.php</a></li>
<li><a href="#trunktestsxmlrpcwpgetUsersphp">trunk/tests/xmlrpc/wp/getUsers.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsxmlrpcwpeditProfilephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/xmlrpc/wp/editProfile.php (1076 => 1077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/xmlrpc/wp/editProfile.php 2012-10-05 17:47:50 UTC (rev 1076)
+++ trunk/tests/xmlrpc/wp/editProfile.php 2012-10-07 23:30:53 UTC (rev 1077)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> * @group xmlrpc
</span><span class="cx"> * @group user
</span><span class="cx"> */
</span><del>-class TestXMLRPCServer_wp_editProfile extends WP_XMLRPC_UnitTestCase {
</del><ins>+class Tests_XMLRPC_wp_editProfile extends WP_XMLRPC_UnitTestCase {
</ins><span class="cx">
</span><span class="cx"> function test_invalid_username_password() {
</span><span class="cx"> $result = $this->myxmlrpcserver->wp_editProfile( array( 1, 'username', 'password', array() ) );
</span></span></pre></div>
<a id="trunktestsxmlrpcwpgetProfilephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/xmlrpc/wp/getProfile.php (1076 => 1077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/xmlrpc/wp/getProfile.php 2012-10-05 17:47:50 UTC (rev 1076)
+++ trunk/tests/xmlrpc/wp/getProfile.php 2012-10-07 23:30:53 UTC (rev 1077)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> * @group xmlrpc
</span><span class="cx"> * @group user
</span><span class="cx"> */
</span><del>-class TestXMLRPCServer_wp_getProfile extends WP_XMLRPC_UnitTestCase {
</del><ins>+class Tests_XMLRPC_wp_getProfile extends WP_XMLRPC_UnitTestCase {
</ins><span class="cx">
</span><span class="cx"> function test_invalid_username_password() {
</span><span class="cx"> $result = $this->myxmlrpcserver->wp_getProfile( array( 1, 'username', 'password' ) );
</span></span></pre></div>
<a id="trunktestsxmlrpcwpgetUserphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/xmlrpc/wp/getUser.php (1076 => 1077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/xmlrpc/wp/getUser.php 2012-10-05 17:47:50 UTC (rev 1076)
+++ trunk/tests/xmlrpc/wp/getUser.php 2012-10-07 23:30:53 UTC (rev 1077)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> * @group xmlrpc
</span><span class="cx"> * @group user
</span><span class="cx"> */
</span><del>-class TestXMLRPCServer_wp_getUser extends WP_XMLRPC_UnitTestCase {
</del><ins>+class Tests_XMLRPC_wp_getUser extends WP_XMLRPC_UnitTestCase {
</ins><span class="cx"> protected $administrator_id;
</span><span class="cx">
</span><span class="cx"> function setUp() {
</span></span></pre></div>
<a id="trunktestsxmlrpcwpgetUsersphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/xmlrpc/wp/getUsers.php (1076 => 1077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/xmlrpc/wp/getUsers.php 2012-10-05 17:47:50 UTC (rev 1076)
+++ trunk/tests/xmlrpc/wp/getUsers.php 2012-10-07 23:30:53 UTC (rev 1077)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> * @group xmlrpc
</span><span class="cx"> * @group user
</span><span class="cx"> */
</span><del>-class TestXMLRPCServer_wp_getUsers extends WP_XMLRPC_UnitTestCase {
</del><ins>+class Tests_XMLRPC_wp_getUsers extends WP_XMLRPC_UnitTestCase {
</ins><span class="cx">
</span><span class="cx"> function test_invalid_username_password() {
</span><span class="cx"> $results = $this->myxmlrpcserver->wp_getUsers( array( 1, 'username', 'password' ) );
</span><span class="lines">@@ -23,8 +23,8 @@
</span><span class="cx"> function test_capable_user() {
</span><span class="cx"> $this->make_user_by_role( 'administrator' );
</span><span class="cx">
</span><del>- $results = $this->myxmlrpcserver->wp_getUsers( array( 1, 'administrator', 'administrator' ) );
- $this->assertNotInstanceOf( 'IXR_Error', $results );
</del><ins>+ $result = $this->myxmlrpcserver->wp_getUsers( array( 1, 'administrator', 'administrator' ) );
+ $this->assertNotInstanceOf( 'IXR_Error', $result );
</ins><span class="cx">
</span><span class="cx"> // check data types
</span><span class="cx"> $this->assertInternalType( 'string', $result[0]['user_id'] );
</span><span class="lines">@@ -39,11 +39,12 @@
</span><span class="cx"> $this->assertInternalType( 'string', $result[0]['nicename'] );
</span><span class="cx"> $this->assertInternalType( 'string', $result[0]['url'] );
</span><span class="cx"> $this->assertInternalType( 'string', $result[0]['display_name'] );
</span><del>- $this->assertInternalType( 'array', $result['roles'] );
</del><ins>+ $this->assertInternalType( 'array', $result[0]['roles'] );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_invalid_role() {
</span><del>- $this->make_user_by_role( 'administrator' );
</del><ins>+ $administrator_id = $this->make_user_by_role( 'administrator' );
+ grant_super_admin( $administrator_id );
</ins><span class="cx">
</span><span class="cx"> $filter = array( 'role' => rand_str() );
</span><span class="cx"> $results = $this->myxmlrpcserver->wp_getUsers( array( 1, 'administrator', 'administrator', $filter ) );
</span><span class="lines">@@ -55,6 +56,7 @@
</span><span class="cx"> $author_id = $this->make_user_by_role( 'author' );
</span><span class="cx"> $editor_id = $this->make_user_by_role( 'editor' );
</span><span class="cx"> $administrator_id = $this->make_user_by_role( 'administrator' );
</span><ins>+ grant_super_admin( $administrator_id );
</ins><span class="cx">
</span><span class="cx"> // test a single role ('editor')
</span><span class="cx"> $filter = array( 'role' => 'editor' );
</span><span class="lines">@@ -71,7 +73,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function test_paging_filters() {
</span><del>- $this->make_user_by_role( 'administrator' );
</del><ins>+ $administrator_id = $this->make_user_by_role( 'administrator' );
+ grant_super_admin( $administrator_id );
+
</ins><span class="cx"> $this->factory->user->create_many( 13 );
</span><span class="cx">
</span><span class="cx"> $user_ids = get_users( array( 'fields' => 'ID' ) );
</span></span></pre>
</div>
</div>
</body>
</html>