<!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>[35197] trunk/tests/phpunit/tests/user/query.php: Unit Tests: add/upgrade the fixtures in `Tests_User_Query`.</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/35197">35197</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/35197","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-15 07:28:40 +0000 (Thu, 15 Oct 2015)</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: add/upgrade the fixtures in `Tests_User_Query`.
See <a href="https://core.trac.wordpress.org/ticket/30017">#30017</a>, <a href="https://core.trac.wordpress.org/ticket/33968">#33968</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsuserqueryphp">trunk/tests/phpunit/tests/user/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsuserqueryphp"></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/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/query.php 2015-10-15 06:52:19 UTC (rev 35196)
+++ trunk/tests/phpunit/tests/user/query.php 2015-10-15 07:28:40 UTC (rev 35197)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,13 +5,56 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group user
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_User_Query extends WP_UnitTestCase {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected static $author_ids;
+ protected static $sub_ids;
+ protected static $editor_ids;
+ protected static $contrib_id;
+ protected static $admin_ids;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> protected $user_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function setUp() {
- parent::setUp();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function wpSetUpBeforeClass( $factory ) {
+ self::$author_ids = $factory->user->create_many( 4, array(
+ 'role' => 'author'
+ ) );
+
+ self::$sub_ids = $factory->user->create_many( 2, array(
+ 'role' => 'subscriber',
+ ) );
+
+ self::$editor_ids = $factory->user->create_many( 3, array(
+ 'role' => 'editor',
+ ) );
+
+ self::$contrib_id = $factory->user->create( array(
+ 'role' => 'contributor',
+ ) );
+
+ self::$admin_ids = $factory->user->create_many( 2, array(
+ 'role' => 'administrator',
+ ) );
</ins><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">+ public static function wpTearDownAfterClass() {
+ $sets = array(
+ self::$author_ids,
+ self::$sub_ids,
+ self::$editor_ids,
+ array( self::$contrib_id ),
+ self::$admin_ids
+ );
+
+ foreach ( $sets as $set ) {
+ foreach ( $set as $id ) {
+ if ( is_multisite() ) {
+ wpmu_delete_user( $id );
+ } else {
+ wp_delete_user( $id );
+ }
+ }
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function test_get_and_set() {
</span><span class="cx" style="display: block; padding: 0 10px"> $users = new WP_User_Query();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,83 +74,71 @@
</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_include_single() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = $this->factory->user->create_many( 2 );
</del><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'include' => $users[0],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'include' => self::$author_ids[0],
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $ids = $q->get_results();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( array( $users[0] ), $ids );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( array( self::$author_ids[0] ), $ids );
</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"> public function test_include_comma_separated() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = $this->factory->user->create_many( 3 );
</del><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'include' => $users[0] . ', ' . $users[2],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'include' => self::$author_ids[0] . ', ' . self::$author_ids[2],
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $ids = $q->get_results();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEqualSets( array( $users[0], $users[2] ), $ids );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSets( array( self::$author_ids[0], self::$author_ids[2] ), $ids );
</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"> public function test_include_array() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = $this->factory->user->create_many( 3 );
</del><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'include' => array( $users[0], $users[2] ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'include' => array( self::$author_ids[0], self::$author_ids[2] ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $ids = $q->get_results();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEqualSets( array( $users[0], $users[2] ), $ids );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSets( array( self::$author_ids[0], self::$author_ids[2] ), $ids );
</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"> public function test_include_array_bad_values() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = $this->factory->user->create_many( 3 );
</del><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'include' => array( $users[0], 'foo', $users[2] ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'include' => array( self::$author_ids[0], 'foo', self::$author_ids[2] ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $ids = $q->get_results();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEqualSets( array( $users[0], $users[2] ), $ids );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSets( array( self::$author_ids[0], self::$author_ids[2] ), $ids );
</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"> public function test_exclude() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = $this->factory->user->create_many( 3, array(
- 'role' => 'author',
- ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'exclude' => $users[1],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'exclude' => self::$author_ids[1],
</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"> $ids = $q->get_results();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Indirect test in order to ignore default user created during installation.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $ids );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotContains( $users[1], $ids );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotContains( self::$author_ids[1], $ids );
</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"> public function test_get_all() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->user->create_many( 3, array(
- 'role' => 'author'
- ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $users = new WP_User_Query( array( 'blog_id' => get_current_blog_id() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $users = $users->get_results();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // +1 for the default user created during installation.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 4, count( $users ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 13, count( $users ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $users as $user ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_User', $user );
</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"> $users = new WP_User_Query( array( 'blog_id' => get_current_blog_id(), 'fields' => 'all_with_meta' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $users = $users->get_results();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 4, count( $users ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 13, count( $users ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $users as $user ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_User', $user );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,22 +166,18 @@
</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_orderby_meta_value() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = $this->factory->user->create_many( 3, array(
- 'role' => 'author'
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_user_meta( self::$author_ids[0], 'last_name', 'Jones' );
+ update_user_meta( self::$author_ids[1], 'last_name', 'Albert' );
+ update_user_meta( self::$author_ids[2], 'last_name', 'Zorro' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_user_meta( $users[0], 'last_name', 'Jones' );
- update_user_meta( $users[1], 'last_name', 'Albert' );
- update_user_meta( $users[2], 'last_name', 'Zorro' );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'include' => $users,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'include' => self::$author_ids,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'meta_key' => 'last_name',
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'meta_value',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => '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">- $expected = array( $users[1], $users[0], $users[2] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = array( self::$author_ids[3], self::$author_ids[1], self::$author_ids[0], self::$author_ids[2] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected, $q->get_results() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,22 +186,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 27887
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_orderby_meta_value_num() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = $this->factory->user->create_many( 3, array(
- 'role' => 'author'
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_user_meta( self::$author_ids[0], 'user_age', '101' );
+ update_user_meta( self::$author_ids[1], 'user_age', '20' );
+ update_user_meta( self::$author_ids[2], 'user_age', '25' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_user_meta( $users[0], 'user_age', '101' );
- update_user_meta( $users[1], 'user_age', '20' );
- update_user_meta( $users[2], 'user_age', '25' );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'include' => $users,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'include' => self::$author_ids,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'meta_key' => 'user_age',
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'meta_value_num',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => '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">- $expected = array( $users[1], $users[2], $users[0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = array( self::$author_ids[1], self::$author_ids[2], self::$author_ids[0] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected, $q->get_results() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,22 +206,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31265
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_orderby_somekey_where_meta_key_is_somekey() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = $this->factory->user->create_many( 3, array(
- 'role' => 'author'
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_user_meta( self::$author_ids[0], 'foo', 'zzz' );
+ update_user_meta( self::$author_ids[1], 'foo', 'aaa' );
+ update_user_meta( self::$author_ids[2], 'foo', 'jjj' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_user_meta( $users[0], 'foo', 'zzz' );
- update_user_meta( $users[1], 'foo', 'aaa' );
- update_user_meta( $users[2], 'foo', 'jjj' );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'include' => $users,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'include' => self::$author_ids,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'meta_key' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => '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">- $expected = array( $users[1], $users[2], $users[0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = array( self::$author_ids[1], self::$author_ids[2], self::$author_ids[0] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected, $q->get_results() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,10 +226,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31265
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_orderby_clause_key() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = $this->factory->user->create_many( 3 );
- add_user_meta( $users[0], 'foo', 'aaa' );
- add_user_meta( $users[1], 'foo', 'zzz' );
- add_user_meta( $users[2], 'foo', 'jjj' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_user_meta( self::$author_ids[0], 'foo', 'aaa' );
+ add_user_meta( self::$author_ids[1], 'foo', 'zzz' );
+ add_user_meta( self::$author_ids[2], 'foo', 'jjj' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -224,20 +242,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'order' => 'DESC',
</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">- $this->assertEquals( array( $users[1], $users[2], $users[0] ), $q->results );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( array( self::$author_ids[1], self::$author_ids[2], self::$author_ids[0] ), $q->results );
</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 class="cx" style="display: block; padding: 0 10px"> * @ticket 31265
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_orderby_clause_key_as_secondary_sort() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u1 = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u1 = self::$static_factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_registered' => '2015-01-28 03:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u2 = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u2 = self::$static_factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_registered' => '2015-01-28 05:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u3 = $this->factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u3 = self::$static_factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user_registered' => '2015-01-28 03:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -266,15 +284,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31265
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_orderby_more_than_one_clause_key() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = $this->factory->user->create_many( 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_user_meta( self::$author_ids[0], 'foo', 'jjj' );
+ add_user_meta( self::$author_ids[1], 'foo', 'zzz' );
+ add_user_meta( self::$author_ids[2], 'foo', 'jjj' );
+ add_user_meta( self::$author_ids[0], 'bar', 'aaa' );
+ add_user_meta( self::$author_ids[1], 'bar', 'ccc' );
+ add_user_meta( self::$author_ids[2], 'bar', 'bbb' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_user_meta( $users[0], 'foo', 'jjj' );
- add_user_meta( $users[1], 'foo', 'zzz' );
- add_user_meta( $users[2], 'foo', 'jjj' );
- add_user_meta( $users[0], 'bar', 'aaa' );
- add_user_meta( $users[1], 'bar', 'ccc' );
- add_user_meta( $users[2], 'bar', 'bbb' );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -293,7 +309,7 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( array( $users[2], $users[0], $users[1] ), $q->results );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( array( self::$author_ids[2], self::$author_ids[0], self::$author_ids[1] ), $q->results );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,18 +329,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_orderby_include() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = $this->factory->user->create_many( 4 );
</del><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'include',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'include' => array( $users[1], $users[0], $users[3] ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'include' => array( self::$author_ids[1], self::$author_ids[0], self::$author_ids[3] ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => '',
</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">- $expected_orderby = 'ORDER BY FIELD( ' . $wpdb->users . '.ID, ' . $users[1] . ',' . $users[0] . ',' . $users[3] . ' )';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected_orderby = 'ORDER BY FIELD( ' . $wpdb->users . '.ID, ' . self::$author_ids[1] . ',' . self::$author_ids[0] . ',' . self::$author_ids[3] . ' )';
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( $expected_orderby, $q->query_orderby );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // assertEquals() respects order but ignores type (get_results() returns numeric strings).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( array( $users[1], $users[0], $users[3] ), $q->get_results() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( array( self::$author_ids[1], self::$author_ids[0], self::$author_ids[3] ), $q->get_results() );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -333,26 +348,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_orderby_include_duplicate_values() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = $this->factory->user->create_many( 4 );
</del><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'include',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'include' => array( $users[1], $users[0], $users[1], $users[3] ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'include' => array( self::$author_ids[1], self::$author_ids[0], self::$author_ids[1], self::$author_ids[3] ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => '',
</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">- $expected_orderby = 'ORDER BY FIELD( ' . $wpdb->users . '.ID, ' . $users[1] . ',' . $users[0] . ',' . $users[3] . ' )';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected_orderby = 'ORDER BY FIELD( ' . $wpdb->users . '.ID, ' . self::$author_ids[1] . ',' . self::$author_ids[0] . ',' . self::$author_ids[3] . ' )';
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( $expected_orderby, $q->query_orderby );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // assertEquals() respects order but ignores type (get_results() returns numeric strings).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( array( $users[1], $users[0], $users[3] ), $q->get_results() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( array( self::$author_ids[1], self::$author_ids[0], self::$author_ids[3] ), $q->get_results() );
</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 class="cx" style="display: block; padding: 0 10px"> * @ticket 31265
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_orderby_space_separated() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wpdb;
-
</del><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'login nicename',
</span><span class="cx" style="display: block; padding: 0 10px"> 'order' => 'ASC',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -365,8 +377,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31265
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_orderby_flat_array() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wpdb;
-
</del><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => array( 'login', 'nicename' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -378,8 +388,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31265
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_orderby_array_contains_invalid_item() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wpdb;
-
</del><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => array( 'login', 'foo', 'nicename' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -391,8 +399,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31265
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_orderby_array_contains_all_invalid_items() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wpdb;
-
</del><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => array( 'foo', 'bar', 'baz' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -404,8 +410,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31265
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_orderby_array() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wpdb;
-
</del><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'login' => 'DESC',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -421,8 +425,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31265
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_orderby_array_should_discard_invalid_columns() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wpdb;
-
</del><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'login' => 'DESC',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -439,15 +441,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_number() {
</span><span class="cx" style="display: block; padding: 0 10px"> // +1 for the default user created by the test suite.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_ids = $this->factory->user->create_many( 3 );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $users = new WP_User_Query( array( 'blog_id' => get_current_blog_id() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $users = $users->get_results();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 4, count( $users ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 13, count( $users ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $users = new WP_User_Query( array( 'blog_id' => get_current_blog_id(), 'number' => 10 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $users = $users->get_results();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 4, count( $users ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 10, count( $users ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $users = new WP_User_Query( array( 'blog_id' => get_current_blog_id(), 'number' => 2 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $users = $users->get_results();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -455,7 +455,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $users = new WP_User_Query( array( 'blog_id' => get_current_blog_id(), 'number' => -1 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $users = $users->get_results();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 4, count( $users ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 13, count( $users ) );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -525,11 +525,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23849
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_meta_query_with_role() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author_ids = $this->factory->user->create_many( 4, array( 'role' => 'author' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_user_meta( self::$author_ids[0], 'foo', 'bar' );
+ add_user_meta( self::$author_ids[1], 'foo', 'baz' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_user_meta( $author_ids[0], 'foo', 'bar' );
- add_user_meta( $author_ids[1], 'foo', 'baz' );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Users with foo = bar or baz restricted to the author role.
</span><span class="cx" style="display: block; padding: 0 10px"> $query = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -547,14 +545,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( array( $author_ids[0], $author_ids[1] ), $query->get_results() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( array( self::$author_ids[0], self::$author_ids[1] ), $query->get_results() );
</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"> public function test_roles_and_caps_should_be_populated_for_default_value_of_blog_id() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u = $this->factory->user->create( array( 'role' => 'author' ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $query = new WP_User_Query( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'include' => $u,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'include' => self::$author_ids[0],
</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"> $found = $query->get_results();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -570,10 +566,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( __METHOD__ . ' is a non-multisite-only test.' );
</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">- $u = $this->factory->user->create( array( 'role' => 'author' ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $query = new WP_User_Query( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'include' => $u,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'include' => self::$author_ids[0],
</ins><span class="cx" style="display: block; padding: 0 10px"> 'blog_id' => get_current_blog_id(),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -590,10 +584,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( __METHOD__ . ' is a multisite-only test.' );
</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">- $u = $this->factory->user->create( array( 'role' => 'author' ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $query = new WP_User_Query( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'include' => $u,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'include' => self::$author_ids[0],
</ins><span class="cx" style="display: block; padding: 0 10px"> 'blog_id' => get_current_blog_id(),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -611,11 +603,11 @@
</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"> $b = $this->factory->blog->create();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u = $this->factory->user->create();
- add_user_to_blog( $b, $u, 'author' );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_user_to_blog( $b, self::$author_ids[0], 'author' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $query = new WP_User_Query( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'include' => $u,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'include' => self::$author_ids[0],
</ins><span class="cx" style="display: block; padding: 0 10px"> 'blog_id' => $b,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'all_with_meta',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -637,12 +629,11 @@
</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"> $b = $this->factory->blog->create();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u = $this->factory->user->create();
- add_user_to_blog( $b, $u, 'author' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_user_to_blog( $b, self::$author_ids[0], 'author' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $query = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'all',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'include' => $u,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'include' => self::$author_ids[0],
</ins><span class="cx" style="display: block; padding: 0 10px"> 'blog_id' => $b,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -663,11 +654,10 @@
</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"> $b = $this->factory->blog->create();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = $this->factory->user->create_many( 3 );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_user_to_blog( $b, $users[0], 'subscriber' );
- add_user_to_blog( $b, $users[1], 'author' );
- add_user_to_blog( $b, $users[2], 'editor' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_user_to_blog( $b, self::$author_ids[0], 'subscriber' );
+ add_user_to_blog( $b, self::$author_ids[1], 'author' );
+ add_user_to_blog( $b, self::$author_ids[2], 'editor' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'who' => 'authors',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -676,9 +666,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_list_pluck( $q->get_results(), 'ID' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotContains( $users[0], $found );
- $this->assertContains( $users[1], $found );
- $this->assertContains( $users[2], $found );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotContains( self::$author_ids[0], $found );
+ $this->assertContains( self::$author_ids[1], $found );
+ $this->assertContains( self::$author_ids[2], $found );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -690,14 +680,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"> $b = $this->factory->blog->create();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = $this->factory->user->create_many( 3 );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_user_to_blog( $b, $users[0], 'subscriber' );
- add_user_to_blog( $b, $users[1], 'author' );
- add_user_to_blog( $b, $users[2], 'editor' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_user_to_blog( $b, self::$author_ids[0], 'subscriber' );
+ add_user_to_blog( $b, self::$author_ids[1], 'author' );
+ add_user_to_blog( $b, self::$author_ids[2], 'editor' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_user_meta( $users[1], 'foo', 'bar' );
- add_user_meta( $users[2], 'foo', 'baz' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_user_meta( self::$author_ids[1], 'foo', 'bar' );
+ add_user_meta( self::$author_ids[2], 'foo', 'baz' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'who' => 'authors',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -710,9 +699,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = wp_list_pluck( $q->get_results(), 'ID' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotContains( $users[0], $found );
- $this->assertContains( $users[1], $found );
- $this->assertNotContains( $users[2], $found );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNotContains( self::$author_ids[0], $found );
+ $this->assertContains( self::$author_ids[1], $found );
+ $this->assertNotContains( self::$author_ids[2], $found );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -722,17 +711,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'wptests_pt_public', array( 'public' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'wptests_pt_private', array( 'public' => false ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = $this->factory->user->create_many( 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->factory->post->create( array( 'post_author' => self::$author_ids[0], 'post_status' => 'publish', 'post_type' => 'wptests_pt_public' ) );
+ $this->factory->post->create( array( 'post_author' => self::$author_ids[1], 'post_status' => 'publish', 'post_type' => 'wptests_pt_private' ) );
</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->factory->post->create( array( 'post_author' => $users[0], 'post_status' => 'publish', 'post_type' => 'wptests_pt_public' ) );
- $this->factory->post->create( array( 'post_author' => $users[1], 'post_status' => 'publish', 'post_type' => 'wptests_pt_private' ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'has_published_posts' => true,
</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"> $found = wp_list_pluck( $q->get_results(), 'ID' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = array( $users[0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = array( self::$author_ids[0] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( $expected, $found );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -744,18 +731,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'wptests_pt_public', array( 'public' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'wptests_pt_private', array( 'public' => false ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = $this->factory->user->create_many( 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->factory->post->create( array( 'post_author' => self::$author_ids[0], 'post_status' => 'publish', 'post_type' => 'wptests_pt_public' ) );
+ $this->factory->post->create( array( 'post_author' => self::$author_ids[1], 'post_status' => 'publish', 'post_type' => 'wptests_pt_private' ) );
+ $this->factory->post->create( array( 'post_author' => self::$author_ids[2], 'post_status' => 'publish', 'post_type' => 'post' ) );
</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->factory->post->create( array( 'post_author' => $users[0], 'post_status' => 'publish', 'post_type' => 'wptests_pt_public' ) );
- $this->factory->post->create( array( 'post_author' => $users[1], 'post_status' => 'publish', 'post_type' => 'wptests_pt_private' ) );
- $this->factory->post->create( array( 'post_author' => $users[2], 'post_status' => 'publish', 'post_type' => 'post' ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'has_published_posts' => array( 'wptests_pt_private', 'post' ),
</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"> $found = wp_list_pluck( $q->get_results(), 'ID' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = array( $users[1], $users[2] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = array( self::$author_ids[1], self::$author_ids[2] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( $expected, $found );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -767,18 +752,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'wptests_pt_public', array( 'public' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'wptests_pt_private', array( 'public' => false ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = $this->factory->user->create_many( 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->factory->post->create( array( 'post_author' => self::$author_ids[0], 'post_status' => 'draft', 'post_type' => 'wptests_pt_public' ) );
+ $this->factory->post->create( array( 'post_author' => self::$author_ids[1], 'post_status' => 'inherit', 'post_type' => 'wptests_pt_private' ) );
+ $this->factory->post->create( array( 'post_author' => self::$author_ids[2], 'post_status' => 'publish', 'post_type' => 'post' ) );
</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->factory->post->create( array( 'post_author' => $users[0], 'post_status' => 'draft', 'post_type' => 'wptests_pt_public' ) );
- $this->factory->post->create( array( 'post_author' => $users[1], 'post_status' => 'inherit', 'post_type' => 'wptests_pt_private' ) );
- $this->factory->post->create( array( 'post_author' => $users[2], 'post_status' => 'publish', 'post_type' => 'post' ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'has_published_posts' => array( 'wptests_pt_public', 'wptests_pt_private', 'post' ),
</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"> $found = wp_list_pluck( $q->get_results(), 'ID' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = array( $users[2] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = array( self::$author_ids[2] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( $expected, $found );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -791,20 +774,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
</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">- $users = $this->factory->user->create_many( 3 );
</del><span class="cx" style="display: block; padding: 0 10px"> $blogs = $this->factory->blog->create_many( 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_user_to_blog( $blogs[0], $users[0], 'author' );
- add_user_to_blog( $blogs[0], $users[1], 'author' );
- add_user_to_blog( $blogs[1], $users[0], 'author' );
- add_user_to_blog( $blogs[1], $users[1], 'author' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_user_to_blog( $blogs[0], self::$author_ids[0], 'author' );
+ add_user_to_blog( $blogs[0], self::$author_ids[1], 'author' );
+ add_user_to_blog( $blogs[1], self::$author_ids[0], 'author' );
+ add_user_to_blog( $blogs[1], self::$author_ids[1], 'author' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blogs[0] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create( array( 'post_author' => $users[0], 'post_status' => 'publish', 'post_type' => 'post' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->factory->post->create( array( 'post_author' => self::$author_ids[0], 'post_status' => 'publish', 'post_type' => 'post' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blogs[1] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->post->create( array( 'post_author' => $users[1], 'post_status' => 'publish', 'post_type' => 'post' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->factory->post->create( array( 'post_author' => self::$author_ids[1], 'post_status' => 'publish', 'post_type' => 'post' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -813,7 +795,7 @@
</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"> $found = wp_list_pluck( $q->get_results(), 'ID' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = array( $users[1] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = array( self::$author_ids[1] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( $expected, $found );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -822,12 +804,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 32592
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_top_level_or_meta_query_should_eliminate_duplicate_matches() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = $this->factory->user->create_many( 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_user_meta( self::$author_ids[0], 'foo', 'bar' );
+ add_user_meta( self::$author_ids[1], 'foo', 'bar' );
+ add_user_meta( self::$author_ids[0], 'foo2', 'bar2' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_user_meta( $users[0], 'foo', 'bar' );
- add_user_meta( $users[1], 'foo', 'bar' );
- add_user_meta( $users[0], 'foo2', 'bar2' );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'relation' => 'OR',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -843,7 +823,7 @@
</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"> $found = wp_list_pluck( $q->get_results(), 'ID' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = array( $users[0], $users[1] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = array( self::$author_ids[0], self::$author_ids[1] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( $expected, $found );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -852,13 +832,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 32592
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_nested_or_meta_query_should_eliminate_duplicate_matches() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = $this->factory->user->create_many( 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_user_meta( self::$author_ids[0], 'foo', 'bar' );
+ add_user_meta( self::$author_ids[1], 'foo', 'bar' );
+ add_user_meta( self::$author_ids[0], 'foo2', 'bar2' );
+ add_user_meta( self::$author_ids[1], 'foo3', 'bar3' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_user_meta( $users[0], 'foo', 'bar' );
- add_user_meta( $users[1], 'foo', 'bar' );
- add_user_meta( $users[0], 'foo2', 'bar2' );
- add_user_meta( $users[1], 'foo3', 'bar3' );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'meta_query' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'relation' => 'AND',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -881,7 +859,7 @@
</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"> $found = wp_list_pluck( $q->get_results(), 'ID' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = array( $users[0], $users[1] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = array( self::$author_ids[0], self::$author_ids[1] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEqualSets( $expected, $found );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -890,8 +868,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 25145
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_paged() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = $this->factory->user->create_many( 5 );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'number' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'paged' => 2,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -900,7 +876,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => '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">- $this->assertEquals( array( $users[2], $users[1] ), $q->results );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( array( self::$contrib_id, self::$editor_ids[2] ), $q->results );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -929,14 +905,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_single_role_by_user_query() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->user->create_many( 2, array(
- 'role' => 'subscriber',
- ) );
-
- $this->factory->user->create( array(
- 'role' => 'contributor',
- ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $wp_user_search = new WP_User_Query( array( 'role' => 'subscriber' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $users = $wp_user_search->get_results();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -947,18 +915,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_multiple_roles_by_user_query() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->user->create_many( 2, array(
- 'role' => 'subscriber',
- ) );
-
- $this->factory->user->create_many( 3, array(
- 'role' => 'editor',
- ) );
-
- $this->factory->user->create( array(
- 'role' => 'contributor',
- ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $wp_user_search = new WP_User_Query( array( 'role__in' => array( 'subscriber', 'editor' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $users = $wp_user_search->get_results();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 5, count( $users ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -968,14 +924,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_single_role_by_string() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->user->create_many( 2, array(
- 'role' => 'subscriber',
- ) );
-
- $this->factory->user->create( array(
- 'role' => 'contributor',
- ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $users = get_users( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'subscriber',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -987,10 +935,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_single_role_by_string_which_is_similar() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $editors = $this->factory->user->create_many( 2, array(
- 'role' => 'editor',
- ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $another_editor = $this->factory->user->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'another-editor',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1000,7 +944,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => '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">- $this->assertEqualSets( $editors, $users );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSets( self::$editor_ids, $users );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1008,14 +952,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_single_role_by_array() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->user->create_many( 2, array(
- 'role' => 'subscriber',
- ) );
-
- $this->factory->user->create( array(
- 'role' => 'contributor',
- ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $users = get_users( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'role' => array( 'subscriber' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1027,24 +963,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_multiple_roles_should_only_match_users_who_have_each_role() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $subscribers = $this->factory->user->create_many( 2, array(
- 'role' => 'subscriber',
- ) );
-
- $this->factory->user->create_many( 3, array(
- 'role' => 'editor',
- ) );
-
- $this->factory->user->create_many( 2, array(
- 'role' => 'administrator',
- ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $users = new WP_User_Query( array( 'role' => array( 'subscriber', 'editor' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $users = $users->get_results();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $users );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $subscribers as $subscriber ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( self::$sub_ids as $subscriber ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $subscriber = get_user_by( 'ID', $subscriber );
</span><span class="cx" style="display: block; padding: 0 10px"> $subscriber->add_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1063,22 +987,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_multiple_roles_or() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->user->create_many( 2, array(
- 'role' => 'subscriber',
- ) );
-
- $this->factory->user->create_many( 3, array(
- 'role' => 'editor',
- ) );
-
- $this->factory->user->create_many( 2, array(
- 'role' => 'administrator',
- ) );
-
- $this->factory->user->create_many( 1, array(
- 'role' => 'contributor',
- ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $users = new WP_User_Query( array( 'role__in' => array( 'subscriber', 'editor', 'administrator' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $users = $users->get_results();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1093,21 +1001,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_multiple_roles_by_comma_separated_list() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $subscribers = $this->factory->user->create_many( 2, array(
- 'role' => 'subscriber',
- ) );
-
- $this->factory->user->create_many( 3, array(
- 'role' => 'editor',
- ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $users = get_users( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'subscriber, editor',
</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"> $this->assertEmpty( $users );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $subscribers as $subscriber ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( self::$sub_ids as $subscriber ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $subscriber = get_user_by( 'ID', $subscriber );
</span><span class="cx" style="display: block; padding: 0 10px"> $subscriber->add_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1124,24 +1024,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_multiple_roles_with_meta() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Create administrator user + meta
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $administrator_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
- update_user_meta( $administrator_id, 'mk1', 1 );
- update_user_meta( $administrator_id, 'mk2', 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_user_meta( self::$admin_ids[0], 'mk1', 1 );
+ update_user_meta( self::$admin_ids[0], 'mk2', 1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create editor user + meta
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $editor_id = $this->factory->user->create( array( 'role' => 'editor' ) );
- update_user_meta( $editor_id, 'mk1', 1 );
- update_user_meta( $editor_id, 'mk2', 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_user_meta( self::$editor_ids[0], 'mk1', 1 );
+ update_user_meta( self::$editor_ids[0], 'mk2', 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create subscriber user + meta
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $subscriber_id = $this->factory->user->create( array( 'role' => 'subscriber' ) );
- update_user_meta( $subscriber_id, 'mk1', 1 );
- update_user_meta( $subscriber_id, 'mk2', 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_user_meta( self::$sub_ids[0], 'mk1', 1 );
+ update_user_meta( self::$sub_ids[0], 'mk2', 1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create contributor user + meta
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $contributor_id = $this->factory->user->create( array( 'role' => 'contributor' ) );
- update_user_meta( $contributor_id, 'mk1', 1 );
- update_user_meta( $contributor_id, 'mk2', 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_user_meta( self::$contrib_id, 'mk1', 1 );
+ update_user_meta( self::$contrib_id, 'mk2', 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Fetch users
</span><span class="cx" style="display: block; padding: 0 10px"> $users = get_users( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1165,49 +1061,33 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check results
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, count( $users ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $editor_id, (int) $users[0]->ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( self::$editor_ids[0], (int) $users[0]->ID );
</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 class="cx" style="display: block; padding: 0 10px"> * @ticket 22212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_role_exclusion() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->user->create_many( 2, array(
- 'role' => 'subscriber',
- ) );
-
- $this->factory->user->create_many( 3, array(
- 'role' => 'editor',
- ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $users = get_users( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'role__not_in' => 'subscriber',
</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"> // +1 for the default user created during installation.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 4, count( $users ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 11, count( $users ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $users = get_users( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'role__not_in' => 'editor',
</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"> // +1 for the default user created during installation.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 3, count( $users ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 10, count( $users ) );
</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 class="cx" style="display: block; padding: 0 10px"> * @ticket 22212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_role__in_role__not_in_combined() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $subscribers = $this->factory->user->create_many( 2, array(
- 'role' => 'subscriber',
- ) );
-
- $this->factory->user->create_many( 3, array(
- 'role' => 'editor',
- ) );
-
- foreach ( $subscribers as $subscriber ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( self::$sub_ids as $subscriber ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $subscriber = get_user_by( 'ID', $subscriber );
</span><span class="cx" style="display: block; padding: 0 10px"> $subscriber->add_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1230,15 +1110,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_role__not_in_role_combined() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $subscribers = $this->factory->user->create_many( 2, array(
- 'role' => 'subscriber',
- ) );
-
- $this->factory->user->create_many( 3, array(
- 'role' => 'editor',
- ) );
-
- $subscriber = get_user_by( 'ID', $subscribers[0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $subscriber = get_user_by( 'ID', self::$sub_ids[0] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $subscriber->add_role( 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $users = get_users( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1253,29 +1125,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 22212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_role__not_in_user_without_role() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_without_rule = $this->factory->user->get_object_by_id( $this->factory->user->create( array(
- 'role' => 'subscriber',
- ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_without_rule = get_user_by( 'ID', self::$sub_ids[0] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user_without_rule->remove_role( 'subscriber' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->factory->user->create_many( 3, array(
- 'role' => 'editor',
- ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $users = get_users( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'role__not_in' => 'subscriber',
</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"> // +1 for the default user created during installation.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 5, count( $users ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 12, count( $users ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $users = get_users( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'role__not_in' => 'editor',
</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"> // +1 for the default user created during installation.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 2, count( $users ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 10, count( $users ) );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1287,17 +1153,16 @@
</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"> $sites = $this->factory->blog->create_many( 2 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $users = $this->factory->user->create_many( 2 );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_user_to_blog( $sites[0], $users[0], 'author' );
- add_user_to_blog( $sites[1], $users[1], 'author' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_user_to_blog( self::$author_ids[0], self::$author_ids[0], 'author' );
+ add_user_to_blog( self::$author_ids[1], self::$author_ids[1], 'author' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $found = get_users( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'blog_id' => $sites[1],
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ID',
</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">- $this->assertEqualSets( array( $users[1] ), $found );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEqualSets( array( self::$author_ids[1] ), $found );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1310,23 +1175,22 @@
</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"> $site_id = get_current_blog_id();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $u = $this->factory->user->create();
- add_user_to_blog( $site_id, $u, 'author' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_user_to_blog( $site_id, self::$author_ids[0], 'author' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = new WP_User_Query( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'include' => $u,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'include' => self::$author_ids[0],
</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"> $r1 = $q->request;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q->prepare_query( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'include' => $u,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'include' => self::$author_ids[0],
</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"> $r2 = $q->request;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q->prepare_query( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'include' => $u,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'include' => self::$author_ids[0],
</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"> $r3 = $q->request;
</span></span></pre>
</div>
</div>
</body>
</html>