<!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>[39913] trunk/tests/phpunit: REST API: Improve test coverage of single user endpoint for public data.</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/39913">39913</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/39913","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jnylen0</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-01-16 16:21:00 +0000 (Mon, 16 Jan 2017)</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'>REST API: Improve test coverage of single user endpoint for public data.
Add test coverage for requests of a single user resource for authors of post types registered as:
- public = true, show_in_rest = true: success without auth.
- public = true, show_in_rest = false: fail without auth.
- public = false, show_in_rest = true: success without auth.
- public = false, show_in_rest = false: fail without auth.
See <a href="https://core.trac.wordpress.org/ticket/38878">#38878</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/39546">#39546</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitincludestestcasephp">trunk/tests/phpunit/includes/testcase.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestcommentscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-comments-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestpostscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapiresttagscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-tags-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestuserscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-users-controller.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitincludestestcasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/testcase.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/testcase.php 2017-01-16 01:05:33 UTC (rev 39912)
+++ trunk/tests/phpunit/includes/testcase.php 2017-01-16 16:21:00 UTC (rev 39913)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,8 +184,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * it has a chance to do so.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function reset_post_types() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( get_post_types() as $pt ) {
- _unregister_post_type( $pt );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( get_post_types( array(), 'objects' ) as $pt ) {
+ if ( empty( $pt->tests_no_auto_unregister ) ) {
+ _unregister_post_type( $pt->name );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> create_initial_post_types();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestcommentscontrollerphp"></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/rest-api/rest-comments-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-comments-controller.php 2017-01-16 01:05:33 UTC (rev 39912)
+++ trunk/tests/phpunit/tests/rest-api/rest-comments-controller.php 2017-01-16 16:21:00 UTC (rev 39913)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,9 @@
</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 static function wpTearDownAfterClass() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::delete_user( self::$superadmin_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> self::delete_user( self::$admin_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::delete_user( self::$editor_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> self::delete_user( self::$subscriber_id );
</span><span class="cx" style="display: block; padding: 0 10px"> self::delete_user( self::$author_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestpostscontrollerphp"></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/rest-api/rest-posts-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php 2017-01-16 01:05:33 UTC (rev 39912)
+++ trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php 2017-01-16 16:21:00 UTC (rev 39913)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,6 +57,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_delete_post( self::$post_id, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::delete_user( self::$superadmin_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> self::delete_user( self::$editor_id );
</span><span class="cx" style="display: block; padding: 0 10px"> self::delete_user( self::$author_id );
</span><span class="cx" style="display: block; padding: 0 10px"> self::delete_user( self::$contributor_id );
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapiresttagscontrollerphp"></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/rest-api/rest-tags-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-tags-controller.php 2017-01-16 01:05:33 UTC (rev 39912)
+++ trunk/tests/phpunit/tests/rest-api/rest-tags-controller.php 2017-01-16 16:21:00 UTC (rev 39913)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,7 +35,9 @@
</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 static function wpTearDownAfterClass() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::delete_user( self::$superadmin );
</ins><span class="cx" style="display: block; padding: 0 10px"> self::delete_user( self::$administrator );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::delete_user( self::$editor );
</ins><span class="cx" style="display: block; padding: 0 10px"> self::delete_user( self::$subscriber );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestuserscontrollerphp"></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/rest-api/rest-users-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-users-controller.php 2017-01-16 01:05:33 UTC (rev 39912)
+++ trunk/tests/phpunit/tests/rest-api/rest-users-controller.php 2017-01-16 16:21:00 UTC (rev 39913)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,9 +13,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $superadmin;
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $user;
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $editor;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected static $editor2;
- protected static $secret_editor;
- protected static $secret_editor2;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected static $draft_editor;
+ protected static $authors = array();
+ protected static $posts = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> protected static $site;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public static function wpSetUpBeforeClass( $factory ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,17 +30,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'editor',
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_email' => 'editor@example.com',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$editor2 = $factory->user->create( array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$draft_editor = $factory->user->create( array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'editor',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user_email' => 'editor2@example.com',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user_email' => 'draft-editor@example.com',
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$secret_editor = $factory->user->create( array(
- 'role' => 'editor',
- 'user_email' => 'secret_editor@example.com',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ foreach ( array( true, false ) as $show_in_rest ) {
+ foreach ( array( true, false ) as $public ) {
+ $post_type_name = 'r_' . json_encode( $show_in_rest ) . '_p_' . json_encode( $public );
+ register_post_type( $post_type_name, array(
+ 'public' => $public,
+ 'show_in_rest' => $show_in_rest,
+ 'tests_no_auto_unregister' => true,
+ ) );
+ self::$authors[ $post_type_name ] = $factory->user->create( array(
+ 'role' => 'editor',
+ 'user_email' => 'author_' . $post_type_name . '@example.com',
+ ) );
+ self::$posts[ $post_type_name ] = $factory->post->create( array(
+ 'post_type' => $post_type_name,
+ 'post_author' => self::$authors[ $post_type_name ],
+ ) );
+ }
+ }
+
+ self::$posts['post'] = $factory->post->create( array(
+ 'post_type' => 'post',
+ 'post_author' => self::$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">- self::$secret_editor2 = $factory->user->create( array(
- 'role' => 'editor',
- 'user_email' => 'secret_editor2@example.com',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$posts['r_true_p_true_DRAFT'] = $factory->post->create( array(
+ 'post_type' => 'r_true_p_true',
+ 'post_author' => self::$draft_editor,
+ 'post_status' => 'draft',
</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"> if ( is_multisite() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,10 +73,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function wpTearDownAfterClass() {
</span><span class="cx" style="display: block; padding: 0 10px"> self::delete_user( self::$user );
</span><span class="cx" style="display: block; padding: 0 10px"> self::delete_user( self::$editor );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::delete_user( self::$editor2 );
- self::delete_user( self::$secret_editor );
- self::delete_user( self::$secret_editor2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::delete_user( self::$draft_editor );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( self::$posts as $post ) {
+ wp_delete_post( $post, true );
+ }
+ foreach ( self::$authors as $author ) {
+ self::delete_user( $author );
+ }
+ _unregister_post_type( 'r_true_p_true' );
+ _unregister_post_type( 'r_true_p_false' );
+ _unregister_post_type( 'r_false_p_true' );
+ _unregister_post_type( 'r_false_p_false' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wpmu_delete_blog( self::$site, true );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,12 +96,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- register_post_type( 'rest_public', array( 'public' => true, 'show_in_rest' => true ) );
- register_post_type( 'secret_public', array( 'public' => true, 'show_in_rest' => false ) );
- register_post_type( 'secret_hidden', array( 'public' => false, 'show_in_rest' => false ) );
- register_post_type( 'rest_hidden', array( 'public' => false, 'show_in_rest' => true ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $this->endpoint = new WP_REST_Users_Controller();
</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">@@ -169,36 +193,14 @@
</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_get_items_unauthenticated_includes_authors_of_post_types_shown_in_rest() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $created_posts = array();
- $created_posts[] = $this->factory->post->create( array(
- 'post_author' => self::$user,
- 'post_status' => 'publish',
- ) );
- // Expose authors if show_in_rest is true, even if the post_type is not public.
- $created_posts[] = $this->factory->post->create( array(
- 'post_type' => 'rest_hidden',
- 'post_author' => self::$editor,
- 'post_status' => 'publish',
- ) );
- $created_posts[] = $this->factory->post->create( array(
- 'post_type' => 'rest_public',
- 'post_author' => self::$editor2,
- 'post_status' => 'publish',
- ) );
- $created_posts[] = $this->factory->post->create( array(
- 'post_type' => 'rest_public',
- 'post_author' => self::$secret_editor,
- 'post_status' => 'draft',
- ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = $this->server->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px"> $users = $response->get_data();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $public_post_types = array_values( get_post_types( array( 'show_in_rest' => true ), 'names' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $rest_post_types = array_values( get_post_types( array( 'show_in_rest' => true ), 'names' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $users as $user ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( count_user_posts( $user['id'], $public_post_types ) > 0 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( count_user_posts( $user['id'], $rest_post_types ) > 0 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Ensure we don't expose non-public data.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayNotHasKey( 'capabilities', $user );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -213,55 +215,45 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayNotHasKey( 'locale', $user );
</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->assertTrue( in_array( self::$user, wp_list_pluck( $users, 'id' ), true ) );
- $this->assertTrue( in_array( self::$editor, wp_list_pluck( $users, 'id' ), true ) );
- $this->assertTrue( in_array( self::$editor2, wp_list_pluck( $users, 'id' ), true ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_ids = wp_list_pluck( $users, 'id' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Do not include authors of unpublished posts.
- $this->assertFalse( in_array( self::$secret_editor, wp_list_pluck( $users, 'id' ), true ) );
-
- foreach ( $created_posts as $post_id ) {
- wp_delete_post( $post_id, true );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( in_array( self::$editor , $user_ids, true ) );
+ $this->assertTrue( in_array( self::$authors['r_true_p_true'] , $user_ids, true ) );
+ $this->assertTrue( in_array( self::$authors['r_true_p_false'], $user_ids, true ) );
+ $this->assertCount( 3, $user_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_items_unauthenticated_does_not_include_authors_of_post_types_not_shown_in_rest() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $created_posts = array();
- $created_posts[] = $this->factory->post->create( array(
- 'post_type' => 'secret_hidden',
- 'post_author' => self::$secret_editor,
- 'post_status' => 'publish',
- ) );
- $created_posts[] = $this->factory->post->create( array(
- 'post_type' => 'secret_public',
- 'post_author' => self::$secret_editor2,
- 'post_status' => 'publish',
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
+ $response = $this->server->dispatch( $request );
+ $users = $response->get_data();
+ $user_ids = wp_list_pluck( $users, 'id' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( in_array( self::$authors['r_false_p_true'] , $user_ids, true ) );
+ $this->assertFalse( in_array( self::$authors['r_false_p_false'], $user_ids, true ) );
+ }
+
+ public function test_get_items_unauthenticated_does_not_include_users_without_published_posts() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = $this->server->dispatch( $request );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data = $response->get_data();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $users = $response->get_data();
+ $user_ids = wp_list_pluck( $users, 'id' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertFalse( in_array( self::$secret_editor, wp_list_pluck( $data, 'id' ), true ) );
- $this->assertFalse( in_array( self::$secret_editor2, wp_list_pluck( $data, 'id' ), true ) );
-
- foreach ( $created_posts as $post_id ) {
- wp_delete_post( $post_id, true );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( in_array( self::$draft_editor, $user_ids, true ) );
+ $this->assertFalse( in_array( self::$user , $user_ids, true ) );
</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_items_pagination_headers() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$user );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Start of the index, including the six existing users.
</del><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < 44; $i++ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->factory->user->create( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => "User {$i}",
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => "User {$i}",
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = $this->server->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px"> $headers = $response->get_headers();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 51, $headers['X-WP-Total'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 53, $headers['X-WP-Total'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 6, $headers['X-WP-TotalPages'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $next_link = add_query_arg( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 2,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -276,7 +268,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( 'page', 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = $this->server->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px"> $headers = $response->get_headers();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 52, $headers['X-WP-Total'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 54, $headers['X-WP-Total'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 6, $headers['X-WP-TotalPages'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $prev_link = add_query_arg( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 2,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -291,7 +283,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( 'page', 6 );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = $this->server->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px"> $headers = $response->get_headers();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 52, $headers['X-WP-Total'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 54, $headers['X-WP-Total'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 6, $headers['X-WP-TotalPages'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $prev_link = add_query_arg( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 5,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -303,7 +295,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( 'page', 8 );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = $this->server->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px"> $headers = $response->get_headers();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 52, $headers['X-WP-Total'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 54, $headers['X-WP-Total'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 6, $headers['X-WP-TotalPages'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $prev_link = add_query_arg( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 6,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -474,12 +466,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_items_offset() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$user );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // 5 users created in __construct(), plus default user.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 7 users created in wpSetUpBeforeClass(), plus default user.
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->factory->user->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( 'offset', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = $this->server->dispatch( $request );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertCount( 7, $response->get_data() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertCount( 9, $response->get_data() );
</ins><span class="cx" style="display: block; padding: 0 10px"> // 'offset' works with 'per_page'
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( 'per_page', 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = $this->server->dispatch( $request );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -530,6 +522,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $id1 = $this->factory->user->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $id2 = $this->factory->user->create();
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $request->set_param( 'per_page', 20 ); // there are >10 users at this point
</ins><span class="cx" style="display: block; padding: 0 10px"> $response = $this->server->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $response->get_data();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( in_array( $id1, wp_list_pluck( $data, 'id' ), true ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -688,15 +681,63 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $data['extra_capabilities'], new stdClass() );
</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">- public function test_get_item_without_permission() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_cannot_get_item_without_permission() {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$editor );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/users/%d', self::$user ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = $this->server->dispatch( $request );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertErrorResponse( 'rest_user_cannot_view', $response, 403 );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_can_get_item_author_of_rest_true_public_true_unauthenticated() {
+ $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/users/%d', self::$authors['r_true_p_true'] ) );
+ $response = $this->server->dispatch( $request );
+ $this->assertEquals( 200, $response->get_status() );
+ }
+
+ public function test_can_get_item_author_of_rest_true_public_true_authenticated() {
+ wp_set_current_user( self::$editor );
+ $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/users/%d', self::$authors['r_true_p_true'] ) );
+ $response = $this->server->dispatch( $request );
+ $this->assertEquals( 200, $response->get_status() );
+ }
+
+ public function test_can_get_item_author_of_rest_true_public_false() {
+ $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/users/%d', self::$authors['r_true_p_false'] ) );
+ $response = $this->server->dispatch( $request );
+ $this->assertEquals( 200, $response->get_status() );
+ }
+
+ public function test_cannot_get_item_author_of_rest_false_public_true_unauthenticated() {
+ $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/users/%d', self::$authors['r_false_p_true'] ) );
+ $response = $this->server->dispatch( $request );
+ $this->assertErrorResponse( 'rest_user_cannot_view', $response, 401 );
+ }
+
+ public function test_cannot_get_item_author_of_rest_false_public_true_without_permission() {
+ wp_set_current_user( self::$editor );
+ $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/users/%d', self::$authors['r_false_p_true'] ) );
+ $response = $this->server->dispatch( $request );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertErrorResponse( 'rest_user_cannot_view', $response, 403 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_cannot_get_item_author_of_rest_false_public_false() {
+ $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/users/%d', self::$authors['r_false_p_false'] ) );
+ $response = $this->server->dispatch( $request );
+ $this->assertErrorResponse( 'rest_user_cannot_view', $response, 401 );
+ }
+
+ public function test_can_get_item_author_of_post() {
+ $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/users/%d', self::$editor ) );
+ $response = $this->server->dispatch( $request );
+ $this->assertEquals( 200, $response->get_status() );
+ }
+
+ public function test_cannot_get_item_author_of_draft() {
+ $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/users/%d', self::$draft_editor ) );
+ $response = $this->server->dispatch( $request );
+ $this->assertErrorResponse( 'rest_user_cannot_view', $response, 401 );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_get_item_published_author_post() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->author_id = $this->factory->user->create( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'role' => 'author',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2166,11 +2207,6 @@
</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 tearDown() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _unregister_post_type( 'rest_public' );
- _unregister_post_type( 'secret_public' );
- _unregister_post_type( 'secret_hidden' );
- _unregister_post_type( 'rest_hidden' );
-
</del><span class="cx" style="display: block; padding: 0 10px"> parent::tearDown();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>