Changeset 46657

Timestamp:

11/05/2019 08:41:12 PM (7 years ago)

Author:

SergeyBiryukov

Message:

REST API: Speed up pagination unit tests by creating less fixtures and reusing them where possible.

Includes minor documentation and code layout fixes for better readability.

See #30017, #48145.

Location:

trunk/tests/phpunit/tests/rest-api

Files:

• rest-attachments-controller.php (modified) (1 diff)
• rest-categories-controller.php (modified) (51 diffs)
• rest-comments-controller.php (modified) (121 diffs)
• rest-pages-controller.php (modified) (7 diffs)
• rest-posts-controller.php (modified) (127 diffs)
• rest-tags-controller.php (modified) (62 diffs)
• rest-users-controller.php (modified) (115 diffs)

trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php

@@ -1452 +1452 @@
 
         public function test_search_item_by_filename() {
-                $id  = $this->factory->attachment->create_object(
+                $id1 = $this->factory->attachment->create_object(
                         $this->test_file,
                         0,

trunk/tests/phpunit/tests/rest-api/rest-categories-controller.php

@@ -16 +16 @@
         protected static $subscriber;
 
+        protected static $category_ids     = array();
+        protected static $total_categories = 30;
+        protected static $per_page         = 50;
+
         public static function wpSetUpBeforeClass( $factory ) {
                 self::$administrator = $factory->user->create(
@@ -32 +36 @@
                         )
                 );
+
+                // Set up categories for pagination tests.
+                for ( $i = 0; $i < self::$total_categories - 1; $i++ ) {
+                        $category_ids[] = $factory->category->create(
+                                array(
+                                        'name' => "Category {$i}",
+                                )
+                        );
+                }
         }
 
@@ -37 +50 @@
                 self::delete_user( self::$administrator );
                 self::delete_user( self::$subscriber );
+
+                // Remove categories for pagination tests.
+                foreach ( self::$category_ids as $category_id ) {
+                        wp_delete_term( $category_id, 'category' );
+                }
         }
 
@@ -137 +155 @@
 
         public function test_get_items() {
-                $request  = new WP_REST_Request( 'GET', '/wp/v2/categories' );
+                $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
+                $request->set_param( 'per_page', self::$per_page );
                 $response = rest_get_server()->dispatch( $request );
                 $this->check_get_taxonomy_terms_response( $response );
@@ -144 +163 @@
         public function test_get_items_invalid_permission_for_context() {
                 wp_set_current_user( 0 );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
                 $request->set_param( 'context', 'edit' );
@@ -154 +174 @@
                 $category1 = $this->factory->category->create( array( 'name' => 'Season 5' ) );
                 $category2 = $this->factory->category->create( array( 'name' => 'The Be Sharps' ) );
+
+                $total_categories = self::$total_categories + 2;
+
                 wp_set_object_terms( $post_id, array( $category1, $category2 ), 'category' );
-                $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
+
+                $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
+                $request->set_param( 'per_page', self::$per_page );
                 $request->set_param( 'hide_empty', true );
                 $response = rest_get_server()->dispatch( $request );
@@ -167 +192 @@
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
-                $this->assertEquals( 3, count( $data ) );
+                $this->assertEquals( $total_categories, count( $data ) );
         }
 
@@ -185 +210 @@
                         )
                 );
-                $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
+
+                $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
+                $request->set_param( 'per_page', self::$per_page );
                 $request->set_param( 'parent', 0 );
                 $response = rest_get_server()->dispatch( $request );
@@ -215 +242 @@
                         )
                 );
-                $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
+
+                $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
+                $request->set_param( 'per_page', self::$per_page );
                 $request->set_param( 'parent', '0' );
                 $response = rest_get_server()->dispatch( $request );
@@ -255 +284 @@
         public function test_get_items_include_query() {
                 $id1 = $this->factory->category->create();
-                $this->factory->category->create();
-                $id3     = $this->factory->category->create();
-                $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
-                // Orderby=>asc
-                $request->set_param( 'include', array( $id3, $id1 ) );
+                $id2 = $this->factory->category->create();
+
+                $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
+
+                // 'orderby' => 'asc'.
+                $request->set_param( 'include', array( $id2, $id1 ) );
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
                 $this->assertEquals( 2, count( $data ) );
                 $this->assertEquals( $id1, $data[0]['id'] );
-                // Orderby=>include
+
+                // 'orderby' => 'include'.
                 $request->set_param( 'orderby', 'include' );
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
                 $this->assertEquals( 2, count( $data ) );
-                $this->assertEquals( $id3, $data[0]['id'] );
+                $this->assertEquals( $id2, $data[0]['id'] );
         }
 
         public function test_get_items_exclude_query() {
-                $id1      = $this->factory->category->create();
-                $id2      = $this->factory->category->create();
-                $request  = new WP_REST_Request( 'GET', '/wp/v2/categories' );
-                $response = rest_get_server()->dispatch( $request );
-                $data     = $response->get_data();
-                $this->assertTrue( in_array( $id1, wp_list_pluck( $data, 'id' ), true ) );
-                $this->assertTrue( in_array( $id2, wp_list_pluck( $data, 'id' ), true ) );
+                $id1 = $this->factory->category->create();
+                $id2 = $this->factory->category->create();
+
+                $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
+                $request->set_param( 'per_page', self::$per_page );
+                $response = rest_get_server()->dispatch( $request );
+                $data     = $response->get_data();
+                $ids      = wp_list_pluck( $data, 'id' );
+                $this->assertTrue( in_array( $id1, $ids, true ) );
+                $this->assertTrue( in_array( $id2, $ids, true ) );
+
                 $request->set_param( 'exclude', array( $id2 ) );
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
-                $this->assertTrue( in_array( $id1, wp_list_pluck( $data, 'id' ), true ) );
-                $this->assertFalse( in_array( $id2, wp_list_pluck( $data, 'id' ), true ) );
+                $ids      = wp_list_pluck( $data, 'id' );
+                $this->assertTrue( in_array( $id1, $ids, true ) );
+                $this->assertFalse( in_array( $id2, $ids, true ) );
         }
 
@@ -290 +326 @@
                 $this->factory->category->create( array( 'name' => 'Apple' ) );
                 $this->factory->category->create( array( 'name' => 'Banana' ) );
+
                 /*
                  * Tests:
@@ -305 +342 @@
                 $this->assertEquals( 1, count( $data ) );
                 $this->assertEquals( 'Uncategorized', $data[0]['name'] );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
                 $request->set_param( 'orderby', 'name' );
@@ -320 +358 @@
                 $this->factory->category->create( array( 'name' => 'Apple' ) );
                 $this->factory->category->create( array( 'name' => 'Banana' ) );
-                // defaults to orderby=name, order=asc
+
+                // Defaults to 'orderby' => 'name', 'order' => 'asc'.
                 $request  = new WP_REST_Request( 'GET', '/wp/v2/categories' );
                 $response = rest_get_server()->dispatch( $request );
@@ -328 +367 @@
                 $this->assertEquals( 'Banana', $data[1]['name'] );
                 $this->assertEquals( 'Cantaloupe', $data[2]['name'] );
-                $this->assertEquals( 'Uncategorized', $data[3]['name'] );
-                // orderby=id, with default order=asc
+
+                // 'orderby' => 'id', with default 'order' => 'asc'.
                 $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
                 $request->set_param( 'orderby', 'id' );
@@ -335 +374 @@
                 $this->assertEquals( 200, $response->get_status() );
                 $data = $response->get_data();
-                $this->assertEquals( 'Uncategorized', $data[0]['name'] );
-                $this->assertEquals( 'Cantaloupe', $data[1]['name'] );
-                $this->assertEquals( 'Apple', $data[2]['name'] );
-                $this->assertEquals( 'Banana', $data[3]['name'] );
-                // orderby=id, order=desc
+                $this->assertEquals( 'Category 0', $data[1]['name'] );
+                $this->assertEquals( 'Category 1', $data[2]['name'] );
+                $this->assertEquals( 'Category 2', $data[3]['name'] );
+
+                // 'orderby' => 'id', 'order' => 'desc'.
                 $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
                 $request->set_param( 'orderby', 'id' );
@@ -487 +526 @@
                 $this->factory->category->create( array( 'name' => 'Apple' ) );
                 $this->factory->category->create( array( 'name' => 'Banana' ) );
+
                 /*
                  * Tests:
@@ -498 +538 @@
                 $this->assertEquals( 1, count( $data ) );
                 $this->assertEquals( 'Apple', $data[0]['name'] );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
                 $request->set_param( 'search', 'Garbage' );
@@ -509 +550 @@
                 $this->factory->category->create( array( 'name' => 'Apple' ) );
                 $this->factory->category->create( array( 'name' => 'Banana' ) );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
                 $request->set_param( 'slug', 'apple' );
@@ -526 +568 @@
                         )
                 );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
                 $request->set_param( 'parent', $category1 );
@@ -535 +578 @@
 
         public function test_get_terms_invalid_parent_arg() {
-                $category1 = $this->factory->category->create( array( 'name' => 'Parent' ) );
-                $this->factory->category->create(
-                        array(
-                                'name'   => 'Child',
-                                'parent' => $category1,
-                        )
-                );
                 $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
                 $request->set_param( 'parent', 'invalid-parent' );
@@ -575 +611 @@
 
         public function test_get_terms_pagination_headers() {
-                // Start of the index + Uncategorized default term
-                for ( $i = 0; $i < 49; $i++ ) {
-                        $this->factory->category->create(
-                                array(
-                                        'name' => "Category {$i}",
-                                )
-                        );
-                }
+                $total_categories = self::$total_categories;
+                $total_pages      = (int) ceil( $total_categories / 10 );
+
+                // Start of the index + Uncategorized default term.
                 $request  = new WP_REST_Request( 'GET', '/wp/v2/categories' );
                 $response = rest_get_server()->dispatch( $request );
                 $headers  = $response->get_headers();
-                $this->assertEquals( 50, $headers['X-WP-Total'] );
-                $this->assertEquals( 5, $headers['X-WP-TotalPages'] );
+                $this->assertEquals( $total_categories, $headers['X-WP-Total'] );
+                $this->assertEquals( $total_pages, $headers['X-WP-TotalPages'] );
                 $this->assertCount( 10, $response->get_data() );
                 $next_link = add_query_arg(
@@ -597 +629 @@
                 $this->assertFalse( stripos( $headers['Link'], 'rel="prev"' ) );
                 $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
-                // 3rd page
-                $this->factory->category->create(
-                        array(
-                                'name' => 'Category 51',
-                        )
-                );
+
+                // 3rd page.
+                $this->factory->category->create();
+                $total_categories++;
+                $total_pages++;
                 $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
                 $request->set_param( 'page', 3 );
                 $response = rest_get_server()->dispatch( $request );
                 $headers  = $response->get_headers();
-                $this->assertEquals( 51, $headers['X-WP-Total'] );
-                $this->assertEquals( 6, $headers['X-WP-TotalPages'] );
+                $this->assertEquals( $total_categories, $headers['X-WP-Total'] );
+                $this->assertEquals( $total_pages, $headers['X-WP-TotalPages'] );
                 $this->assertCount( 10, $response->get_data() );
                 $prev_link = add_query_arg(
@@ -624 +655 @@
                 );
                 $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
-                // Last page
-                $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
-                $request->set_param( 'page', 6 );
+
+                // Last page.
+                $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
+                $request->set_param( 'page', $total_pages );
                 $response = rest_get_server()->dispatch( $request );
                 $headers  = $response->get_headers();
-                $this->assertEquals( 51, $headers['X-WP-Total'] );
-                $this->assertEquals( 6, $headers['X-WP-TotalPages'] );
+                $this->assertEquals( $total_categories, $headers['X-WP-Total'] );
+                $this->assertEquals( $total_pages, $headers['X-WP-TotalPages'] );
                 $this->assertCount( 1, $response->get_data() );
                 $prev_link = add_query_arg(
                         array(
-                                'page' => 5,
+                                'page' => $total_pages - 1,
                         ),
                         rest_url( 'wp/v2/categories' )
@@ -640 +672 @@
                 $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
                 $this->assertFalse( stripos( $headers['Link'], 'rel="next"' ) );
-                // Out of bounds
-                $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
-                $request->set_param( 'page', 8 );
+
+                // Out of bounds.
+                $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
+                $request->set_param( 'page', 100 );
                 $response = rest_get_server()->dispatch( $request );
                 $headers  = $response->get_headers();
-                $this->assertEquals( 51, $headers['X-WP-Total'] );
-                $this->assertEquals( 6, $headers['X-WP-TotalPages'] );
+                $this->assertEquals( $total_categories, $headers['X-WP-Total'] );
+                $this->assertEquals( $total_pages, $headers['X-WP-TotalPages'] );
                 $this->assertCount( 0, $response->get_data() );
                 $prev_link = add_query_arg(
                         array(
-                                'page' => 6,
+                                'page' => $total_pages,
                         ),
                         rest_url( 'wp/v2/categories' )
@@ -659 +692 @@
 
         public function test_get_items_per_page_exceeds_number_of_items() {
-                // Start of the index + Uncategorized default term
-                for ( $i = 0; $i < 17; $i++ ) {
-                        $this->factory->category->create(
-                                array(
-                                        'name' => "Category {$i}",
-                                )
-                        );
-                }
+                // Start of the index + Uncategorized default term.
                 $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
                 $request->set_param( 'page', 1 );
@@ -672 +698 @@
                 $response = rest_get_server()->dispatch( $request );
                 $headers  = $response->get_headers();
-                $this->assertEquals( 18, $headers['X-WP-Total'] );
+                $this->assertEquals( self::$total_categories, $headers['X-WP-Total'] );
                 $this->assertEquals( 1, $headers['X-WP-TotalPages'] );
-                $this->assertCount( 18, $response->get_data() );
+                $this->assertCount( self::$total_categories, $response->get_data() );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
                 $request->set_param( 'page', 2 );
@@ -680 +707 @@
                 $response = rest_get_server()->dispatch( $request );
                 $headers  = $response->get_headers();
-                $this->assertEquals( 18, $headers['X-WP-Total'] );
+                $this->assertEquals( self::$total_categories, $headers['X-WP-Total'] );
                 $this->assertEquals( 1, $headers['X-WP-TotalPages'] );
                 $this->assertCount( 0, $response->get_data() );
@@ -738 +765 @@
         public function test_get_item_invalid_permission_for_context() {
                 wp_set_current_user( 0 );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/categories/1' );
                 $request->set_param( 'context', 'edit' );
@@ -760 +788 @@
         public function test_get_item_incorrect_taxonomy() {
                 register_taxonomy( 'robin', 'post' );
-                $term1    = $this->factory->term->create(
+                $term1 = $this->factory->term->create(
                         array(
                                 'name'     => 'Cape',
@@ -766 +794 @@
                         )
                 );
+
                 $request  = new WP_REST_Request( 'GET', '/wp/v2/categories/' . $term1 );
                 $response = rest_get_server()->dispatch( $request );
@@ -773 +802 @@
         public function test_create_item() {
                 wp_set_current_user( self::$administrator );
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/categories' );
                 $request->set_param( 'name', 'My Awesome Term' );
@@ -792 +822 @@
         public function test_create_item_term_already_exists() {
                 wp_set_current_user( self::$administrator );
+
                 $existing_id = $this->factory->category->create( array( 'name' => 'Existing' ) );
 
@@ -808 +839 @@
         public function test_create_item_invalid_taxonomy() {
                 wp_set_current_user( self::$administrator );
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/invalid-taxonomy' );
                 $request->set_param( 'name', 'Invalid Taxonomy' );
@@ -816 +848 @@
         public function test_create_item_incorrect_permissions() {
                 wp_set_current_user( self::$subscriber );
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/categories' );
                 $request->set_param( 'name', 'Incorrect permissions' );
@@ -824 +857 @@
         public function test_create_item_incorrect_permissions_contributor() {
                 wp_set_current_user( self::$contributor );
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/categories' );
                 $request->set_param( 'name', 'Incorrect permissions' );
@@ -832 +866 @@
         public function test_create_item_missing_arguments() {
                 wp_set_current_user( self::$administrator );
+
                 $request  = new WP_REST_Request( 'POST', '/wp/v2/categories' );
                 $response = rest_get_server()->dispatch( $request );
@@ -839 +874 @@
         public function test_create_item_with_parent() {
                 wp_set_current_user( self::$administrator );
-                $parent  = wp_insert_term( 'test-category', 'category' );
+
+                $parent = wp_insert_term( 'test-category', 'category' );
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/categories' );
                 $request->set_param( 'name', 'My Awesome Term' );
@@ -851 +888 @@
         public function test_create_item_invalid_parent() {
                 wp_set_current_user( self::$administrator );
+
                 $term = get_term_by( 'id', $this->factory->category->create(), 'category' );
 
@@ -862 +900 @@
         public function test_create_item_with_no_parent() {
                 wp_set_current_user( self::$administrator );
-                $parent  = 0;
+
+                $parent = 0;
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/categories' );
                 $request->set_param( 'name', 'My Awesome Term' );
@@ -874 +914 @@
         public function test_update_item() {
                 wp_set_current_user( self::$administrator );
+
                 $orig_args = array(
                         'name'        => 'Original Name',
@@ -879 +920 @@
                         'slug'        => 'original-slug',
                 );
-                $term      = get_term_by( 'id', $this->factory->category->create( $orig_args ), 'category' );
-                $request   = new WP_REST_Request( 'POST', '/wp/v2/categories/' . $term->term_id );
+
+                $term = get_term_by( 'id', $this->factory->category->create( $orig_args ), 'category' );
+
+                $request = new WP_REST_Request( 'POST', '/wp/v2/categories/' . $term->term_id );
                 $request->set_param( 'name', 'New Name' );
                 $request->set_param( 'description', 'New Description' );
@@ -905 +948 @@
         public function test_update_item_invalid_taxonomy() {
                 wp_set_current_user( self::$administrator );
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/invalid-taxonomy/' . REST_TESTS_IMPOSSIBLY_HIGH_NUMBER );
                 $request->set_param( 'name', 'Invalid Taxonomy' );
@@ -913 +957 @@
         public function test_update_item_invalid_term() {
                 wp_set_current_user( self::$administrator );
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/categories/' . REST_TESTS_IMPOSSIBLY_HIGH_NUMBER );
                 $request->set_param( 'name', 'Invalid Term' );
@@ -921 +966 @@
         public function test_update_item_incorrect_permissions() {
                 wp_set_current_user( self::$subscriber );
-                $term    = get_term_by( 'id', $this->factory->category->create(), 'category' );
+
+                $term = get_term_by( 'id', $this->factory->category->create(), 'category' );
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/categories/' . $term->term_id );
                 $request->set_param( 'name', 'Incorrect permissions' );
@@ -930 +977 @@
         public function test_update_item_parent() {
                 wp_set_current_user( self::$administrator );
+
                 $parent = get_term_by( 'id', $this->factory->category->create(), 'category' );
                 $term   = get_term_by( 'id', $this->factory->category->create(), 'category' );
@@ -971 +1019 @@
         public function test_update_item_invalid_parent() {
                 wp_set_current_user( self::$administrator );
+
                 $term = get_term_by( 'id', $this->factory->category->create(), 'category' );
 
@@ -981 +1030 @@
         public function test_delete_item() {
                 wp_set_current_user( self::$administrator );
-                $term    = get_term_by( 'id', $this->factory->category->create( array( 'name' => 'Deleted Category' ) ), 'category' );
+
+                $term = get_term_by( 'id', $this->factory->category->create( array( 'name' => 'Deleted Category' ) ), 'category' );
+
                 $request = new WP_REST_Request( 'DELETE', '/wp/v2/categories/' . $term->term_id );
                 $request->set_param( 'force', true );
@@ -993 +1044 @@
         public function test_delete_item_no_trash() {
                 wp_set_current_user( self::$administrator );
+
                 $term = get_term_by( 'id', $this->factory->category->create( array( 'name' => 'Deleted Category' ) ), 'category' );
 
@@ -1006 +1058 @@
         public function test_delete_item_invalid_taxonomy() {
                 wp_set_current_user( self::$administrator );
+
                 $request  = new WP_REST_Request( 'DELETE', '/wp/v2/invalid-taxonomy/' . REST_TESTS_IMPOSSIBLY_HIGH_NUMBER );
                 $response = rest_get_server()->dispatch( $request );
@@ -1013 +1066 @@
         public function test_delete_item_invalid_term() {
                 wp_set_current_user( self::$administrator );
+
                 $request  = new WP_REST_Request( 'DELETE', '/wp/v2/categories/' . REST_TESTS_IMPOSSIBLY_HIGH_NUMBER );
                 $response = rest_get_server()->dispatch( $request );
@@ -1020 +1074 @@
         public function test_delete_item_incorrect_permissions() {
                 wp_set_current_user( self::$subscriber );
+
                 $term     = get_term_by( 'id', $this->factory->category->create(), 'category' );
                 $request  = new WP_REST_Request( 'DELETE', '/wp/v2/categories/' . $term->term_id );

trunk/tests/phpunit/tests/rest-api/rest-comments-controller.php

@@ -26 +26 @@
         protected static $hold_id;
 
+        protected static $comment_ids    = array();
+        protected static $total_comments = 30;
+        protected static $per_page       = 50;
+
         protected $endpoint;
 
@@ -111 +115 @@
                         )
                 );
+
+                // Set up comments for pagination tests.
+                for ( $i = 0; $i < self::$total_comments - 1; $i++ ) {
+                        $comment_ids[] = $factory->comment->create(
+                                array(
+                                        'comment_content' => "Comment {$i}",
+                                        'comment_post_ID' => self::$post_id,
+                                )
+                        );
+                }
         }
 
@@ -130 +144 @@
                 wp_delete_post( self::$approved_id, true );
                 wp_delete_post( self::$hold_id, true );
+
+                // Remove comments for pagination tests.
+                foreach ( self::$comment_ids as $comment_id ) {
+                        wp_delete_comment( $comment_id, true );
+                }
         }
 
@@ -198 +217 @@
 
         public function test_get_items() {
-                $this->factory->comment->create_post_comments( self::$post_id, 6 );
-
                 $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
+                $request->set_param( 'per_page', self::$per_page );
 
                 $response = rest_get_server()->dispatch( $request );
@@ -206 +224 @@
 
                 $comments = $response->get_data();
-                // We created 6 comments in this method, plus self::$approved_id.
-                $this->assertCount( 7, $comments );
+                $this->assertCount( self::$total_comments, $comments );
         }
 
@@ -216 +233 @@
                 wp_set_current_user( 0 );
 
-                $args             = array(
+                $args = array(
                         'comment_approved' => 1,
                         'comment_post_ID'  => self::$password_id,
                 );
+
                 $password_comment = $this->factory->comment->create( $args );
 
@@ -238 +256 @@
         public function test_get_items_with_password_without_post() {
                 wp_set_current_user( 0 );
-                $args             = array(
+
+                $args = array(
                         'comment_approved' => 1,
                         'comment_post_ID'  => self::$password_id,
                 );
+
                 $password_comment = $this->factory->comment->create( $args );
 
@@ -259 +279 @@
         public function test_get_items_with_password_with_multiple_post() {
                 wp_set_current_user( 0 );
-                $args             = array(
+
+                $args = array(
                         'comment_approved' => 1,
                         'comment_post_ID'  => self::$password_id,
                 );
+
                 $password_comment = $this->factory->comment->create( $args );
 
@@ -276 +298 @@
                 wp_set_current_user( 0 );
 
-                $args             = array(
+                $args = array(
                         'comment_approved' => 1,
                         'comment_post_ID'  => self::$password_id,
                 );
+
                 $password_comment = $this->factory->comment->create( $args );
 
@@ -294 +317 @@
                 wp_set_current_user( self::$admin_id );
 
-                $args             = array(
+                $args = array(
                         'comment_approved' => 1,
                         'comment_post_ID'  => self::$password_id,
                 );
+
                 $password_comment = $this->factory->comment->create( $args );
 
@@ -312 +336 @@
                 wp_set_current_user( 0 );
 
-                $args            = array(
+                $args = array(
                         'comment_approved' => 1,
                         'comment_post_ID'  => self::$private_id,
                 );
+
                 $private_comment = $this->factory->comment->create( $args );
 
@@ -330 +355 @@
                 wp_set_current_user( self::$admin_id );
 
-                $args            = array(
+                $args = array(
                         'comment_approved' => 1,
                         'comment_post_ID'  => self::$private_id,
                 );
+
                 $private_comment = $this->factory->comment->create( $args );
 
@@ -389 +415 @@
         public function test_get_items_no_permission_for_context() {
                 wp_set_current_user( 0 );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
                 $request->set_param( 'context', 'edit' );
@@ -396 +423 @@
 
         public function test_get_items_no_post() {
+                wp_set_current_user( self::$admin_id );
+
                 $this->factory->comment->create_post_comments( 0, 2 );
-                wp_set_current_user( self::$admin_id );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
                 $request->set_param( 'post', 0 );
@@ -408 +437 @@
         public function test_get_items_no_permission_for_no_post() {
                 wp_set_current_user( 0 );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
                 $request->set_param( 'post', 0 );
@@ -416 +446 @@
         public function test_get_items_edit_context() {
                 wp_set_current_user( self::$admin_id );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
                 $request->set_param( 'context', 'edit' );
@@ -442 +473 @@
         public function test_get_items_include_query() {
                 wp_set_current_user( self::$admin_id );
+
                 $args = array(
                         'comment_approved' => 1,
                         'comment_post_ID'  => self::$post_id,
                 );
-                $id1  = $this->factory->comment->create( $args );
-                $this->factory->comment->create( $args );
-                $id3     = $this->factory->comment->create( $args );
+
+                $id1 = $this->factory->comment->create( $args );
+                $id2 = $this->factory->comment->create( $args );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
-                // Order=>asc
+
+                // 'order' => 'asc'.
                 $request->set_param( 'order', 'asc' );
-                $request->set_param( 'include', array( $id3, $id1 ) );
+                $request->set_param( 'include', array( $id2, $id1 ) );
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
                 $this->assertEquals( 2, count( $data ) );
                 $this->assertEquals( $id1, $data[0]['id'] );
-                // Orderby=>include
+
+                // 'orderby' => 'include'.
                 $request->set_param( 'orderby', 'include' );
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
                 $this->assertEquals( 2, count( $data ) );
-                $this->assertEquals( $id3, $data[0]['id'] );
-                // Orderby=>invalid should fail.
+                $this->assertEquals( $id2, $data[0]['id'] );
+
+                // Invalid 'orderby' should error.
                 $request->set_param( 'orderby', 'invalid' );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertErrorResponse( 'rest_invalid_param', $response, 400 );
-                // fails on invalid id.
+
+                // Invalid 'include' should error.
                 $request->set_param( 'orderby', array( 'include' ) );
                 $request->set_param( 'include', array( 'invalid' ) );
@@ -476 +513 @@
         public function test_get_items_exclude_query() {
                 wp_set_current_user( self::$admin_id );
-                $args     = array(
-                        'comment_approved' => 1,
-                        'comment_post_ID'  => self::$post_id,
-                );
-                $id1      = $this->factory->comment->create( $args );
-                $id2      = $this->factory->comment->create( $args );
-                $request  = new WP_REST_Request( 'GET', '/wp/v2/comments' );
-                $response = rest_get_server()->dispatch( $request );
-                $data     = $response->get_data();
-                $this->assertTrue( in_array( $id1, wp_list_pluck( $data, 'id' ), true ) );
-                $this->assertTrue( in_array( $id2, wp_list_pluck( $data, 'id' ), true ) );
-                $request->set_param( 'exclude', array( $id2 ) );
-                $response = rest_get_server()->dispatch( $request );
-                $data     = $response->get_data();
-                $this->assertTrue( in_array( $id1, wp_list_pluck( $data, 'id' ), true ) );
-                $this->assertFalse( in_array( $id2, wp_list_pluck( $data, 'id' ), true ) );
-
-                // fails on invalid id.
-                $request->set_param( 'exclude', array( 'invalid' ) );
-                $response = rest_get_server()->dispatch( $request );
-                $this->assertErrorResponse( 'rest_invalid_param', $response, 400 );
-        }
-
-        public function test_get_items_offset_query() {
-                wp_set_current_user( self::$admin_id );
+
                 $args = array(
                         'comment_approved' => 1,
                         'comment_post_ID'  => self::$post_id,
                 );
-                $this->factory->comment->create( $args );
-                $this->factory->comment->create( $args );
-                $this->factory->comment->create( $args );
+
+                $id1 = $this->factory->comment->create( $args );
+                $id2 = $this->factory->comment->create( $args );
+
+                $request  = new WP_REST_Request( 'GET', '/wp/v2/comments' );
+                $response = rest_get_server()->dispatch( $request );
+                $data     = $response->get_data();
+                $ids      = wp_list_pluck( $data, 'id' );
+                $this->assertTrue( in_array( $id1, $ids, true ) );
+                $this->assertTrue( in_array( $id2, $ids, true ) );
+
+                $request->set_param( 'exclude', array( $id2 ) );
+                $response = rest_get_server()->dispatch( $request );
+                $data     = $response->get_data();
+                $ids      = wp_list_pluck( $data, 'id' );
+                $this->assertTrue( in_array( $id1, $ids, true ) );
+                $this->assertFalse( in_array( $id2, $ids, true ) );
+
+                // Invalid 'exclude' should error.
+                $request->set_param( 'exclude', array( 'invalid' ) );
+                $response = rest_get_server()->dispatch( $request );
+                $this->assertErrorResponse( 'rest_invalid_param', $response, 400 );
+        }
+
+        public function test_get_items_offset_query() {
+                wp_set_current_user( self::$admin_id );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
+                $request->set_param( 'per_page', self::$per_page );
                 $request->set_param( 'offset', 1 );
                 $response = rest_get_server()->dispatch( $request );
-                $this->assertCount( 3, $response->get_data() );
-                // 'offset' works with 'per_page'
+                $this->assertCount( self::$total_comments - 1, $response->get_data() );
+
+                // 'offset' works with 'per_page'.
                 $request->set_param( 'per_page', 2 );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertCount( 2, $response->get_data() );
-                // 'offset' takes priority over 'page'
+
+                // 'offset' takes priority over 'page'.
                 $request->set_param( 'page', 3 );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertCount( 2, $response->get_data() );
-                // 'offset' with invalid value errors.
+
+                // Invalid 'offset' should error.
                 $request->set_param( 'offset', 'moreplease' );
                 $response = rest_get_server()->dispatch( $request );
@@ -528 +569 @@
         public function test_get_items_order_query() {
                 wp_set_current_user( self::$admin_id );
+
                 $args = array(
                         'comment_approved' => 1,
                         'comment_post_ID'  => self::$post_id,
                 );
-                $this->factory->comment->create( $args );
-                $this->factory->comment->create( $args );
-                $id3     = $this->factory->comment->create( $args );
+
+                $id = $this->factory->comment->create( $args );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
-                // order defaults to 'desc'
+
+                // Order defaults to 'desc'.
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
-                $this->assertEquals( $id3, $data[0]['id'] );
-                // order=>asc
+                $this->assertEquals( $id, $data[0]['id'] );
+
+                // 'order' => 'asc'.
                 $request->set_param( 'order', 'asc' );
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
                 $this->assertEquals( self::$approved_id, $data[0]['id'] );
-                // order=>asc,id should fail
+
+                // 'order' => 'asc,id' should error.
                 $request->set_param( 'order', 'asc,id' );
                 $response = rest_get_server()->dispatch( $request );
@@ -553 +598 @@
         public function test_get_items_private_post_no_permissions() {
                 wp_set_current_user( 0 );
+
                 $post_id = $this->factory->post->create( array( 'post_status' => 'private' ) );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
                 $request->set_param( 'post', $post_id );
@@ -561 +608 @@
 
         public function test_get_items_author_arg() {
-                // Authorized
-                wp_set_current_user( self::$admin_id );
+                // Authorized.
+                wp_set_current_user( self::$admin_id );
+
                 $args = array(
                         'comment_approved' => 1,
@@ -568 +616 @@
                         'user_id'          => self::$author_id,
                 );
+
                 $this->factory->comment->create( $args );
                 $args['user_id'] = self::$subscriber_id;
@@ -574 +623 @@
                 $this->factory->comment->create( $args );
 
-                // 'author' limits result to 1 of 3
+                // Limit to comment author.
                 $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
                 $request->set_param( 'author', self::$author_id );
@@ -581 +630 @@
                 $comments = $response->get_data();
                 $this->assertCount( 1, $comments );
-                // Multiple authors are supported
+
+                // Multiple authors are supported.
                 $request->set_param( 'author', array( self::$author_id, self::$subscriber_id ) );
                 $response = rest_get_server()->dispatch( $request );
@@ -587 +637 @@
                 $comments = $response->get_data();
                 $this->assertCount( 2, $comments );
-                // Invalid author param errors
+
+                // Invalid 'author' should error.
                 $request->set_param( 'author', 'skippy' );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertErrorResponse( 'rest_invalid_param', $response, 400 );
-                // Unavailable to unauthenticated; defaults to error
+
+                // Unavailable to unauthenticated; defaults to error.
                 wp_set_current_user( 0 );
                 $request->set_param( 'author', array( self::$author_id, self::$subscriber_id ) );
@@ -599 +651 @@
 
         public function test_get_items_author_exclude_arg() {
-                // Authorized
-                wp_set_current_user( self::$admin_id );
+                // Authorized.
+                wp_set_current_user( self::$admin_id );
+
                 $args = array(
                         'comment_approved' => 1,
@@ -606 +659 @@
                         'user_id'          => self::$author_id,
                 );
+
                 $this->factory->comment->create( $args );
                 $args['user_id'] = self::$subscriber_id;
@@ -612 +666 @@
                 $this->factory->comment->create( $args );
 
-                $request  = new WP_REST_Request( 'GET', '/wp/v2/comments' );
+                $total_comments = self::$total_comments + 3;
+
+                $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
+                $request->set_param( 'per_page', self::$per_page );
                 $response = rest_get_server()->dispatch( $request );
                 $comments = $response->get_data();
-                $this->assertCount( 4, $comments );
-
-                // 'author_exclude' limits result to 3 of 4
+                $this->assertCount( $total_comments, $comments );
+
+                // Exclude comment author.
                 $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
+                $request->set_param( 'per_page', self::$per_page );
                 $request->set_param( 'author_exclude', self::$author_id );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertEquals( 200, $response->get_status() );
                 $comments = $response->get_data();
-                $this->assertCount( 3, $comments );
-                // 'author_exclude' for both comment authors (2 of 4)
+                $this->assertCount( $total_comments - 1, $comments );
+
+                // Exclude both comment authors.
                 $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
+                $request->set_param( 'per_page', self::$per_page );
                 $request->set_param( 'author_exclude', array( self::$author_id, self::$subscriber_id ) );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertEquals( 200, $response->get_status() );
                 $comments = $response->get_data();
-                $this->assertCount( 2, $comments );
-                // 'author_exclude' for both invalid author
+                $this->assertCount( $total_comments - 2, $comments );
+
+                // 'author_exclude' for invalid author.
                 $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
                 $request->set_param( 'author_exclude', 'skippy' );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertErrorResponse( 'rest_invalid_param', $response, 400 );
-                // Unavailable to unauthenticated; defaults to error
+
+                // Unavailable to unauthenticated; defaults to error.
                 wp_set_current_user( 0 );
                 $request->set_param( 'author_exclude', array( self::$author_id, self::$subscriber_id ) );
@@ -654 +716 @@
                 $args['comment_parent'] = $parent_id2;
                 $this->factory->comment->create( $args );
-                // All comments in the database
-                $request  = new WP_REST_Request( 'GET', '/wp/v2/comments' );
-                $response = rest_get_server()->dispatch( $request );
-                $this->assertCount( 5, $response->get_data() );
-                // Limit to the parent
+
+                $total_comments = self::$total_comments + 4;
+
+                // All comments in the database.
+                $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
+                $request->set_param( 'per_page', self::$per_page );
+                $response = rest_get_server()->dispatch( $request );
+                $this->assertCount( $total_comments, $response->get_data() );
+
+                // Limit to the parent.
                 $request->set_param( 'parent', $parent_id );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertCount( 1, $response->get_data() );
-                // Limit to two parents
+
+                // Limit to two parents.
                 $request->set_param( 'parent', array( $parent_id, $parent_id2 ) );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertCount( 2, $response->get_data() );
-                // Invalid parent should error
+
+                // Invalid 'parent' should error.
                 $request->set_param( 'parent', 'invalid' );
                 $response = rest_get_server()->dispatch( $request );
@@ -683 +752 @@
                 $args['comment_parent'] = $parent_id2;
                 $this->factory->comment->create( $args );
-                // All comments in the database
-                $request  = new WP_REST_Request( 'GET', '/wp/v2/comments' );
-                $response = rest_get_server()->dispatch( $request );
-                $this->assertCount( 5, $response->get_data() );
-                // Exclude this particular parent
+
+                $total_comments = self::$total_comments + 4;
+
+                // All comments in the database.
+                $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
+                $request->set_param( 'per_page', self::$per_page );
+                $response = rest_get_server()->dispatch( $request );
+                $this->assertCount( $total_comments, $response->get_data() );
+
+                // Exclude this particular parent.
                 $request->set_param( 'parent_exclude', $parent_id );
                 $response = rest_get_server()->dispatch( $request );
-                $this->assertCount( 4, $response->get_data() );
-                // Exclude both comment parents
+                $this->assertCount( $total_comments - 1, $response->get_data() );
+
+                // Exclude both comment parents.
                 $request->set_param( 'parent_exclude', array( $parent_id, $parent_id2 ) );
                 $response = rest_get_server()->dispatch( $request );
-                $this->assertCount( 3, $response->get_data() );
-                // Invalid parent id should error
+                $this->assertCount( $total_comments - 2, $response->get_data() );
+
+                // Invalid 'parent_exclude' should error.
                 $request->set_param( 'parent_exclude', 'invalid' );
                 $response = rest_get_server()->dispatch( $request );
@@ -703 +779 @@
         public function test_get_items_search_query() {
                 wp_set_current_user( self::$admin_id );
-                $args                    = array(
+
+                $args = array(
                         'comment_approved' => 1,
                         'comment_post_ID'  => self::$post_id,
@@ -709 +786 @@
                         'comment_author'   => 'Homer J Simpson',
                 );
-                $id1                     = $this->factory->comment->create( $args );
-                $args['comment_content'] = 'bar';
-                $this->factory->comment->create( $args );
-                $args['comment_content'] = 'burrito';
-                $this->factory->comment->create( $args );
-                // 3 comments, plus 1 created in construct
-                $request  = new WP_REST_Request( 'GET', '/wp/v2/comments' );
-                $response = rest_get_server()->dispatch( $request );
-                $this->assertCount( 4, $response->get_data() );
-                // One matching comments
+
+                $id = $this->factory->comment->create( $args );
+
+                $total_comments = self::$total_comments + 1;
+
+                $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
+                $request->set_param( 'per_page', self::$per_page );
+                $response = rest_get_server()->dispatch( $request );
+                $this->assertCount( $total_comments, $response->get_data() );
+
+                // One matching comment.
                 $request->set_param( 'search', 'foo' );
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
                 $this->assertCount( 1, $data );
-                $this->assertEquals( $id1, $data[0]['id'] );
+                $this->assertEquals( $id, $data[0]['id'] );
         }
 
         public function test_get_comments_pagination_headers() {
-                wp_set_current_user( self::$admin_id );
-                // Start of the index
-                for ( $i = 0; $i < 49; $i++ ) {
-                        $this->factory->comment->create(
-                                array(
-                                        'comment_content' => "Comment {$i}",
-                                        'comment_post_ID' => self::$post_id,
-                                )
-                        );
-                }
+                $total_comments = self::$total_comments;
+                $total_pages    = (int) ceil( $total_comments / 10 );
+
+                wp_set_current_user( self::$admin_id );
+
+                // Start of the index.
                 $request  = new WP_REST_Request( 'GET', '/wp/v2/comments' );
                 $response = rest_get_server()->dispatch( $request );
                 $headers  = $response->get_headers();
-                $this->assertEquals( 50, $headers['X-WP-Total'] );
-                $this->assertEquals( 5, $headers['X-WP-TotalPages'] );
+                $this->assertEquals( $total_comments, $headers['X-WP-Total'] );
+                $this->assertEquals( $total_pages, $headers['X-WP-TotalPages'] );
                 $next_link = add_query_arg(
                         array(
@@ -750 +824 @@
                 $this->assertFalse( stripos( $headers['Link'], 'rel="prev"' ) );
                 $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
-                // 3rd page
+
+                // 3rd page.
                 $this->factory->comment->create(
                         array(
-                                'comment_content' => 'Comment 51',
                                 'comment_post_ID' => self::$post_id,
                         )
                 );
+                $total_comments++;
+                $total_pages++;
                 $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
                 $request->set_param( 'page', 3 );
                 $response = rest_get_server()->dispatch( $request );
                 $headers  = $response->get_headers();
-                $this->assertEquals( 51, $headers['X-WP-Total'] );
-                $this->assertEquals( 6, $headers['X-WP-TotalPages'] );
+                $this->assertEquals( $total_comments, $headers['X-WP-Total'] );
+                $this->assertEquals( $total_pages, $headers['X-WP-TotalPages'] );
                 $prev_link = add_query_arg(
                         array(
@@ -777 +853 @@
                 );
                 $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
-                // Last page
+
+                // Last page.
                 $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
-                $request->set_param( 'page', 6 );
+                $request->set_param( 'page', $total_pages );
                 $response = rest_get_server()->dispatch( $request );
                 $headers  = $response->get_headers();
-                $this->assertEquals( 51, $headers['X-WP-Total'] );
-                $this->assertEquals( 6, $headers['X-WP-TotalPages'] );
+                $this->assertEquals( $total_comments, $headers['X-WP-Total'] );
+                $this->assertEquals( $total_pages, $headers['X-WP-TotalPages'] );
                 $prev_link = add_query_arg(
                         array(
-                                'page' => 5,
+                                'page' => $total_pages - 1,
                         ),
                         rest_url( '/wp/v2/comments' )
@@ -792 +869 @@
                 $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
                 $this->assertFalse( stripos( $headers['Link'], 'rel="next"' ) );
-                // Out of bounds
+
+                // Out of bounds.
                 $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
-                $request->set_param( 'page', 8 );
+                $request->set_param( 'page', 100 );
                 $response = rest_get_server()->dispatch( $request );
                 $headers  = $response->get_headers();
-                $this->assertEquals( 51, $headers['X-WP-Total'] );
-                $this->assertEquals( 6, $headers['X-WP-TotalPages'] );
+                $this->assertEquals( $total_comments, $headers['X-WP-Total'] );
+                $this->assertEquals( $total_pages, $headers['X-WP-TotalPages'] );
                 $prev_link = add_query_arg(
                         array(
-                                'page' => 6,
+                                'page' => $total_pages,
                         ),
                         rest_url( '/wp/v2/comments' )
@@ -858 +936 @@
         public function test_prepare_item() {
                 wp_set_current_user( self::$admin_id );
+
                 $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
                 $request->set_query_params(
@@ -874 +953 @@
         public function test_prepare_item_limit_fields() {
                 wp_set_current_user( self::$admin_id );
+
                 $endpoint = new WP_REST_Comments_Controller;
                 $request  = new WP_REST_Request( 'GET', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
@@ -916 +996 @@
         public function test_get_comment_invalid_context() {
                 wp_set_current_user( 0 );
+
                 $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/comments/%s', self::$approved_id ) );
                 $request->set_param( 'context', 'edit' );
@@ -924 +1005 @@
         public function test_get_comment_invalid_post_id() {
                 wp_set_current_user( 0 );
+
                 $comment_id = $this->factory->comment->create(
                         array(
@@ -930 +1012 @@
                         )
                 );
-                $request    = new WP_REST_Request( 'GET', '/wp/v2/comments/' . $comment_id );
-
+
+                $request  = new WP_REST_Request( 'GET', '/wp/v2/comments/' . $comment_id );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertErrorResponse( 'rest_post_invalid_id', $response, 404 );
@@ -938 +1020 @@
         public function test_get_comment_invalid_post_id_as_admin() {
                 wp_set_current_user( self::$admin_id );
+
                 $comment_id = $this->factory->comment->create(
                         array(
@@ -944 +1027 @@
                         )
                 );
-                $request    = new WP_REST_Request( 'GET', '/wp/v2/comments/' . $comment_id );
-
+
+                $request  = new WP_REST_Request( 'GET', '/wp/v2/comments/' . $comment_id );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertErrorResponse( 'rest_post_invalid_id', $response, 404 );
@@ -953 +1036 @@
                 wp_set_current_user( 0 );
 
-                $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/comments/%d', self::$hold_id ) );
-
+                $request  = new WP_REST_Request( 'GET', sprintf( '/wp/v2/comments/%d', self::$hold_id ) );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertErrorResponse( 'rest_cannot_read', $response, 401 );
@@ -962 +1044 @@
                 wp_set_current_user( self::$admin_id );
 
-                $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/comments/%d', self::$hold_id ) );
-
+                $request  = new WP_REST_Request( 'GET', sprintf( '/wp/v2/comments/%d', self::$hold_id ) );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertEquals( 200, $response->get_status() );
@@ -1009 +1090 @@
         public function test_get_comment_with_password_without_edit_post_permission() {
                 wp_set_current_user( self::$subscriber_id );
-                $args             = array(
+
+                $args = array(
                         'comment_approved' => 1,
                         'comment_post_ID'  => self::$password_id,
                 );
+
                 $password_comment = $this->factory->comment->create( $args );
-                $request          = new WP_REST_Request( 'GET', sprintf( '/wp/v2/comments/%s', $password_comment ) );
-                $response         = rest_get_server()->dispatch( $request );
+
+                $request  = new WP_REST_Request( 'GET', sprintf( '/wp/v2/comments/%s', $password_comment ) );
+                $response = rest_get_server()->dispatch( $request );
                 $this->assertErrorResponse( 'rest_cannot_read', $response, 403 );
         }
@@ -1025 +1109 @@
                 wp_set_current_user( self::$subscriber_id );
 
-                $args             = array(
+                $args = array(
                         'comment_approved' => 1,
                         'comment_post_ID'  => self::$password_id,
                 );
+
                 $password_comment = $this->factory->comment->create( $args );
 
@@ -1114 +1199 @@
         public function test_create_comment_date( $params, $results ) {
                 wp_set_current_user( self::$admin_id );
+
                 update_option( 'timezone_string', $params['timezone_string'] );
 
@@ -1234 +1320 @@
         public function test_create_comment_missing_required_author_email() {
                 wp_set_current_user( self::$admin_id );
+
                 update_option( 'require_name_email', 1 );
 
@@ -1252 +1339 @@
         public function test_create_comment_empty_required_author_email() {
                 wp_set_current_user( self::$admin_id );
+
                 update_option( 'require_name_email', 1 );
 
@@ -1343 +1431 @@
 
                 wp_set_current_user( self::$admin_id );
-                $params  = array(
+
+                $params = array(
                         'post'         => self::$post_id,
                         'author_name'  => 'Comic Book Guy',
@@ -1352 +1441 @@
                         'date'         => '2014-11-07T10:14:25',
                 );
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
                 $request->add_header( 'content-type', 'application/json' );
@@ -1365 +1455 @@
         public function test_create_comment_without_type() {
                 $post_id = $this->factory->post->create();
+
                 wp_set_current_user( self::$admin_id );
 
@@ -1402 +1493 @@
         public function test_create_comment_with_invalid_type() {
                 $post_id = $this->factory->post->create();
+
                 wp_set_current_user( self::$admin_id );
 
@@ -1425 +1517 @@
         public function test_create_comment_invalid_email() {
                 $post_id = $this->factory->post->create();
+
                 wp_set_current_user( self::$admin_id );
 
@@ -1569 +1662 @@
         public function test_create_comment_with_status_IP_and_user_agent() {
                 $post_id = $this->factory->post->create();
+
                 wp_set_current_user( self::$admin_id );
 
@@ -1663 +1757 @@
         public function test_create_comment_author_ip_no_permission() {
                 wp_set_current_user( self::$subscriber_id );
-                $params  = array(
+
+                $params = array(
                         'author_name'  => 'Comic Book Guy',
                         'author_email' => 'cbg@androidsdungeon.com',
@@ -1671 +1766 @@
                         'status'       => 'approved',
                 );
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
                 $request->add_header( 'content-type', 'application/json' );
@@ -1680 +1776 @@
         public function test_create_comment_author_ip_defaults_to_remote_addr() {
                 wp_set_current_user( self::$admin_id );
+
                 $_SERVER['REMOTE_ADDR'] = '127.0.0.2';
-                $params                 = array(
+
+                $params = array(
                         'post'         => self::$post_id,
                         'author_name'  => 'Comic Book Guy',
@@ -1688 +1786 @@
                         'content'      => 'Worst Comment Ever!',
                 );
-                $request                = new WP_REST_Request( 'POST', '/wp/v2/comments' );
+
+                $request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
                 $request->add_header( 'content-type', 'application/json' );
                 $request->set_body( wp_json_encode( $params ) );
@@ -1700 +1799 @@
                 wp_set_current_user( self::$admin_id );
 
-                $params  = array(
+                $params = array(
                         'author_name'  => 'Comic Book Guy',
                         'author_email' => 'cbg@androidsdungeon.com',
@@ -1707 +1806 @@
                         'status'       => 'approved',
                 );
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
                 $request->add_header( 'content-type', 'application/json' );
@@ -1719 +1819 @@
                 wp_set_current_user( self::$subscriber_id );
 
-                $params  = array(
+                $params = array(
                         'author_name'  => 'Homer Jay Simpson',
                         'author_email' => 'chunkylover53@aol.com',
@@ -1726 +1826 @@
                         'author'       => self::$subscriber_id,
                 );
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
                 $request->add_header( 'content-type', 'application/json' );
@@ -1757 +1858 @@
                 wp_set_current_user( self::$subscriber_id );
 
-                $params  = array(
+                $params = array(
                         'post'         => self::$draft_id,
                         'author_name'  => 'Ishmael',
@@ -1765 +1866 @@
                         'author'       => self::$subscriber_id,
                 );
-                $request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-                $request->add_header( 'content-type', 'application/json' );
-                $request->set_body( wp_json_encode( $params ) );
-
-                $response = rest_get_server()->dispatch( $request );
-
+
+                $request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
+                $request->add_header( 'content-type', 'application/json' );
+                $request->set_body( wp_json_encode( $params ) );
+
+                $response = rest_get_server()->dispatch( $request );
                 $this->assertErrorResponse( 'rest_comment_draft_post', $response, 403 );
         }
@@ -1777 +1878 @@
                 wp_set_current_user( self::$subscriber_id );
 
-                $params  = array(
+                $params = array(
                         'post'         => self::$trash_id,
                         'author_name'  => 'Ishmael',
@@ -1785 +1886 @@
                         'author'       => self::$subscriber_id,
                 );
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
                 $request->add_header( 'content-type', 'application/json' );
@@ -1797 +1899 @@
                 wp_set_current_user( self::$subscriber_id );
 
-                $params  = array(
+                $params = array(
                         'post'         => self::$private_id,
                         'author_name'  => 'Homer Jay Simpson',
@@ -1805 +1907 @@
                         'author'       => self::$subscriber_id,
                 );
-                $request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-                $request->add_header( 'content-type', 'application/json' );
-                $request->set_body( wp_json_encode( $params ) );
-
-                $response = rest_get_server()->dispatch( $request );
-
+
+                $request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
+                $request->add_header( 'content-type', 'application/json' );
+                $request->set_body( wp_json_encode( $params ) );
+
+                $response = rest_get_server()->dispatch( $request );
                 $this->assertErrorResponse( 'rest_cannot_read_post', $response, 403 );
         }
@@ -1817 +1919 @@
                 wp_set_current_user( self::$subscriber_id );
 
-                $params  = array(
+                $params = array(
                         'post'         => self::$password_id,
                         'author_name'  => 'Homer Jay Simpson',
@@ -1825 +1927 @@
                         'author'       => self::$subscriber_id,
                 );
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
                 $request->add_header( 'content-type', 'application/json' );
@@ -1835 +1938 @@
         public function test_create_item_duplicate() {
                 wp_set_current_user( self::$subscriber_id );
+
                 $this->factory->comment->create(
                         array(
@@ -1865 +1969 @@
                         )
                 );
+
                 wp_set_current_user( self::$subscriber_id );
 
@@ -1881 +1986 @@
         public function test_create_comment_require_login() {
                 wp_set_current_user( 0 );
+
                 update_option( 'comment_registration', 1 );
                 add_filter( 'rest_allow_anonymous_comments', '__return_true' );
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
                 $request->set_param( 'post', self::$post_id );
@@ -1998 +2105 @@
                 wp_set_current_user( self::$subscriber_id );
 
-                $params  = array(
+                $params = array(
                         'post'         => self::$post_id,
                         'author_name'  => rand_long_str( 246 ),
@@ -2006 +2113 @@
                         'date'         => '1995-04-30T10:22:00',
                 );
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
 
@@ -2021 +2129 @@
                 wp_set_current_user( self::$subscriber_id );
 
-                $params  = array(
+                $params = array(
                         'post'         => self::$post_id,
                         'author_name'  => 'Bleeding Gums Murphy',
@@ -2029 +2137 @@
                         'date'         => '1995-04-30T10:22:00',
                 );
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
 
@@ -2044 +2153 @@
                 wp_set_current_user( self::$subscriber_id );
 
-                $params  = array(
+                $params = array(
                         'post'         => self::$post_id,
                         'author_name'  => 'Bleeding Gums Murphy',
@@ -2052 +2161 @@
                         'date'         => '1995-04-30T10:22:00',
                 );
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
 
@@ -2067 +2177 @@
                 wp_set_current_user( self::$subscriber_id );
 
-                $params  = array(
+                $params = array(
                         'post'         => self::$post_id,
                         'author_name'  => 'Bleeding Gums Murphy',
@@ -2075 +2185 @@
                         'date'         => '1995-04-30T10:22:00',
                 );
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
 
@@ -2087 +2198 @@
                 wp_set_current_user( self::$subscriber_id );
 
-                $params  = array(
+                $params = array(
                         'post'         => self::$password_id,
                         'author_name'  => 'Bleeding Gums Murphy',
@@ -2094 +2205 @@
                         'content'      => 'This isn\'t a saxophone. It\'s an umbrella.',
                 );
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
 
@@ -2106 +2218 @@
                 add_filter( 'rest_allow_anonymous_comments', '__return_true' );
 
-                $params  = array(
+                $params = array(
                         'post'         => self::$password_id,
                         'author_name'  => 'Bleeding Gums Murphy',
@@ -2114 +2226 @@
                         'password'     => 'toomanysecrets',
                 );
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
 
@@ -2127 +2240 @@
                 wp_set_current_user( self::$admin_id );
 
-                $params  = array(
+                $params = array(
                         'author'       => self::$subscriber_id,
                         'author_name'  => 'Disco Stu',
@@ -2137 +2250 @@
                         'post'         => $post_id,
                 );
+
                 $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
                 $request->add_header( 'content-type', 'application/json' );
@@ -2163 +2277 @@
         public function test_update_comment_date( $params, $results ) {
                 wp_set_current_user( self::$editor_id );
+
                 update_option( 'timezone_string', $params['timezone_string'] );
 
@@ -2214 +2329 @@
 
                 wp_set_current_user( self::$admin_id );
+
                 $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
                 $request->set_param( 'post', $comment->comment_post_ID );
@@ -2236 +2352 @@
                 );
 
-                $params  = array(
+                $params = array(
                         'status' => 'approve',
                 );
+
                 $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', $comment_id ) );
                 $request->add_header( 'content-type', 'application/json' );
@@ -2263 +2380 @@
                 );
 
-                $params  = array(
+                $params = array(
                         'status' => 'approve',
                 );
+
                 $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', $comment_id ) );
                 $request->add_header( 'content-type', 'application/json' );
@@ -2283 +2401 @@
                 wp_set_current_user( self::$admin_id );
 
-                $params  = array(
+                $params = array(
                         'date_gmt' => '2015-05-07T10:14:25',
                         'content'  => 'I\'ll be deep in the cold, cold ground before I recognize Missouri.',
                 );
+
                 $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
                 $request->add_header( 'content-type', 'application/json' );
@@ -2302 +2421 @@
         public function test_update_comment_author_email_only() {
                 wp_set_current_user( self::$editor_id );
+
                 update_option( 'require_name_email', 1 );
 
@@ -2320 +2440 @@
         public function test_update_comment_empty_author_name() {
                 wp_set_current_user( self::$editor_id );
+
                 update_option( 'require_name_email', 1 );
 
@@ -2339 +2460 @@
         public function test_update_comment_author_name_only() {
                 wp_set_current_user( self::$admin_id );
+
                 update_option( 'require_name_email', 1 );
 
@@ -2357 +2479 @@
         public function test_update_comment_empty_author_email() {
                 wp_set_current_user( self::$admin_id );
+
                 update_option( 'require_name_email', 1 );
 
@@ -2397 +2520 @@
                 wp_set_current_user( self::$admin_id );
 
-                $params  = array(
+                $params = array(
                         'type' => 'trackback',
                 );
+
                 $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
                 $request->add_header( 'content-type', 'application/json' );
@@ -2411 +2535 @@
                 wp_set_current_user( self::$admin_id );
 
-                $params  = array(
+                $params = array(
                         'content' => array(
                                 'raw' => 'What the heck kind of name is Persephone?',
                         ),
                 );
+
                 $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
                 $request->add_header( 'content-type', 'application/json' );
@@ -2464 +2589 @@
                 wp_set_current_user( self::$subscriber_id );
 
-                $params  = array(
+                $params = array(
                         'content' => 'Oh, they have the internet on computers now!',
                 );
+
                 $request = new WP_REST_Request( 'PUT', '/wp/v2/comments/' . REST_TESTS_IMPOSSIBLY_HIGH_NUMBER );
                 $request->add_header( 'content-type', 'application/json' );
@@ -2488 +2614 @@
                 add_filter( 'rest_allow_anonymous_comments', '__return_true' );
 
-                $params  = array(
+                $params = array(
                         'content' => 'Disco Stu likes disco music.',
                 );
+
                 $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$hold_id ) );
                 $request->add_header( 'content-type', 'application/json' );
@@ -2505 +2632 @@
                 wp_set_current_user( self::$moderator_id );
 
-                $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
-                $params  = array(
+                $params = array(
                         'content' => 'Updated comment.',
                         'date'    => '2019-10-07T23:14:25',
                 );
+
+                $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
                 $request->add_header( 'content-type', 'application/json' );
                 $request->set_body( wp_json_encode( $params ) );
@@ -2535 +2663 @@
                 wp_set_current_user( self::$subscriber_id );
 
-                $params  = array(
+                $params = array(
                         'content' => 'Disco Stu likes disco music.',
                 );
+
                 $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', $private_comment_id ) );
                 $request->add_header( 'content-type', 'application/json' );
@@ -2548 +2677 @@
         public function test_update_comment_with_children_link() {
                 wp_set_current_user( self::$admin_id );
+
                 $comment_id_1 = $this->factory->comment->create(
                         array(
@@ -2590 +2720 @@
                 wp_set_current_user( self::$admin_id );
 
-                $params  = array(
+                $params = array(
                         'author_name' => rand_long_str( 246 ),
                         'content'     => 'This isn\'t a saxophone. It\'s an umbrella.',
                 );
+
                 $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
 
@@ -2609 +2740 @@
                 wp_set_current_user( self::$admin_id );
 
-                $params  = array(
+                $params = array(
                         'author_email' => 'murphy@' . rand_long_str( 190 ) . '.com',
                         'content'      => 'This isn\'t a saxophone. It\'s an umbrella.',
                 );
+
                 $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
 
@@ -2628 +2760 @@
                 wp_set_current_user( self::$admin_id );
 
-                $params  = array(
+                $params = array(
                         'author_url' => 'http://jazz.' . rand_long_str( 185 ) . '.com',
                         'content'    => 'This isn\'t a saxophone. It\'s an umbrella.',
                 );
+
                 $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
 
@@ -2647 +2780 @@
                 wp_set_current_user( self::$admin_id );
 
-                $params  = array(
+                $params = array(
                         'content' => rand_long_str( 66525 ),
                 );
+
                 $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
 
@@ -2712 +2846 @@
         public function test_comment_roundtrip_as_editor() {
                 wp_set_current_user( self::$editor_id );
+
                 $this->assertEquals( ! is_multisite(), current_user_can( 'unfiltered_html' ) );
                 $this->verify_comment_roundtrip(
@@ -2732 +2867 @@
         public function test_comment_roundtrip_as_editor_unfiltered_html() {
                 wp_set_current_user( self::$editor_id );
+
                 if ( is_multisite() ) {
                         $this->assertFalse( current_user_can( 'unfiltered_html' ) );
@@ -2771 +2907 @@
         public function test_comment_roundtrip_as_superadmin() {
                 wp_set_current_user( self::$superadmin_id );
+
                 $this->assertTrue( current_user_can( 'unfiltered_html' ) );
                 $this->verify_comment_roundtrip(
@@ -2791 +2928 @@
         public function test_comment_roundtrip_as_superadmin_unfiltered_html() {
                 wp_set_current_user( self::$superadmin_id );
+
                 $this->assertTrue( current_user_can( 'unfiltered_html' ) );
                 $this->verify_comment_roundtrip(
@@ -2832 +2970 @@
                 wp_set_current_user( self::$admin_id );
 
-                $comment_id       = $this->factory->comment->create(
+                $comment_id = $this->factory->comment->create(
                         array(
                                 'comment_approved' => 1,
@@ -2839 +2977 @@
                         )
                 );
+
                 $request          = new WP_REST_Request( 'DELETE', sprintf( '/wp/v2/comments/%d', $comment_id ) );
                 $request['force'] = true;
@@ -2859 +2998 @@
                         )
                 );
-                $request    = new WP_REST_Request( 'DELETE', sprintf( '/wp/v2/comments/%d', $comment_id ) );
-                $response   = rest_get_server()->dispatch( $request );
+
+                $request  = new WP_REST_Request( 'DELETE', sprintf( '/wp/v2/comments/%d', $comment_id ) );
+                $response = rest_get_server()->dispatch( $request );
                 $this->assertEquals( 200, $response->get_status() );
                 $data     = $response->get_data();
@@ -2870 +3010 @@
                 wp_set_current_user( self::$admin_id );
 
-                $request = new WP_REST_Request( 'DELETE', sprintf( '/wp/v2/comments/%d', REST_TESTS_IMPOSSIBLY_HIGH_NUMBER ) );
-
+                $request  = new WP_REST_Request( 'DELETE', sprintf( '/wp/v2/comments/%d', REST_TESTS_IMPOSSIBLY_HIGH_NUMBER ) );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertErrorResponse( 'rest_comment_invalid_id', $response, 404 );
@@ -2879 +3018 @@
                 wp_set_current_user( self::$subscriber_id );
 
-                $request = new WP_REST_Request( 'DELETE', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
-
+                $request  = new WP_REST_Request( 'DELETE', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertErrorResponse( 'rest_cannot_delete', $response, 403 );
@@ -2887 +3025 @@
         public function test_delete_child_comment_link() {
                 wp_set_current_user( self::$admin_id );
+
                 $comment_id_1 = $this->factory->comment->create(
                         array(
@@ -2948 +3087 @@
         public function test_get_item_schema_show_avatar() {
                 update_option( 'show_avatars', false );
+
                 $request    = new WP_REST_Request( 'OPTIONS', '/wp/v2/users' );
                 $response   = rest_get_server()->dispatch( $request );
@@ -2975 +3115 @@
                 );
 
-                $request = new WP_REST_Request( 'OPTIONS', '/wp/v2/comments' );
-
+                $request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/comments' );
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
@@ -2983 +3122 @@
                 $this->assertEquals( $schema, $data['schema']['properties']['my_custom_int'] );
 
-                $request = new WP_REST_Request( 'GET', '/wp/v2/comments/' . self::$approved_id );
-
+                $request  = new WP_REST_Request( 'GET', '/wp/v2/comments/' . self::$approved_id );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertArrayHasKey( 'my_custom_int', $response->data );

trunk/tests/phpunit/tests/rest-api/rest-pages-controller.php

@@ -126 +126 @@
                         )
                 );
-                // No parent
+
+                // No parent.
                 $request  = new WP_REST_Request( 'GET', '/wp/v2/pages' );
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
                 $this->assertEquals( 2, count( $data ) );
-                // Filter to parent
+
+                // Filter to parent.
                 $request->set_param( 'parent', $id1 );
                 $response = rest_get_server()->dispatch( $request );
@@ -137 +139 @@
                 $this->assertEquals( 1, count( $data ) );
                 $this->assertEquals( $id2, $data[0]['id'] );
-                // Invalid parent should fail
+
+                // Invalid 'parent' should error.
                 $request->set_param( 'parent', 'some-slug' );
                 $response = rest_get_server()->dispatch( $request );
@@ -170 +173 @@
                         )
                 );
-                // No parent
+
+                // No parent.
                 $request  = new WP_REST_Request( 'GET', '/wp/v2/pages' );
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
                 $this->assertEquals( 4, count( $data ) );
-                // Filter to parents
+
+                // Filter to parents.
                 $request->set_param( 'parent', array( $id1, $id3 ) );
                 $response = rest_get_server()->dispatch( $request );
@@ -197 +202 @@
                         )
                 );
-                // No parent
+
+                // No parent.
                 $request  = new WP_REST_Request( 'GET', '/wp/v2/pages' );
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
                 $this->assertEquals( 2, count( $data ) );
-                // Filter to parent
+
+                // Filter to parent.
                 $request->set_param( 'parent_exclude', $id1 );
                 $response = rest_get_server()->dispatch( $request );
@@ -208 +215 @@
                 $this->assertEquals( 1, count( $data ) );
                 $this->assertEquals( $id1, $data[0]['id'] );
-                // Invalid parent_exclude should error
+
+                // Invalid 'parent_exclude' should error.
                 $request->set_param( 'parent_exclude', 'some-slug' );
                 $response = rest_get_server()->dispatch( $request );
@@ -242 +250 @@
                         )
                 );
-                // No parent
+
+                // No parent.
                 $request  = new WP_REST_Request( 'GET', '/wp/v2/pages' );
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
                 $this->assertEqualSets( array( $id1, $id2, $id3, $id4 ), wp_list_pluck( $data, 'id' ) );
-                // Filter to menu_order
+
+                // Filter to 'menu_order'.
                 $request->set_param( 'menu_order', 1 );
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
                 $this->assertEqualSets( array( $id4 ), wp_list_pluck( $data, 'id' ) );
-                // Order by menu order
+
+                // Order by 'menu order'.
                 $request = new WP_REST_Request( 'GET', '/wp/v2/pages' );
                 $request->set_param( 'order', 'asc' );
@@ -262 +273 @@
                 $this->assertEquals( $id2, $data[2]['id'] );
                 $this->assertEquals( $id3, $data[3]['id'] );
-                // Invalid menu_order should fail
+
+                // Invalid 'menu_order' should error.
                 $request = new WP_REST_Request( 'GET', '/wp/v2/pages' );
                 $request->set_param( 'menu_order', 'top-first' );

trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php

@@ -20 +20 @@
 
         protected static $supported_formats;
+        protected static $post_ids    = array();
+        protected static $total_posts = 30;
+        protected static $per_page    = 50;
 
         protected $forbidden_cat;
@@ -62 +65 @@
                 self::$supported_formats = get_theme_support( 'post-formats' );
                 add_theme_support( 'post-formats', array( 'post', 'gallery' ) );
+
+                // Set up posts for pagination tests.
+                for ( $i = 0; $i < self::$total_posts - 1; $i++ ) {
+                        self::$post_ids[] = $factory->post->create(
+                                array(
+                                        'post_title' => "Post {$i}",
+                                )
+                        );
+                }
         }
 
@@ -70 +82 @@
                 } else {
                         remove_theme_support( 'post-formats' );
+                }
+
+                // Remove posts for pagination tests.
+                foreach ( self::$post_ids as $post_id ) {
+                        wp_delete_post( $post_id, true );
                 }
 
@@ -204 +221 @@
 
                 wp_set_current_user( self::$editor_id );
+
                 $request  = new WP_REST_Request( 'OPTIONS', sprintf( '/wp/v2/posts/%d', self::$post_id ) );
                 $response = rest_get_server()->dispatch( $request );
@@ -241 +259 @@
                 $this->factory->post->create( array( 'post_author' => self::$editor_id ) );
                 $this->factory->post->create( array( 'post_author' => self::$author_id ) );
-                // All 3 posts
-                $request  = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+
+                $total_posts = self::$total_posts + 2;
+
+                // All posts in the database.
+                $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+                $request->set_param( 'per_page', self::$per_page );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertEquals( 200, $response->get_status() );
-                $this->assertEquals( 3, count( $response->get_data() ) );
-                // 2 of 3 posts
+                $this->assertEquals( $total_posts, count( $response->get_data() ) );
+
+                // Limit to editor and author.
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
                 $request->set_param( 'author', array( self::$editor_id, self::$author_id ) );
@@ -254 +277 @@
                 $this->assertEquals( 2, count( $data ) );
                 $this->assertEqualSets( array( self::$editor_id, self::$author_id ), wp_list_pluck( $data, 'author' ) );
-                // 1 of 3 posts
+
+                // Limit to editor.
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
                 $request->set_param( 'author', self::$editor_id );
@@ -267 +291 @@
                 $this->factory->post->create( array( 'post_author' => self::$editor_id ) );
                 $this->factory->post->create( array( 'post_author' => self::$author_id ) );
-                // All 3 posts
-                $request  = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+
+                $total_posts = self::$total_posts + 2;
+
+                // All posts in the database.
+                $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+                $request->set_param( 'per_page', self::$per_page );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertEquals( 200, $response->get_status() );
-                $this->assertEquals( 3, count( $response->get_data() ) );
-                // 1 of 3 posts
-                $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+                $this->assertEquals( $total_posts, count( $response->get_data() ) );
+
+                // Exclude editor and author.
+                $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+                $request->set_param( 'per_page', self::$per_page );
                 $request->set_param( 'author_exclude', array( self::$editor_id, self::$author_id ) );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertEquals( 200, $response->get_status() );
                 $data = $response->get_data();
-                $this->assertEquals( 1, count( $data ) );
+                $this->assertEquals( $total_posts - 2, count( $data ) );
                 $this->assertNotEquals( self::$editor_id, $data[0]['author'] );
                 $this->assertNotEquals( self::$author_id, $data[0]['author'] );
-                // 2 of 3 posts
-                $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+
+                // Exclude editor.
+                $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+                $request->set_param( 'per_page', self::$per_page );
                 $request->set_param( 'author_exclude', self::$editor_id );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertEquals( 200, $response->get_status() );
                 $data = $response->get_data();
-                $this->assertEquals( 2, count( $data ) );
+                $this->assertEquals( $total_posts - 1, count( $data ) );
                 $this->assertNotEquals( self::$editor_id, $data[0]['author'] );
                 $this->assertNotEquals( self::$editor_id, $data[1]['author'] );
-                // invalid author_exclude errors
+
+                // Invalid 'author_exclude' should error.
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
                 $request->set_param( 'author_exclude', 'invalid' );
@@ -299 +332 @@
         public function test_get_items_include_query() {
                 $id1 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
-                $this->factory->post->create( array( 'post_status' => 'publish' ) );
-                $id3     = $this->factory->post->create( array( 'post_status' => 'publish' ) );
-                $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
-                // Orderby=>desc
-                $request->set_param( 'include', array( $id1, $id3 ) );
+                $id2 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
+
+                $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+
+                // Order defaults to 'desc'.
+                $request->set_param( 'include', array( $id1, $id2 ) );
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
                 $this->assertEquals( 2, count( $data ) );
-                $this->assertEquals( $id3, $data[0]['id'] );
+                $this->assertEquals( $id2, $data[0]['id'] );
                 $this->assertPostsOrderedBy( '{posts}.post_date DESC' );
-                // Orderby=>include
+
+                // 'orderby' => 'include'
                 $request->set_param( 'orderby', 'include' );
                 $response = rest_get_server()->dispatch( $request );
@@ -315 +350 @@
                 $this->assertEquals( 2, count( $data ) );
                 $this->assertEquals( $id1, $data[0]['id'] );
-                $this->assertPostsOrderedBy( "FIELD({posts}.ID,$id1,$id3)" );
-                // Invalid include should error
+                $this->assertPostsOrderedBy( "FIELD({posts}.ID,$id1,$id2)" );
+
+                // Invalid 'include' should error.
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
                 $request->set_param( 'include', 'invalid' );
@@ -421 +457 @@
 
         public function test_get_items_exclude_query() {
-                $id1      = $this->factory->post->create( array( 'post_status' => 'publish' ) );
-                $id2      = $this->factory->post->create( array( 'post_status' => 'publish' ) );
+                $id1 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
+                $id2 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
+
                 $request  = new WP_REST_Request( 'GET', '/wp/v2/posts' );
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
-                $this->assertTrue( in_array( $id1, wp_list_pluck( $data, 'id' ), true ) );
-                $this->assertTrue( in_array( $id2, wp_list_pluck( $data, 'id' ), true ) );
+                $ids      = wp_list_pluck( $data, 'id' );
+                $this->assertTrue( in_array( $id1, $ids, true ) );
+                $this->assertTrue( in_array( $id2, $ids, true ) );
 
                 $request->set_param( 'exclude', array( $id2 ) );
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
-                $this->assertTrue( in_array( $id1, wp_list_pluck( $data, 'id' ), true ) );
-                $this->assertFalse( in_array( $id2, wp_list_pluck( $data, 'id' ), true ) );
+                $ids      = wp_list_pluck( $data, 'id' );
+                $this->assertTrue( in_array( $id1, $ids, true ) );
+                $this->assertFalse( in_array( $id2, $ids, true ) );
 
                 $request->set_param( 'exclude', "$id2" );
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
-                $this->assertTrue( in_array( $id1, wp_list_pluck( $data, 'id' ), true ) );
-                $this->assertFalse( in_array( $id2, wp_list_pluck( $data, 'id' ), true ) );
+                $ids      = wp_list_pluck( $data, 'id' );
+                $this->assertTrue( in_array( $id1, $ids, true ) );
+                $this->assertFalse( in_array( $id2, $ids, true ) );
 
                 $request->set_param( 'exclude', 'invalid' );
@@ -447 +487 @@
 
         public function test_get_items_search_query() {
-                for ( $i = 0;  $i < 5;  $i++ ) {
-                        $this->factory->post->create( array( 'post_status' => 'publish' ) );
-                }
                 $this->factory->post->create(
                         array(
@@ -456 +493 @@
                         )
                 );
-                $request  = new WP_REST_Request( 'GET', '/wp/v2/posts' );
-                $response = rest_get_server()->dispatch( $request );
-                $this->assertEquals( 7, count( $response->get_data() ) );
+                $total_posts = self::$total_posts + 1;
+
+                $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+                $request->set_param( 'per_page', self::$per_page );
+                $response = rest_get_server()->dispatch( $request );
+                $this->assertEquals( $total_posts, count( $response->get_data() ) );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
                 $request->set_param( 'search', 'Search Result' );
@@ -480 +521 @@
                         )
                 );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
                 $request->set_param( 'slug', 'apple' );
@@ -508 +550 @@
                         )
                 );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
                 $request->set_param( 'slug', array( 'banana', 'peach' ) );
@@ -541 +584 @@
                         )
                 );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
                 $request->set_param( 'slug', 'apple,banana' );
@@ -557 +601 @@
         public function test_get_items_status_query() {
                 wp_set_current_user( 0 );
+
                 $this->factory->post->create( array( 'post_status' => 'draft' ) );
-                $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+
+                $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+                $request->set_param( 'per_page', self::$per_page );
                 $request->set_param( 'status', 'publish' );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertEquals( 200, $response->get_status() );
-                $this->assertEquals( 1, count( $response->get_data() ) );
+                $this->assertEquals( self::$total_posts, count( $response->get_data() ) );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
                 $request->set_param( 'status', 'draft' );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertErrorResponse( 'rest_invalid_param', $response, 400 );
-                wp_set_current_user( self::$editor_id );
+
+                wp_set_current_user( self::$editor_id );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
                 $request->set_param( 'status', 'draft' );
@@ -636 +686 @@
 
                 wp_set_current_user( self::$private_reader_id );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
                 $request->set_param( 'status', array( 'private', 'future' ) );
@@ -645 +696 @@
         public function test_get_items_invalid_status_query() {
                 wp_set_current_user( 0 );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
                 $request->set_param( 'status', 'invalid' );
@@ -657 +709 @@
                         )
                 );
+
                 wp_set_current_user( 0 );
 
@@ -695 +748 @@
                         )
                 );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
                 $request->set_param( 'search', 'Apple' );
-                // order defaults to 'desc'
+
+                // Order defaults to 'desc'.
                 $request->set_param( 'orderby', 'title' );
                 $response = rest_get_server()->dispatch( $request );
@@ -703 +758 @@
                 $this->assertEquals( 'Apple Sauce', $data[0]['title']['rendered'] );
                 $this->assertPostsOrderedBy( '{posts}.post_title DESC' );
-                // order=>asc
+
+                // 'order' => 'asc'.
                 $request->set_param( 'order', 'asc' );
                 $response = rest_get_server()->dispatch( $request );
@@ -709 +765 @@
                 $this->assertEquals( 'Apple Cobbler', $data[0]['title']['rendered'] );
                 $this->assertPostsOrderedBy( '{posts}.post_title ASC' );
-                // order=>asc,id should fail
+
+                // 'order' => 'asc,id' should error.
                 $request->set_param( 'order', 'asc,id' );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertErrorResponse( 'rest_invalid_param', $response, 400 );
-                // orderby=>content should fail (invalid param test)
+
+                // 'orderby' => 'content' should error (invalid param test).
                 $request->set_param( 'order', 'asc' );
                 $request->set_param( 'orderby', 'content' );
@@ -722 +780 @@
         public function test_get_items_with_orderby_include_without_include_param() {
                 $this->factory->post->create( array( 'post_status' => 'publish' ) );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
                 $request->set_param( 'orderby', 'include' );
@@ -818 +877 @@
 
         public function test_get_items_with_orderby_relevance() {
-                $id1     = $this->factory->post->create(
+                $id1 = $this->factory->post->create(
                         array(
                                 'post_title'   => 'Title is more relevant',
@@ -825 +884 @@
                         )
                 );
-                $id2     = $this->factory->post->create(
+                $id2 = $this->factory->post->create(
                         array(
                                 'post_title'   => 'Title is',
@@ -832 +891 @@
                         )
                 );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
                 $request->set_param( 'orderby', 'relevance' );
@@ -845 +905 @@
 
         public function test_get_items_with_orderby_relevance_two_terms() {
-                $id1     = $this->factory->post->create(
+                $id1 = $this->factory->post->create(
                         array(
                                 'post_title'   => 'Title is more relevant',
@@ -852 +912 @@
                         )
                 );
-                $id2     = $this->factory->post->create(
+                $id2 = $this->factory->post->create(
                         array(
                                 'post_title'   => 'Title is',
@@ -859 +919 @@
                         )
                 );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
                 $request->set_param( 'orderby', 'relevance' );
@@ -879 +940 @@
 
         public function test_get_items_offset_query() {
-                $id1     = self::$post_id;
-                $id2     = $this->factory->post->create( array( 'post_status' => 'publish' ) );
-                $id3     = $this->factory->post->create( array( 'post_status' => 'publish' ) );
-                $id4     = $this->factory->post->create( array( 'post_status' => 'publish' ) );
-                $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+                $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+                $request->set_param( 'per_page', self::$per_page );
                 $request->set_param( 'offset', 1 );
                 $response = rest_get_server()->dispatch( $request );
-                $this->assertCount( 3, $response->get_data() );
-                // 'offset' works with 'per_page'
+                $this->assertCount( self::$total_posts - 1, $response->get_data() );
+
+                // 'offset' works with 'per_page'.
                 $request->set_param( 'per_page', 2 );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertCount( 2, $response->get_data() );
-                // 'offset' takes priority over 'page'
+
+                // 'offset' takes priority over 'page'.
                 $request->set_param( 'page', 2 );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertCount( 2, $response->get_data() );
-                // Invalid 'offset' should error
+
+                // Invalid 'offset' should error.
                 $request->set_param( 'offset', 'moreplease' );
                 $response = rest_get_server()->dispatch( $request );
@@ -903 +964 @@
         public function test_get_items_tags_query() {
                 $id1 = self::$post_id;
-                $id2 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
-                $id3 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
-                $id4 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
                 $tag = wp_insert_term( 'My Tag', 'post_tag' );
 
                 wp_set_object_terms( $id1, array( $tag['term_id'] ), 'post_tag' );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
                 $request->set_param( 'tags', array( $tag['term_id'] ) );
@@ -925 +984 @@
                 $tag = wp_insert_term( 'My Tag', 'post_tag' );
 
+                $total_posts = self::$total_posts + 3;
+
                 wp_set_object_terms( $id1, array( $tag['term_id'] ), 'post_tag' );
-                $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+
+                $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+                $request->set_param( 'per_page', self::$per_page );
                 $request->set_param( 'tags_exclude', array( $tag['term_id'] ) );
 
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
-                $this->assertCount( 3, $data );
+                $this->assertCount( $total_posts - 1, $data );
                 $this->assertEquals( $id4, $data[0]['id'] );
                 $this->assertEquals( $id3, $data[1]['id'] );
@@ -940 +1003 @@
                 $id1      = self::$post_id;
                 $id2      = $this->factory->post->create( array( 'post_status' => 'publish' ) );
-                $id3      = $this->factory->post->create( array( 'post_status' => 'publish' ) );
-                $id4      = $this->factory->post->create( array( 'post_status' => 'publish' ) );
                 $tag      = wp_insert_term( 'My Tag', 'post_tag' );
                 $category = wp_insert_term( 'My Category', 'category' );
@@ -967 +1028 @@
                 $id1      = self::$post_id;
                 $id2      = $this->factory->post->create( array( 'post_status' => 'publish' ) );
-                $id3      = $this->factory->post->create( array( 'post_status' => 'publish' ) );
-                $id4      = $this->factory->post->create( array( 'post_status' => 'publish' ) );
                 $tag      = wp_insert_term( 'My Tag', 'post_tag' );
                 $category = wp_insert_term( 'My Category', 'category' );
@@ -990 +1049 @@
         public function test_get_items_tags_and_categories_exclude_query() {
                 $id1      = self::$post_id;
+                $id2      = $this->factory->post->create( array( 'post_status' => 'publish' ) );
+                $tag      = wp_insert_term( 'My Tag', 'post_tag' );
+                $category = wp_insert_term( 'My Category', 'category' );
+
+                wp_set_object_terms( $id1, array( $tag['term_id'] ), 'post_tag' );
+                wp_set_object_terms( $id2, array( $tag['term_id'] ), 'post_tag' );
+                wp_set_object_terms( $id1, array( $category['term_id'] ), 'category' );
+
+                $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+                $request->set_param( 'tags', array( $tag['term_id'] ) );
+                $request->set_param( 'categories_exclude', array( $category['term_id'] ) );
+
+                $response = rest_get_server()->dispatch( $request );
+                $data     = $response->get_data();
+                $this->assertCount( 1, $data );
+                $this->assertEquals( $id2, $data[0]['id'] );
+
+                $request->set_param( 'tags_exclude', array( 'my-tag' ) );
+                $response = rest_get_server()->dispatch( $request );
+                $this->assertErrorResponse( 'rest_invalid_param', $response, 400 );
+        }
+
+        /**
+         * @ticket 44326
+         */
+        public function test_get_items_tags_or_categories_exclude_query() {
+                $id1      = end( self::$post_ids );
                 $id2      = $this->factory->post->create( array( 'post_status' => 'publish' ) );
                 $id3      = $this->factory->post->create( array( 'post_status' => 'publish' ) );
@@ -996 +1082 @@
                 $category = wp_insert_term( 'My Category', 'category' );
 
-                wp_set_object_terms( $id1, array( $tag['term_id'] ), 'post_tag' );
-                wp_set_object_terms( $id2, array( $tag['term_id'] ), 'post_tag' );
-                wp_set_object_terms( $id1, array( $category['term_id'] ), 'category' );
-
-                $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
-                $request->set_param( 'tags', array( $tag['term_id'] ) );
-                $request->set_param( 'categories_exclude', array( $category['term_id'] ) );
-
-                $response = rest_get_server()->dispatch( $request );
-                $data     = $response->get_data();
-                $this->assertCount( 1, $data );
-                $this->assertEquals( $id2, $data[0]['id'] );
-
-                $request->set_param( 'tags_exclude', array( 'my-tag' ) );
-                $response = rest_get_server()->dispatch( $request );
-                $this->assertErrorResponse( 'rest_invalid_param', $response, 400 );
-        }
-
-        /**
-         * @ticket 44326
-         */
-        public function test_get_items_tags_or_categories_exclude_query() {
-                $id1      = self::$post_id;
-                $id2      = $this->factory->post->create( array( 'post_status' => 'publish' ) );
-                $id3      = $this->factory->post->create( array( 'post_status' => 'publish' ) );
-                $id4      = $this->factory->post->create( array( 'post_status' => 'publish' ) );
-                $tag      = wp_insert_term( 'My Tag', 'post_tag' );
-                $category = wp_insert_term( 'My Category', 'category' );
+                $total_posts = self::$total_posts + 3;
 
                 wp_set_object_terms( $id1, array( $tag['term_id'] ), 'post_tag' );
@@ -1031 +1090 @@
 
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+                $request->set_param( 'per_page', self::$per_page );
                 $request->set_param( 'tags', array( $tag['term_id'] ) );
                 $request->set_param( 'categories_exclude', array( $category['term_id'] ) );
@@ -1038 +1098 @@
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
-                $this->assertCount( 3, $data );
+                $this->assertCount( $total_posts - 1, $data );
                 $this->assertEquals( $id4, $data[0]['id'] );
                 $this->assertEquals( $id2, $data[1]['id'] );
@@ -1082 +1142 @@
                 $id1 = self::$post_id;
                 $id2 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
-                $id3 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
 
                 update_option( 'sticky_posts', array( $id2 ) );
@@ -1117 +1176 @@
 
         public function test_get_items_sticky_no_sticky_posts() {
-                $id1 = self::$post_id;
-
                 update_option( 'sticky_posts', array() );
 
@@ -1154 +1211 @@
 
         public function test_get_items_not_sticky() {
-                $id1 = self::$post_id;
+                $id1 = end( self::$post_ids );
                 $id2 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
 
+                $total_posts = self::$total_posts + 1;
+
                 update_option( 'sticky_posts', array( $id2 ) );
 
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+                $request->set_param( 'per_page', self::$per_page );
                 $request->set_param( 'sticky', false );
 
                 $response = rest_get_server()->dispatch( $request );
-                $this->assertCount( 1, $response->get_data() );
+                $this->assertCount( $total_posts - 1, $response->get_data() );
 
                 $posts = $response->get_data();
@@ -1173 +1233 @@
 
         public function test_get_items_not_sticky_with_exclude() {
-                $id1 = self::$post_id;
+                $id1 = end( self::$post_ids );
                 $id2 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
                 $id3 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
 
+                $total_posts = self::$total_posts + 2;
+
                 update_option( 'sticky_posts', array( $id2 ) );
 
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+                $request->set_param( 'per_page', self::$per_page );
                 $request->set_param( 'sticky', false );
                 $request->set_param( 'exclude', array( $id3 ) );
 
                 $response = rest_get_server()->dispatch( $request );
-                $this->assertCount( 1, $response->get_data() );
+                $this->assertCount( $total_posts - 2, $response->get_data() );
 
                 $posts = $response->get_data();
-                $post  = $posts[0];
-                $this->assertEquals( $id1, $post['id'] );
+                $ids   = wp_list_pluck( $posts, 'id' );
+                $this->assertTrue( in_array( $id1, $ids, true ) );
+                $this->assertFalse( in_array( $id2, $ids, true ) );
+                $this->assertFalse( in_array( $id3, $ids, true ) );
 
                 $this->assertPostsWhere( " AND {posts}.ID NOT IN ($id3,$id2) AND {posts}.post_type = 'post' AND (({posts}.post_status = 'publish'))" );
@@ -1198 +1263 @@
                 $id3 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
 
+                $total_posts = self::$total_posts + 2;
+
                 update_option( 'sticky_posts', array() );
 
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+                $request->set_param( 'per_page', self::$per_page );
                 $request->set_param( 'sticky', false );
                 $request->set_param( 'exclude', array( $id3 ) );
 
                 $response = rest_get_server()->dispatch( $request );
-                $this->assertCount( 2, $response->get_data() );
+                $this->assertCount( $total_posts - 1, $response->get_data() );
 
                 $posts = $response->get_data();
                 $ids   = wp_list_pluck( $posts, 'id' );
-                sort( $ids );
-                $this->assertEquals( array( $id1, $id2 ), $ids );
+                $this->assertTrue( in_array( $id1, $ids, true ) );
+                $this->assertTrue( in_array( $id2, $ids, true ) );
+                $this->assertFalse( in_array( $id3, $ids, true ) );
 
                 $this->assertPostsWhere( " AND {posts}.ID NOT IN ($id3) AND {posts}.post_type = 'post' AND (({posts}.post_status = 'publish'))" );
@@ -1216 +1285 @@
 
         public function test_get_items_pagination_headers() {
-                // Start of the index
-                for ( $i = 0; $i < 49; $i++ ) {
-                        $this->factory->post->create(
-                                array(
-                                        'post_title' => "Post {$i}",
-                                )
-                        );
-                }
+                $total_posts = self::$total_posts;
+                $total_pages = (int) ceil( $total_posts / 10 );
+
+                // Start of the index.
                 $request  = new WP_REST_Request( 'GET', '/wp/v2/posts' );
                 $response = rest_get_server()->dispatch( $request );
                 $headers  = $response->get_headers();
-                $this->assertEquals( 50, $headers['X-WP-Total'] );
-                $this->assertEquals( 5, $headers['X-WP-TotalPages'] );
+                $this->assertEquals( $total_posts, $headers['X-WP-Total'] );
+                $this->assertEquals( $total_pages, $headers['X-WP-TotalPages'] );
                 $next_link = add_query_arg(
                         array(
@@ -1237 +1302 @@
                 $this->assertFalse( stripos( $headers['Link'], 'rel="prev"' ) );
                 $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
-                // 3rd page
-                $this->factory->post->create(
-                        array(
-                                'post_title' => 'Post 51',
-                        )
-                );
+
+                // 3rd page.
+                $this->factory->post->create();
+                $total_posts++;
+                $total_pages++;
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
                 $request->set_param( 'page', 3 );
                 $response = rest_get_server()->dispatch( $request );
                 $headers  = $response->get_headers();
-                $this->assertEquals( 51, $headers['X-WP-Total'] );
-                $this->assertEquals( 6, $headers['X-WP-TotalPages'] );
+                $this->assertEquals( $total_posts, $headers['X-WP-Total'] );
+                $this->assertEquals( $total_pages, $headers['X-WP-TotalPages'] );
                 $prev_link = add_query_arg(
                         array(
@@ -1263 +1327 @@
                 );
                 $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
-                // Last page
-                $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
-                $request->set_param( 'page', 6 );
+
+                // Last page.
+                $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+                $request->set_param( 'page', $total_pages );
                 $response = rest_get_server()->dispatch( $request );
                 $headers  = $response->get_headers();
-                $this->assertEquals( 51, $headers['X-WP-Total'] );
-                $this->assertEquals( 6, $headers['X-WP-TotalPages'] );
+                $this->assertEquals( $total_posts, $headers['X-WP-Total'] );
+                $this->assertEquals( $total_pages, $headers['X-WP-TotalPages'] );
                 $prev_link = add_query_arg(
                         array(
-                                'page' => 5,
+                                'page' => $total_pages - 1,
                         ),
                         rest_url( '/wp/v2/posts' )
@@ -1279 +1344 @@
                 $this->assertFalse( stripos( $headers['Link'], 'rel="next"' ) );
 
-                // Out of bounds
-                $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
-                $request->set_param( 'page', 8 );
+                // Out of bounds.
+                $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+                $request->set_param( 'page', 100 );
                 $response = rest_get_server()->dispatch( $request );
                 $headers  = $response->get_headers();
@@ -1287 +1352 @@
 
                 // With query params.
-                $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+                $total_pages = (int) ceil( $total_posts / 5 );
+                $request     = new WP_REST_Request( 'GET', '/wp/v2/posts' );
                 $request->set_query_params(
                         array(
@@ -1296 +1362 @@
                 $response = rest_get_server()->dispatch( $request );
                 $headers  = $response->get_headers();
-                $this->assertEquals( 51, $headers['X-WP-Total'] );
-                $this->assertEquals( 11, $headers['X-WP-TotalPages'] );
+                $this->assertEquals( $total_posts, $headers['X-WP-Total'] );
+                $this->assertEquals( $total_pages, $headers['X-WP-TotalPages'] );
                 $prev_link = add_query_arg(
                         array(
@@ -1321 +1387 @@
                 // Drafts status query var inaccessible to unauthorized users.
                 wp_set_current_user( 0 );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
                 $request->set_param( 'status', 'draft' );
@@ -1328 +1395 @@
                 // Users with 'read_private_posts' cap shouldn't also be able to view drafts.
                 wp_set_current_user( self::$private_reader_id );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
                 $request->set_param( 'status', 'draft' );
@@ -1335 +1403 @@
                 // But drafts are accessible to authorized users.
                 wp_set_current_user( self::$editor_id );
-                $response = rest_get_server()->dispatch( $request );
-                $data     = $response->get_data();
-
+
+                $response = rest_get_server()->dispatch( $request );
+                $data     = $response->get_data();
                 $this->assertEquals( $draft_id, $data[0]['id'] );
         }
@@ -1348 +1416 @@
 
                 wp_set_current_user( 0 );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
                 $request->set_param( 'status', 'private' );
@@ -1354 +1423 @@
 
                 wp_set_current_user( self::$private_reader_id );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
                 $request->set_param( 'status', 'private' );
@@ -1521 +1591 @@
                         )
                 );
+
                 wp_set_current_user( 0 );
 
@@ -1553 +1624 @@
         public function test_get_post_list_context_without_permission() {
                 wp_set_current_user( 0 );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
                 $request->set_query_params(
@@ -1566 +1638 @@
         public function test_get_post_context_without_permission() {
                 wp_set_current_user( 0 );
+
                 $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/posts/%d', self::$post_id ) );
                 $request->set_query_params(
@@ -1605 +1678 @@
                 );
 
-                $post    = get_post( $post_id );
+                $post = get_post( $post_id );
+
                 $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/posts/%d', $post_id ) );
                 $request->set_param( 'password', '$inthebananastand' );
@@ -1626 +1700 @@
                 );
 
-                $post    = get_post( $post_id );
+                $post = get_post( $post_id );
+
                 $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/posts/%d', $post_id ) );
                 $request->set_param( 'password', 'wrongpassword' );
@@ -1635 +1710 @@
 
         public function test_get_post_with_password_without_permission() {
-                $post_id  = $this->factory->post->create(
+                $post_id = $this->factory->post->create(
                         array(
                                 'post_password' => '$inthebananastand',
@@ -1642 +1717 @@
                         )
                 );
+
                 $request  = new WP_REST_Request( 'GET', sprintf( '/wp/v2/posts/%d', $post_id ) );
                 $response = rest_get_server()->dispatch( $request );
@@ -1704 +1780 @@
                         )
                 );
+
                 $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/posts/%d', $post_id ) );
                 $request->set_param( 'context', 'edit' );
@@ -1714 +1791 @@
                 register_post_status( 'testpubstatus', array( 'public' => true ) );
                 register_post_status( 'testprivtatus', array( 'public' => false ) );
-                // Public status
+
+                // Public status.
                 wp_update_post(
                         array(
@@ -1721 +1799 @@
                         )
                 );
+
                 $request  = new WP_REST_Request( 'GET', sprintf( '/wp/v2/posts/%d', self::$post_id ) );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertEquals( 200, $response->get_status() );
-                // Private status
+
+                // Private status.
                 wp_update_post(
                         array(
@@ -1731 +1811 @@
                         )
                 );
+
                 $request  = new WP_REST_Request( 'GET', sprintf( '/wp/v2/posts/%d', self::$post_id ) );
                 $response = rest_get_server()->dispatch( $request );
@@ -1748 +1829 @@
         public function test_prepare_item_limit_fields() {
                 wp_set_current_user( self::$editor_id );
+
                 $endpoint = new WP_REST_Posts_Controller( 'post' );
                 $request  = new WP_REST_Request( 'GET', sprintf( '/wp/v2/posts/%d', self::$post_id ) );
@@ -1775 +1857 @@
 
                 wp_set_current_user( self::$editor_id );
+
                 $endpoint = new WP_REST_Posts_Controller( 'post' );
-                $request  = new WP_REST_REQUEST( 'GET', sprintf( '/wp/v2/posts/%d', self::$post_id ) );
+                $request  = new WP_REST_Request( 'GET', sprintf( '/wp/v2/posts/%d', self::$post_id ) );
 
                 $request->set_param( 'context', 'edit' );
@@ -1810 +1893 @@
 
                 wp_set_current_user( self::$editor_id );
+
                 $endpoint = new WP_REST_Posts_Controller( 'post' );
-                $request  = new WP_REST_REQUEST( 'GET', sprintf( '/wp/v2/posts/%d', self::$post_id ) );
+                $request  = new WP_REST_Request( 'GET', sprintf( '/wp/v2/posts/%d', self::$post_id ) );
 
                 $request->set_param( 'context', 'edit' );
@@ -1920 +2004 @@
         public function test_create_post_date( $status, $params, $results ) {
                 wp_set_current_user( self::$editor_id );
+
                 update_option( 'timezone_string', $params['timezone_string'] );
 
@@ -1953 +2038 @@
         public function test_create_item_with_template() {
                 wp_set_current_user( self::$editor_id );
+
                 add_filter( 'theme_post_templates', array( $this, 'filter_theme_post_templates' ) );
 
@@ -2002 +2088 @@
         public function test_create_item_with_template_none() {
                 wp_set_current_user( self::$editor_id );
+
                 add_filter( 'theme_post_templates', array( $this, 'filter_theme_post_templates' ) );
                 update_post_meta( self::$post_id, '_wp_page_template', 'post-my-test-template.php' );
@@ -2050 +2137 @@
         public function test_create_post_as_contributor() {
                 wp_set_current_user( self::$contributor_id );
+
                 update_option( 'timezone_string', 'America/Chicago' );
 
@@ -2183 +2271 @@
         public function test_create_post_private_without_permission() {
                 wp_set_current_user( self::$author_id );
+
                 $user = wp_get_current_user();
                 $user->add_cap( 'publish_posts', false );
@@ -2204 +2293 @@
         public function test_create_post_publish_without_permission() {
                 wp_set_current_user( self::$author_id );
+
                 $user = wp_get_current_user();
                 $user->add_cap( 'publish_posts', false );
@@ -2409 +2499 @@
 
                 $data = $response->get_data();
-
                 $this->assertEquals( '0', $data['password'] );
         }
@@ -2552 +2641 @@
                 $request->set_body_params( $params );
                 $response = rest_get_server()->dispatch( $request );
-                $new_data = $response->get_data();
-                $this->assertEquals( "Rob O'Rourke's Diary", $new_data['title']['raw'] );
+
+                $data = $response->get_data();
+                $this->assertEquals( "Rob O'Rourke's Diary", $data['title']['raw'] );
         }
 
         public function test_create_post_with_categories() {
                 wp_set_current_user( self::$editor_id );
+
                 $category = wp_insert_term( 'Test Category', 'category' );
-                $request  = new WP_REST_Request( 'POST', '/wp/v2/posts' );
-                $params   = $this->set_post_data(
+
+                $request = new WP_REST_Request( 'POST', '/wp/v2/posts' );
+                $params  = $this->set_post_data(
                         array(
                                 'password'   => 'testing',
@@ -2577 +2669 @@
         public function test_create_post_with_categories_as_csv() {
                 wp_set_current_user( self::$editor_id );
+
                 $category  = wp_insert_term( 'Chicken', 'category' );
                 $category2 = wp_insert_term( 'Ribs', 'category' );
-                $request   = new WP_REST_Request( 'POST', '/wp/v2/posts' );
-                $params    = $this->set_post_data(
+
+                $request = new WP_REST_Request( 'POST', '/wp/v2/posts' );
+                $params  = $this->set_post_data(
                         array(
                                 'categories' => $category['term_id'] . ',' . $category2['term_id'],
@@ -2594 +2688 @@
         public function test_create_post_with_invalid_categories() {
                 wp_set_current_user( self::$editor_id );
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/posts' );
                 $params  = $this->set_post_data(
@@ -2618 +2713 @@
 
                 wp_set_current_user( self::$editor_id );
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/posts' );
                 $params  = $this->set_post_data(
@@ -2664 +2760 @@
         public function test_update_item_no_change() {
                 wp_set_current_user( self::$editor_id );
+
                 $post = get_post( self::$post_id );
 
@@ -2709 +2806 @@
                 // Create a new test post.
                 $post_id = $this->factory->post->create();
+
                 wp_set_current_user( self::$editor_id );
 
                 // Set the post date to the future.
                 $future_date = '2919-07-29T18:00:00';
-                $request     = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/posts/%d', $post_id ) );
+
+                $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/posts/%d', $post_id ) );
                 $request->add_header( 'content-type', 'application/json' );
                 $params = $this->set_post_data(
@@ -2797 +2896 @@
         public function test_update_post_without_permission() {
                 wp_set_current_user( self::$editor_id );
+
                 $user = wp_get_current_user();
                 $user->add_cap( 'edit_published_posts', false );
@@ -2951 +3051 @@
         public function test_update_post_date( $status, $params, $results ) {
                 wp_set_current_user( self::$editor_id );
+
                 update_option( 'timezone_string', $params['timezone_string'] );
 
@@ -3013 +3114 @@
 
                 wp_set_current_user( self::$editor_id );
+
                 update_option( 'timezone_string', 'America/Chicago' );
 
@@ -3191 +3293 @@
         public function test_update_post_with_empty_password() {
                 wp_set_current_user( self::$editor_id );
+
                 wp_update_post(
                         array(
@@ -3281 +3384 @@
 
         public function test_update_post_with_categories() {
-
-                wp_set_current_user( self::$editor_id );
+                wp_set_current_user( self::$editor_id );
+
                 $category = wp_insert_term( 'Test Category', 'category' );
 
@@ -3307 +3410 @@
                 $query = parse_url( $categories_path, PHP_URL_QUERY );
                 parse_str( $query, $args );
+
                 $request = new WP_REST_Request( 'GET', $args['rest_route'] );
                 unset( $args['rest_route'] );
@@ -3317 +3421 @@
 
         public function test_update_post_with_empty_categories() {
-
-                wp_set_current_user( self::$editor_id );
+                wp_set_current_user( self::$editor_id );
+
                 $category = wp_insert_term( 'Test Category', 'category' );
                 wp_set_object_terms( self::$post_id, $category['term_id'], 'category' );
@@ -3343 +3447 @@
 
                 wp_set_current_user( self::$editor_id );
+
                 $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/posts/%d', self::$post_id ) );
                 $params  = $this->set_post_data(
@@ -3364 +3469 @@
         public function test_update_item_with_template() {
                 wp_set_current_user( self::$editor_id );
+
                 add_filter( 'theme_post_templates', array( $this, 'filter_theme_post_templates' ) );
 
@@ -3393 +3499 @@
         public function test_update_item_with_template_none() {
                 wp_set_current_user( self::$editor_id );
+
                 add_filter( 'theme_post_templates', array( $this, 'filter_theme_post_templates' ) );
                 update_post_meta( self::$post_id, '_wp_page_template', 'post-my-test-template.php' );
@@ -3425 +3532 @@
          */
         public function test_update_item_with_same_template_that_no_longer_exists() {
-
                 wp_set_current_user( self::$editor_id );
 
@@ -3598 +3704 @@
         public function test_post_roundtrip_as_author( $raw, $expected ) {
                 wp_set_current_user( self::$author_id );
+
                 $this->assertFalse( current_user_can( 'unfiltered_html' ) );
                 $this->verify_post_roundtrip( $raw, $expected );
@@ -3604 +3711 @@
         public function test_post_roundtrip_as_editor_unfiltered_html() {
                 wp_set_current_user( self::$editor_id );
+
                 if ( is_multisite() ) {
                         $this->assertFalse( current_user_can( 'unfiltered_html' ) );
@@ -3655 +3763 @@
         public function test_post_roundtrip_as_superadmin_unfiltered_html() {
                 wp_set_current_user( self::$superadmin_id );
+
                 $this->assertTrue( current_user_can( 'unfiltered_html' ) );
                 $this->verify_post_roundtrip(
@@ -3681 +3790 @@
         public function test_delete_item() {
                 $post_id = $this->factory->post->create( array( 'post_title' => 'Deleted post' ) );
+
                 wp_set_current_user( self::$editor_id );
 
@@ -3695 +3805 @@
         public function test_delete_item_skip_trash() {
                 $post_id = $this->factory->post->create( array( 'post_title' => 'Deleted post' ) );
+
                 wp_set_current_user( self::$editor_id );
 
@@ -3709 +3820 @@
         public function test_delete_item_already_trashed() {
                 $post_id = $this->factory->post->create( array( 'post_title' => 'Deleted post' ) );
-                wp_set_current_user( self::$editor_id );
+
+                wp_set_current_user( self::$editor_id );
+
                 $request  = new WP_REST_Request( 'DELETE', sprintf( '/wp/v2/posts/%d', $post_id ) );
                 $response = rest_get_server()->dispatch( $request );
@@ -3728 +3841 @@
         public function test_delete_post_invalid_post_type() {
                 $page_id = $this->factory->post->create( array( 'post_type' => 'page' ) );
+
                 wp_set_current_user( self::$editor_id );
 
@@ -3946 +4060 @@
                 );
 
-                $request = new WP_REST_Request( 'OPTIONS', '/wp/v2/posts' );
-
+                $request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/posts' );
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
@@ -3958 +4071 @@
                 $post_id = $this->factory->post->create();
 
-                $request = new WP_REST_Request( 'GET', '/wp/v2/posts/' . $post_id );
-
+                $request  = new WP_REST_Request( 'GET', '/wp/v2/posts/' . $post_id );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertArrayHasKey( 'my_custom_int', $response->data );
@@ -4044 +4156 @@
 
                 wp_set_current_user( self::$editor_id );
+
                 // Check for error on update.
                 $request = new WP_REST_Request( 'POST', sprintf( '/wp/v2/posts/%d', self::$post_id ) );
@@ -4072 +4185 @@
 
         public function test_publish_action_ldo_registered() {
-
                 $response = rest_get_server()->dispatch( new WP_REST_Request( 'OPTIONS', '/wp/v2/posts' ) );
                 $data     = $response->get_data();
@@ -4084 +4196 @@
 
         public function test_sticky_action_ldo_registered_for_posts() {
-
                 $response = rest_get_server()->dispatch( new WP_REST_Request( 'OPTIONS', '/wp/v2/posts' ) );
                 $data     = $response->get_data();
@@ -4096 +4207 @@
 
         public function test_sticky_action_ldo_not_registered_for_non_posts() {
-
                 $response = rest_get_server()->dispatch( new WP_REST_Request( 'OPTIONS', '/wp/v2/pages' ) );
                 $data     = $response->get_data();
@@ -4108 +4218 @@
 
         public function test_author_action_ldo_registered_for_post_types_with_author_support() {
-
                 $response = rest_get_server()->dispatch( new WP_REST_Request( 'OPTIONS', '/wp/v2/posts' ) );
                 $data     = $response->get_data();
@@ -4120 +4229 @@
 
         public function test_author_action_ldo_not_registered_for_post_types_without_author_support() {
-
                 remove_post_type_support( 'post', 'author' );
 
@@ -4140 +4248 @@
 
         public function test_term_action_ldos_registered() {
-
                 $response = rest_get_server()->dispatch( new WP_REST_Request( 'OPTIONS', '/wp/v2/posts' ) );
                 $data     = $response->get_data();
@@ -4160 +4267 @@
 
         public function test_action_links_only_available_in_edit_context() {
-
                 wp_set_current_user( self::$author_id );
 
@@ -4176 +4282 @@
 
         public function test_publish_action_link_exists_for_author() {
-
                 wp_set_current_user( self::$author_id );
 
@@ -4192 +4297 @@
 
         public function test_publish_action_link_does_not_exist_for_contributor() {
-
                 wp_set_current_user( self::$contributor_id );
 
@@ -4208 +4312 @@
 
         public function test_sticky_action_exists_for_editor() {
-
                 wp_set_current_user( self::$editor_id );
 
@@ -4224 +4327 @@
 
         public function test_sticky_action_does_not_exist_for_author() {
-
                 wp_set_current_user( self::$author_id );
 
@@ -4240 +4342 @@
 
         public function test_sticky_action_does_not_exist_for_non_post_posts() {
-
                 wp_set_current_user( self::$editor_id );
 
@@ -4262 +4363 @@
 
         public function test_assign_author_action_exists_for_editor() {
-
                 wp_set_current_user( self::$editor_id );
 
@@ -4278 +4378 @@
 
         public function test_assign_author_action_does_not_exist_for_author() {
-
                 wp_set_current_user( self::$author_id );
 
@@ -4294 +4393 @@
 
         public function test_assign_author_action_does_not_exist_for_post_types_without_author_support() {
-
                 remove_post_type_support( 'post', 'author' );
 
@@ -4312 +4410 @@
 
         public function test_create_term_action_exists_for_editor() {
-
                 wp_set_current_user( self::$editor_id );
 
@@ -4330 +4427 @@
 
         public function test_create_term_action_non_hierarchical_exists_for_author() {
-
                 wp_set_current_user( self::$author_id );
 
@@ -4346 +4442 @@
 
         public function test_create_term_action_hierarchical_does_not_exists_for_author() {
-
                 wp_set_current_user( self::$author_id );
 
@@ -4362 +4457 @@
 
         public function test_assign_term_action_exists_for_contributor() {
-
                 wp_set_current_user( self::$contributor_id );
 
@@ -4385 +4479 @@
         public function test_assign_unfiltered_html_action_superadmin() {
                 $post_id = self::factory()->post->create();
+
                 wp_set_current_user( self::$superadmin_id );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts/' . $post_id );
                 $request->set_param( 'context', 'edit' );
@@ -4395 +4491 @@
         public function test_assign_unfiltered_html_action_editor() {
                 $post_id = self::factory()->post->create();
-                wp_set_current_user( self::$editor_id );
+
+                wp_set_current_user( self::$editor_id );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts/' . $post_id );
                 $request->set_param( 'context', 'edit' );
@@ -4410 +4508 @@
         public function test_assign_unfiltered_html_action_author() {
                 $post_id = self::factory()->post->create();
+
                 wp_set_current_user( self::$author_id );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/posts/' . $post_id );
                 $request->set_param( 'context', 'edit' );
@@ -4491 +4591 @@
          */
         public function test_putting_same_publish_date_does_not_remove_floating_date() {
-
                 wp_set_current_user( self::$superadmin_id );
 
@@ -4527 +4626 @@
          */
         public function test_putting_different_publish_date_removes_floating_date() {
-
                 wp_set_current_user( self::$superadmin_id );
 
@@ -4570 +4668 @@
          */
         public function test_publishing_post_with_same_date_removes_floating_date() {
-
                 wp_set_current_user( self::$superadmin_id );
 

trunk/tests/phpunit/tests/rest-api/rest-tags-controller.php

@@ -17 +17 @@
         protected static $subscriber;
 
+        protected static $tag_ids    = array();
+        protected static $total_tags = 30;
+        protected static $per_page   = 50;
+
         public static function wpSetUpBeforeClass( $factory ) {
                 self::$superadmin    = $factory->user->create(
@@ -44 +48 @@
                         )
                 );
+
                 if ( is_multisite() ) {
                         update_site_option( 'site_admins', array( 'superadmin' ) );
+                }
+
+                // Set up tags for pagination tests.
+                for ( $i = 0; $i < self::$total_tags; $i++ ) {
+                        $tag_ids[] = $factory->tag->create(
+                                array(
+                                        'name' => "Tag {$i}",
+                                )
+                        );
                 }
         }
@@ -54 +68 @@
                 self::delete_user( self::$editor );
                 self::delete_user( self::$subscriber );
+
+                // Remove tags for pagination tests.
+                foreach ( self::$tag_ids as $tag_id ) {
+                        wp_delete_term( $tag_id, 'post_tag' );
+                }
         }
 
@@ -155 +174 @@
         public function test_get_items() {
                 $this->factory->tag->create();
-                $request  = new WP_REST_Request( 'GET', '/wp/v2/tags' );
+
+                $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
+                $request->set_param( 'per_page', self::$per_page );
                 $response = rest_get_server()->dispatch( $request );
                 $this->check_get_taxonomy_terms_response( $response );
@@ -162 +183 @@
         public function test_get_items_invalid_permission_for_context() {
                 wp_set_current_user( 0 );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
                 $request->set_param( 'context', 'edit' );
@@ -172 +194 @@
                 $tag1    = $this->factory->tag->create( array( 'name' => 'Season 5' ) );
                 $tag2    = $this->factory->tag->create( array( 'name' => 'The Be Sharps' ) );
+
                 wp_set_object_terms( $post_id, array( $tag1, $tag2 ), 'post_tag' );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
                 $request->set_param( 'hide_empty', true );
@@ -180 +204 @@
                 $this->assertEquals( 'Season 5', $data[0]['name'] );
                 $this->assertEquals( 'The Be Sharps', $data[1]['name'] );
-                // invalid value should fail
+
+                // Invalid 'hide_empty' should error.
                 $request->set_param( 'hide_empty', 'nothanks' );
                 $response = rest_get_server()->dispatch( $request );
@@ -187 +212 @@
 
         public function test_get_items_include_query() {
-                $id1     = $this->factory->tag->create();
-                $id2     = $this->factory->tag->create();
-                $id3     = $this->factory->tag->create();
-                $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
-                // Orderby=>asc
-                $request->set_param( 'include', array( $id3, $id1 ) );
+                $id1 = $this->factory->tag->create();
+                $id2 = $this->factory->tag->create();
+
+                $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
+
+                // 'orderby' => 'asc'.
+                $request->set_param( 'include', array( $id2, $id1 ) );
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
                 $this->assertEquals( 2, count( $data ) );
                 $this->assertEquals( $id1, $data[0]['id'] );
-                // Orderby=>include
+
+                // 'orderby' => 'include'.
                 $request->set_param( 'orderby', 'include' );
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
                 $this->assertEquals( 2, count( $data ) );
-                $this->assertEquals( $id3, $data[0]['id'] );
-                // Include invalid value shoud fail
+                $this->assertEquals( $id2, $data[0]['id'] );
+
+                // Invalid 'include' should error.
                 $request->set_param( 'include', array( 'myterm' ) );
                 $response = rest_get_server()->dispatch( $request );
@@ -210 +238 @@
 
         public function test_get_items_exclude_query() {
-                $id1      = $this->factory->tag->create();
-                $id2      = $this->factory->tag->create();
-                $request  = new WP_REST_Request( 'GET', '/wp/v2/tags' );
+                $id1 = $this->factory->tag->create();
+                $id2 = $this->factory->tag->create();
+
+                $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
+                $request->set_param( 'per_page', self::$per_page );
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
-                $this->assertTrue( in_array( $id1, wp_list_pluck( $data, 'id' ), true ) );
-                $this->assertTrue( in_array( $id2, wp_list_pluck( $data, 'id' ), true ) );
+                $ids      = wp_list_pluck( $data, 'id' );
+                $this->assertTrue( in_array( $id1, $ids, true ) );
+                $this->assertTrue( in_array( $id2, $ids, true ) );
+
                 $request->set_param( 'exclude', array( $id2 ) );
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
-                $this->assertTrue( in_array( $id1, wp_list_pluck( $data, 'id' ), true ) );
-                $this->assertFalse( in_array( $id2, wp_list_pluck( $data, 'id' ), true ) );
-                // Invalid exclude value should fail
+                $ids      = wp_list_pluck( $data, 'id' );
+                $this->assertTrue( in_array( $id1, $ids, true ) );
+                $this->assertFalse( in_array( $id2, $ids, true ) );
+
+                // Invalid 'exclude' should error.
                 $request->set_param( 'exclude', array( 'invalid' ) );
                 $response = rest_get_server()->dispatch( $request );
@@ -229 +263 @@
 
         public function test_get_items_offset_query() {
-                $id1     = $this->factory->tag->create();
-                $id2     = $this->factory->tag->create();
-                $id3     = $this->factory->tag->create();
-                $id4     = $this->factory->tag->create();
-                $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
+                $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
+                $request->set_param( 'per_page', self::$per_page );
                 $request->set_param( 'offset', 1 );
                 $response = rest_get_server()->dispatch( $request );
-                $this->assertCount( 3, $response->get_data() );
-                // 'offset' works with 'per_page'
+                $this->assertCount( self::$total_tags - 1, $response->get_data() );
+
+                // 'offset' works with 'per_page'.
                 $request->set_param( 'per_page', 2 );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertCount( 2, $response->get_data() );
-                // 'offset' takes priority over 'page'
+
+                // 'offset' takes priority over 'page'.
                 $request->set_param( 'page', 3 );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertCount( 2, $response->get_data() );
-                // 'offset' invalid value shoudl fail
+
+                // Invalid 'offset' should error.
                 $request->set_param( 'offset', 'moreplease' );
                 $response = rest_get_server()->dispatch( $request );
@@ -254 +288 @@
         public function test_get_items_orderby_args() {
                 $tag1 = $this->factory->tag->create( array( 'name' => 'Apple' ) );
-                $tag2 = $this->factory->tag->create( array( 'name' => 'Banana' ) );
+                $tag2 = $this->factory->tag->create( array( 'name' => 'Zucchini' ) );
+
                 /*
                  * Tests:
@@ -269 +304 @@
                 $data = $response->get_data();
                 $this->assertEquals( 1, count( $data ) );
-                $this->assertEquals( 'Banana', $data[0]['name'] );
+                $this->assertEquals( 'Zucchini', $data[0]['name'] );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
                 $request->set_param( 'orderby', 'name' );
@@ -279 +315 @@
                 $this->assertEquals( 2, count( $data ) );
                 $this->assertEquals( 'Apple', $data[0]['name'] );
-                // Invalid orderby should fail.
+
+                // Invalid 'orderby' should error.
                 $request->set_param( 'orderby', 'invalid' );
                 $response = rest_get_server()->dispatch( $request );
@@ -289 +326 @@
                 $tag1 = $this->factory->tag->create( array( 'name' => 'Apple' ) );
                 $tag2 = $this->factory->tag->create( array( 'name' => 'Banana' ) );
-                // defaults to orderby=name, order=asc
+
+                // Defaults to 'orderby' => 'name', 'order' => 'asc'.
                 $request  = new WP_REST_Request( 'GET', '/wp/v2/tags' );
                 $response = rest_get_server()->dispatch( $request );
@@ -297 +335 @@
                 $this->assertEquals( 'Banana', $data[1]['name'] );
                 $this->assertEquals( 'Cantaloupe', $data[2]['name'] );
-                // orderby=id, with default order=asc
+
+                // 'orderby' => 'id', with default 'order' => 'asc'.
                 $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
                 $request->set_param( 'orderby', 'id' );
@@ -303 +342 @@
                 $this->assertEquals( 200, $response->get_status() );
                 $data = $response->get_data();
-                $this->assertEquals( 'Cantaloupe', $data[0]['name'] );
-                $this->assertEquals( 'Apple', $data[1]['name'] );
-                $this->assertEquals( 'Banana', $data[2]['name'] );
-                // orderby=id, order=desc
+                $this->assertEquals( 'Tag 0', $data[0]['name'] );
+                $this->assertEquals( 'Tag 1', $data[1]['name'] );
+                $this->assertEquals( 'Tag 2', $data[2]['name'] );
+
+                // 'orderby' => 'id', 'order' => 'desc'.
                 $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
                 $request->set_param( 'orderby', 'id' );
@@ -339 +379 @@
                 $tag2    = $this->factory->tag->create( array( 'name' => 'Marvel' ) );
                 $this->factory->tag->create( array( 'name' => 'Dark Horse' ) );
+
                 wp_set_object_terms( $post_id, array( $tag1, $tag2 ), 'post_tag' );
 
@@ -350 +391 @@
                 $this->assertEquals( 'DC', $data[0]['name'] );
 
-                // Invalid post should error.
+                // Invalid 'post' should error.
                 $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
                 $request->set_param( 'post', 'invalid-post' );
@@ -359 +400 @@
         public function test_get_terms_post_args_paging() {
                 $post_id = $this->factory->post->create();
-                $tag_ids = array();
-
-                for ( $i = 0; $i < 30; $i++ ) {
-                        $tag_ids[] = $this->factory->tag->create(
-                                array(
-                                        'name' => "Tag {$i}",
-                                )
-                        );
-                }
-                wp_set_object_terms( $post_id, $tag_ids, 'post_tag' );
+
+                wp_set_object_terms( $post_id, self::$tag_ids, 'post_tag' );
 
                 $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
@@ -433 +466 @@
                 );
                 $post_id = $this->factory->post->create();
+
                 wp_set_object_terms( $post_id, array( $term1, $term2 ), 'batman' );
 
@@ -448 +482 @@
                 $tag1 = $this->factory->tag->create( array( 'name' => 'Apple' ) );
                 $tag2 = $this->factory->tag->create( array( 'name' => 'Banana' ) );
+
                 /*
                  * Tests:
@@ -459 +494 @@
                 $this->assertEquals( 1, count( $data ) );
                 $this->assertEquals( 'Apple', $data[0]['name'] );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
                 $request->set_param( 'search', 'Garbage' );
@@ -468 +504 @@
 
         public function test_get_items_slug_arg() {
-                $tag1    = $this->factory->tag->create( array( 'name' => 'Apple' ) );
-                $tag2    = $this->factory->tag->create( array( 'name' => 'Banana' ) );
+                $tag1 = $this->factory->tag->create( array( 'name' => 'Apple' ) );
+                $tag2 = $this->factory->tag->create( array( 'name' => 'Banana' ) );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
                 $request->set_param( 'slug', 'apple' );
@@ -484 +521 @@
                 $id3 = $this->factory->tag->create( array( 'name' => 'Burrito' ) );
                 $this->factory->tag->create( array( 'name' => 'Pizza' ) );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
                 $request->set_param(
@@ -506 +544 @@
                 $id3 = $this->factory->tag->create( array( 'name' => 'Burrito' ) );
                 $this->factory->tag->create( array( 'name' => 'Pizza' ) );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
                 $request->set_param( 'slug', 'taco,burrito, enchilada' );
@@ -537 +576 @@
 
         public function test_get_terms_pagination_headers() {
-                // Start of the index
-                for ( $i = 0; $i < 50; $i++ ) {
-                        $this->factory->tag->create(
-                                array(
-                                        'name' => "Tag {$i}",
-                                )
-                        );
-                }
+                $total_tags  = self::$total_tags;
+                $total_pages = (int) ceil( $total_tags / 10 );
+
+                // Start of the index.
                 $request  = new WP_REST_Request( 'GET', '/wp/v2/tags' );
                 $response = rest_get_server()->dispatch( $request );
                 $headers  = $response->get_headers();
-                $this->assertEquals( 50, $headers['X-WP-Total'] );
-                $this->assertEquals( 5, $headers['X-WP-TotalPages'] );
+                $this->assertEquals( $total_tags, $headers['X-WP-Total'] );
+                $this->assertEquals( $total_pages, $headers['X-WP-TotalPages'] );
                 $next_link = add_query_arg(
                         array(
@@ -558 +593 @@
                 $this->assertFalse( stripos( $headers['Link'], 'rel="prev"' ) );
                 $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
-                // 3rd page
-                $this->factory->tag->create(
-                        array(
-                                'name' => 'Tag 51',
-                        )
-                );
+
+                // 3rd page.
+                $this->factory->tag->create();
+                $total_tags++;
+                $total_pages++;
                 $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
                 $request->set_param( 'page', 3 );
                 $response = rest_get_server()->dispatch( $request );
                 $headers  = $response->get_headers();
-                $this->assertEquals( 51, $headers['X-WP-Total'] );
-                $this->assertEquals( 6, $headers['X-WP-TotalPages'] );
+                $this->assertEquals( $total_tags, $headers['X-WP-Total'] );
+                $this->assertEquals( $total_pages, $headers['X-WP-TotalPages'] );
                 $prev_link = add_query_arg(
                         array(
@@ -584 +618 @@
                 );
                 $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
-                // Last page
-                $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
-                $request->set_param( 'page', 6 );
+
+                // Last page.
+                $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
+                $request->set_param( 'page', $total_pages );
                 $response = rest_get_server()->dispatch( $request );
                 $headers  = $response->get_headers();
-                $this->assertEquals( 51, $headers['X-WP-Total'] );
-                $this->assertEquals( 6, $headers['X-WP-TotalPages'] );
+                $this->assertEquals( $total_tags, $headers['X-WP-Total'] );
+                $this->assertEquals( $total_pages, $headers['X-WP-TotalPages'] );
                 $prev_link = add_query_arg(
                         array(
-                                'page' => 5,
+                                'page' => $total_pages - 1,
                         ),
                         rest_url( 'wp/v2/tags' )
@@ -599 +634 @@
                 $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
                 $this->assertFalse( stripos( $headers['Link'], 'rel="next"' ) );
-                // Out of bounds
-                $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
-                $request->set_param( 'page', 8 );
+
+                // Out of bounds.
+                $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
+                $request->set_param( 'page', 100 );
                 $response = rest_get_server()->dispatch( $request );
                 $headers  = $response->get_headers();
-                $this->assertEquals( 51, $headers['X-WP-Total'] );
-                $this->assertEquals( 6, $headers['X-WP-TotalPages'] );
+                $this->assertEquals( $total_tags, $headers['X-WP-Total'] );
+                $this->assertEquals( $total_pages, $headers['X-WP-TotalPages'] );
                 $prev_link = add_query_arg(
                         array(
-                                'page' => 6,
+                                'page' => $total_pages,
                         ),
                         rest_url( 'wp/v2/tags' )
@@ -624 +660 @@
 
         public function test_get_item() {
-                $id       = $this->factory->tag->create();
+                $id = $this->factory->tag->create();
+
                 $request  = new WP_REST_Request( 'GET', '/wp/v2/tags/' . $id );
                 $response = rest_get_server()->dispatch( $request );
@@ -634 +671 @@
          */
         public function test_get_item_meta() {
-                $id       = $this->factory->tag->create();
+                $id = $this->factory->tag->create();
+
                 $request  = new WP_REST_Request( 'GET', '/wp/v2/tags/' . $id );
                 $response = rest_get_server()->dispatch( $request );
@@ -655 +693 @@
          */
         public function test_get_item_meta_registered_for_different_taxonomy() {
-                $id       = $this->factory->tag->create();
+                $id = $this->factory->tag->create();
+
                 $request  = new WP_REST_Request( 'GET', '/wp/v2/tags/' . $id );
                 $response = rest_get_server()->dispatch( $request );
@@ -673 +712 @@
         public function test_get_item_invalid_permission_for_context() {
                 $id = $this->factory->tag->create();
+
                 wp_set_current_user( 0 );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/tags/' . $id );
                 $request->set_param( 'context', 'edit' );
@@ -696 +737 @@
         public function test_get_item_incorrect_taxonomy() {
                 register_taxonomy( 'robin', 'post' );
-                $term1    = $this->factory->term->create(
+                $term1 = $this->factory->term->create(
                         array(
                                 'name'     => 'Cape',
@@ -702 +743 @@
                         )
                 );
+
                 $request  = new WP_REST_Request( 'GET', '/wp/v2/tags/' . $term1 );
                 $response = rest_get_server()->dispatch( $request );
@@ -709 +751 @@
         public function test_create_item() {
                 wp_set_current_user( self::$administrator );
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/tags' );
                 $request->set_param( 'name', 'My Awesome Term' );
@@ -725 +768 @@
         public function test_create_item_contributor() {
                 wp_set_current_user( self::$contributor );
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/tags' );
                 $request->set_param( 'name', 'My Awesome Term' );
@@ -741 +785 @@
         public function test_create_item_incorrect_permissions() {
                 wp_set_current_user( self::$subscriber );
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/tags' );
                 $request->set_param( 'name', 'Incorrect permissions' );
@@ -749 +794 @@
         public function test_create_item_missing_arguments() {
                 wp_set_current_user( self::$administrator );
+
                 $request  = new WP_REST_Request( 'POST', '/wp/v2/tags' );
                 $response = rest_get_server()->dispatch( $request );
@@ -766 +812 @@
         public function test_create_item_with_meta() {
                 wp_set_current_user( self::$administrator );
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/tags' );
                 $request->set_param( 'name', 'My Awesome Term' );
@@ -780 +827 @@
         public function test_create_item_with_meta_wrong_id() {
                 wp_set_current_user( self::$administrator );
+
                 $existing_tag_id = $this->factory->tag->create( array( 'name' => 'My Not So Awesome Term' ) );
-                $request         = new WP_REST_Request( 'POST', '/wp/v2/tags' );
+
+                $request = new WP_REST_Request( 'POST', '/wp/v2/tags' );
                 $request->set_param( 'name', 'My Awesome Term' );
                 $request->set_param( 'meta', array( 'test_tag_single' => 'hello' ) );
@@ -797 +846 @@
         public function test_update_item() {
                 wp_set_current_user( self::$administrator );
+
                 $orig_args = array(
                         'name'        => 'Original Name',
@@ -802 +852 @@
                         'slug'        => 'original-slug',
                 );
-                $term      = get_term_by( 'id', $this->factory->tag->create( $orig_args ), 'post_tag' );
-                $request   = new WP_REST_Request( 'POST', '/wp/v2/tags/' . $term->term_id );
+
+                $term = get_term_by( 'id', $this->factory->tag->create( $orig_args ), 'post_tag' );
+
+                $request = new WP_REST_Request( 'POST', '/wp/v2/tags/' . $term->term_id );
                 $request->set_param( 'name', 'New Name' );
                 $request->set_param( 'description', 'New Description' );
@@ -828 +880 @@
         public function test_update_item_no_change() {
                 wp_set_current_user( self::$administrator );
+
                 $term = get_term_by( 'id', $this->factory->tag->create(), 'post_tag' );
 
-                $request = new WP_REST_Request( 'PUT', '/wp/v2/tags/' . $term->term_id );
-
+                $request  = new WP_REST_Request( 'PUT', '/wp/v2/tags/' . $term->term_id );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertEquals( 200, $response->get_status() );
@@ -847 +899 @@
         public function test_update_item_invalid_term() {
                 wp_set_current_user( self::$administrator );
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/tags/' . REST_TESTS_IMPOSSIBLY_HIGH_NUMBER );
                 $request->set_param( 'name', 'Invalid Term' );
@@ -855 +908 @@
         public function test_update_item_incorrect_permissions() {
                 wp_set_current_user( self::$subscriber );
-                $term    = get_term_by( 'id', $this->factory->tag->create(), 'post_tag' );
+
+                $term = get_term_by( 'id', $this->factory->tag->create(), 'post_tag' );
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/tags/' . $term->term_id );
                 $request->set_param( 'name', 'Incorrect permissions' );
@@ -867 +922 @@
         public function test_update_item_with_edit_term_cap_granted() {
                 wp_set_current_user( self::$subscriber );
-                $term    = $this->factory->tag->create_and_get();
+
+                $term = $this->factory->tag->create_and_get();
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/tags/' . $term->term_id );
                 $request->set_param( 'name', 'New Name' );
@@ -892 +949 @@
         public function test_update_item_with_edit_term_cap_revoked() {
                 wp_set_current_user( self::$administrator );
-                $term    = $this->factory->tag->create_and_get();
+
+                $term = $this->factory->tag->create_and_get();
+
                 $request = new WP_REST_Request( 'POST', '/wp/v2/tags/' . $term->term_id );
                 $request->set_param( 'name', 'New Name' );
@@ -912 +971 @@
         public function test_update_item_parent_non_hierarchical_taxonomy() {
                 wp_set_current_user( self::$administrator );
+
                 $term = get_term_by( 'id', $this->factory->tag->create(), 'post_tag' );
 
@@ -960 +1020 @@
         public function test_tag_roundtrip_as_editor() {
                 wp_set_current_user( self::$editor );
+
                 $this->assertEquals( ! is_multisite(), current_user_can( 'unfiltered_html' ) );
                 $this->verify_tag_roundtrip(
@@ -975 +1036 @@
         public function test_tag_roundtrip_as_editor_html() {
                 wp_set_current_user( self::$editor );
+
                 if ( is_multisite() ) {
                         $this->assertFalse( current_user_can( 'unfiltered_html' ) );
@@ -1004 +1066 @@
         public function test_tag_roundtrip_as_superadmin() {
                 wp_set_current_user( self::$superadmin );
+
                 $this->assertTrue( current_user_can( 'unfiltered_html' ) );
                 $this->verify_tag_roundtrip(
@@ -1019 +1082 @@
         public function test_tag_roundtrip_as_superadmin_html() {
                 wp_set_current_user( self::$superadmin );
+
                 $this->assertTrue( current_user_can( 'unfiltered_html' ) );
                 $this->verify_tag_roundtrip(
@@ -1034 +1098 @@
         public function test_delete_item() {
                 wp_set_current_user( self::$administrator );
-                $term    = get_term_by( 'id', $this->factory->tag->create( array( 'name' => 'Deleted Tag' ) ), 'post_tag' );
+
+                $term = get_term_by( 'id', $this->factory->tag->create( array( 'name' => 'Deleted Tag' ) ), 'post_tag' );
+
                 $request = new WP_REST_Request( 'DELETE', '/wp/v2/tags/' . $term->term_id );
                 $request->set_param( 'force', true );
@@ -1046 +1112 @@
         public function test_delete_item_no_trash() {
                 wp_set_current_user( self::$administrator );
+
                 $term = get_term_by( 'id', $this->factory->tag->create( array( 'name' => 'Deleted Tag' ) ), 'post_tag' );
 
@@ -1059 +1126 @@
         public function test_delete_item_invalid_term() {
                 wp_set_current_user( self::$administrator );
+
                 $request  = new WP_REST_Request( 'DELETE', '/wp/v2/tags/' . REST_TESTS_IMPOSSIBLY_HIGH_NUMBER );
                 $response = rest_get_server()->dispatch( $request );
@@ -1066 +1134 @@
         public function test_delete_item_incorrect_permissions() {
                 wp_set_current_user( self::$subscriber );
-                $term     = get_term_by( 'id', $this->factory->tag->create(), 'post_tag' );
+
+                $term = get_term_by( 'id', $this->factory->tag->create(), 'post_tag' );
+
                 $request  = new WP_REST_Request( 'DELETE', '/wp/v2/tags/' . $term->term_id );
                 $response = rest_get_server()->dispatch( $request );
@@ -1077 +1147 @@
         public function test_delete_item_with_delete_term_cap_granted() {
                 wp_set_current_user( self::$subscriber );
-                $term    = get_term_by( 'id', $this->factory->tag->create( array( 'name' => 'Deleted Tag' ) ), 'post_tag' );
+
+                $term = get_term_by( 'id', $this->factory->tag->create( array( 'name' => 'Deleted Tag' ) ), 'post_tag' );
+
                 $request = new WP_REST_Request( 'DELETE', '/wp/v2/tags/' . $term->term_id );
                 $request->set_param( 'force', true );
@@ -1103 +1175 @@
         public function test_delete_item_with_delete_term_cap_revoked() {
                 wp_set_current_user( self::$administrator );
-                $term    = get_term_by( 'id', $this->factory->tag->create( array( 'name' => 'Deleted Tag' ) ), 'post_tag' );
+
+                $term = get_term_by( 'id', $this->factory->tag->create( array( 'name' => 'Deleted Tag' ) ), 'post_tag' );
+
                 $request = new WP_REST_Request( 'DELETE', '/wp/v2/tags/' . $term->term_id );
                 $request->set_param( 'force', true );
@@ -1122 +1196 @@
 
         public function test_prepare_item() {
-                $term     = get_term_by( 'id', $this->factory->tag->create(), 'post_tag' );
+                $term = get_term_by( 'id', $this->factory->tag->create(), 'post_tag' );
+
                 $request  = new WP_REST_Request( 'GET', '/wp/v2/tags/' . $term->term_id );
                 $response = rest_get_server()->dispatch( $request );
@@ -1196 +1271 @@
                 $this->assertEquals( $schema, $data['schema']['properties']['my_custom_int'] );
 
-                $tag_id  = $this->factory->tag->create();
-                $request = new WP_REST_Request( 'GET', '/wp/v2/tags/' . $tag_id );
-
+                $tag_id = $this->factory->tag->create();
+
+                $request  = new WP_REST_Request( 'GET', '/wp/v2/tags/' . $tag_id );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertArrayHasKey( 'my_custom_int', $response->data );
@@ -1225 +1300 @@
 
                 wp_set_current_user( self::$administrator );
+
                 $tag_id = $this->factory->tag->create();
+
                 // Check for error on update.
                 $request = new WP_REST_Request( 'POST', sprintf( '/wp/v2/tags/%d', $tag_id ) );

trunk/tests/phpunit/tests/rest-api/rest-users-controller.php

@@ -16 +16 @@
         protected static $draft_editor;
         protected static $subscriber;
-        protected static $authors = array();
-        protected static $posts   = array();
+
+        protected static $authors     = array();
+        protected static $posts       = array();
+        protected static $user_ids    = array();
+        protected static $total_users = 30;
+        protected static $per_page    = 50;
+
         protected static $site;
 
@@ -101 +106 @@
                         update_site_option( 'site_admins', array( 'superadmin' ) );
                 }
+
+                // Set up users for pagination tests.
+                for ( $i = 0; $i < self::$total_users - 10; $i++ ) {
+                        self::$user_ids[] = $factory->user->create(
+                                array(
+                                        'role'         => 'contributor',
+                                        'display_name' => "User {$i}",
+                                )
+                        );
+                }
         }
 
@@ -111 +126 @@
                         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' );
@@ -121 +138 @@
                 if ( is_multisite() ) {
                         wpmu_delete_blog( self::$site, true );
+                }
+
+                // Remove users for pagination tests.
+                foreach ( self::$user_ids as $user_id ) {
+                        self::delete_user( $user_id );
                 }
         }
@@ -213 +235 @@
 
         public function test_get_items_with_edit_context_without_permission() {
-                //test with a user not logged in
+                // Test with a user not logged in.
                 $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
                 $request->set_param( 'context', 'edit' );
@@ -220 +242 @@
                 $this->assertEquals( 401, $response->get_status() );
 
-                //test with a user logged in but without sufficient capabilities; capability in question: 'list_users'
+                // Test with a user logged in but without sufficient capabilities;
+                // capability in question: 'list_users'.
                 wp_set_current_user( self::$editor );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
                 $request->set_param( 'context', 'edit' );
@@ -281 +305 @@
 
         public function test_get_items_pagination_headers() {
-                wp_set_current_user( self::$user );
-                for ( $i = 0; $i < 44; $i++ ) {
-                        $this->factory->user->create(
-                                array(
-                                        'name' => "User {$i}",
-                                )
-                        );
-                }
+                $total_users = self::$total_users;
+                $total_pages = (int) ceil( $total_users / 10 );
+
+                wp_set_current_user( self::$user );
+
+                // Start of the index.
                 $request  = new WP_REST_Request( 'GET', '/wp/v2/users' );
                 $response = rest_get_server()->dispatch( $request );
                 $headers  = $response->get_headers();
-                $this->assertEquals( 54, $headers['X-WP-Total'] );
-                $this->assertEquals( 6, $headers['X-WP-TotalPages'] );
+                $this->assertEquals( $total_users, $headers['X-WP-Total'] );
+                $this->assertEquals( $total_pages, $headers['X-WP-TotalPages'] );
                 $next_link = add_query_arg(
                         array(
@@ -302 +324 @@
                 $this->assertFalse( stripos( $headers['Link'], 'rel="prev"' ) );
                 $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
-                // 3rd page
-                $this->factory->user->create(
-                        array(
-                                'name' => 'User 51',
-                        )
-                );
+
+                // 3rd page.
+                $this->factory->user->create();
+                $total_users++;
+                $total_pages++;
                 $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
                 $request->set_param( 'page', 3 );
                 $response = rest_get_server()->dispatch( $request );
                 $headers  = $response->get_headers();
-                $this->assertEquals( 55, $headers['X-WP-Total'] );
-                $this->assertEquals( 6, $headers['X-WP-TotalPages'] );
+                $this->assertEquals( $total_users, $headers['X-WP-Total'] );
+                $this->assertEquals( $total_pages, $headers['X-WP-TotalPages'] );
                 $prev_link = add_query_arg(
                         array(
@@ -328 +349 @@
                 );
                 $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
-                // Last page
-                $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
-                $request->set_param( 'page', 6 );
+
+                // Last page.
+                $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
+                $request->set_param( 'page', $total_pages );
                 $response = rest_get_server()->dispatch( $request );
                 $headers  = $response->get_headers();
-                $this->assertEquals( 55, $headers['X-WP-Total'] );
-                $this->assertEquals( 6, $headers['X-WP-TotalPages'] );
+                $this->assertEquals( $total_users, $headers['X-WP-Total'] );
+                $this->assertEquals( $total_pages, $headers['X-WP-TotalPages'] );
                 $prev_link = add_query_arg(
                         array(
-                                'page' => 5,
+                                'page' => $total_pages - 1,
                         ),
                         rest_url( 'wp/v2/users' )
@@ -343 +365 @@
                 $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
                 $this->assertFalse( stripos( $headers['Link'], 'rel="next"' ) );
-                // Out of bounds
-                $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
-                $request->set_param( 'page', 8 );
+
+                // Out of bounds.
+                $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
+                $request->set_param( 'page', 100 );
                 $response = rest_get_server()->dispatch( $request );
                 $headers  = $response->get_headers();
-                $this->assertEquals( 55, $headers['X-WP-Total'] );
-                $this->assertEquals( 6, $headers['X-WP-TotalPages'] );
+                $this->assertEquals( $total_users, $headers['X-WP-Total'] );
+                $this->assertEquals( $total_pages, $headers['X-WP-TotalPages'] );
                 $prev_link = add_query_arg(
                         array(
-                                'page' => 6,
+                                'page' => $total_pages,
                         ),
                         rest_url( 'wp/v2/users' )
@@ -362 +385 @@
         public function test_get_items_per_page() {
                 wp_set_current_user( self::$user );
-                for ( $i = 0; $i < 20; $i++ ) {
-                        $this->factory->user->create( array( 'display_name' => "User {$i}" ) );
-                }
+
                 $request  = new WP_REST_Request( 'GET', '/wp/v2/users' );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertEquals( 10, count( $response->get_data() ) );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
                 $request->set_param( 'per_page', 5 );
@@ -376 +398 @@
         public function test_get_items_page() {
                 wp_set_current_user( self::$user );
-                for ( $i = 0; $i < 20; $i++ ) {
-                        $this->factory->user->create( array( 'display_name' => "User {$i}" ) );
-                }
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
                 $request->set_param( 'per_page', 5 );
@@ -397 +417 @@
         public function test_get_items_orderby_name() {
                 wp_set_current_user( self::$user );
+
                 $low_id  = $this->factory->user->create( array( 'display_name' => 'AAAAA' ) );
                 $mid_id  = $this->factory->user->create( array( 'display_name' => 'NNNNN' ) );
                 $high_id = $this->factory->user->create( array( 'display_name' => 'ZZZZ' ) );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
                 $request->set_param( 'orderby', 'name' );
@@ -407 +429 @@
                 $data     = $response->get_data();
                 $this->assertEquals( $high_id, $data[0]['id'] );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
                 $request->set_param( 'orderby', 'name' );
@@ -429 +452 @@
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
-
                 $this->assertEquals( $high_id, $data[0]['id'] );
 
@@ -455 +477 @@
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
-
                 $this->assertEquals( $high_id, $data[0]['id'] );
 
@@ -543 +564 @@
         public function test_get_items_offset() {
                 wp_set_current_user( self::$user );
-                // 9 users created in wpSetUpBeforeClass(), plus default user.
-                $this->factory->user->create();
-                $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
+
+                $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
+                $request->set_param( 'per_page', self::$per_page );
                 $request->set_param( 'offset', 1 );
                 $response = rest_get_server()->dispatch( $request );
-                $this->assertCount( 10, $response->get_data() );
-                // 'offset' works with 'per_page'
+                $this->assertCount( self::$total_users - 1, $response->get_data() );
+
+                // 'offset' works with 'per_page'.
                 $request->set_param( 'per_page', 2 );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertCount( 2, $response->get_data() );
-                // 'offset' takes priority over 'page'
+
+                // 'offset' takes priority over 'page'.
                 $request->set_param( 'page', 3 );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertCount( 2, $response->get_data() );
-                // 'offset' invalid value should error
+
+                // Invalid 'offset' should error.
                 $request->set_param( 'offset', 'moreplease' );
                 $response = rest_get_server()->dispatch( $request );
@@ -565 +589 @@
         public function test_get_items_include_query() {
                 wp_set_current_user( self::$user );
-                $id1     = $this->factory->user->create();
-                $id2     = $this->factory->user->create();
-                $id3     = $this->factory->user->create();
-                $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
-                // Orderby=>asc
-                $request->set_param( 'include', array( $id3, $id1 ) );
+
+                $id1 = $this->factory->user->create();
+                $id2 = $this->factory->user->create();
+
+                $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
+
+                // 'orderby' => 'asc'.
+                $request->set_param( 'include', array( $id2, $id1 ) );
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
                 $this->assertEquals( 2, count( $data ) );
                 $this->assertEquals( $id1, $data[0]['id'] );
-                // Orderby=>include
+
+                // 'orderby' => 'include'.
                 $request->set_param( 'orderby', 'include' );
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
                 $this->assertEquals( 2, count( $data ) );
-                $this->assertEquals( $id3, $data[0]['id'] );
-                // Invalid include should fail
+                $this->assertEquals( $id2, $data[0]['id'] );
+
+                // Invalid 'include' should error.
                 $request->set_param( 'include', 'invalid' );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertErrorResponse( 'rest_invalid_param', $response, 400 );
-                // No privileges
-                $request->set_param( 'include', array( $id3, $id1 ) );
+
+                // No privileges.
+                $request->set_param( 'include', array( $id2, $id1 ) );
                 wp_set_current_user( 0 );
                 $response = rest_get_server()->dispatch( $request );
@@ -596 +625 @@
         public function test_get_items_exclude_query() {
                 wp_set_current_user( self::$user );
-                $id1     = $this->factory->user->create();
-                $id2     = $this->factory->user->create();
-                $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
-                $request->set_param( 'per_page', 20 ); // there are >10 users at this point
-                $response = rest_get_server()->dispatch( $request );
-                $data     = $response->get_data();
-                $this->assertTrue( in_array( $id1, wp_list_pluck( $data, 'id' ), true ) );
-                $this->assertTrue( in_array( $id2, wp_list_pluck( $data, 'id' ), true ) );
+
+                $id1 = $this->factory->user->create();
+                $id2 = $this->factory->user->create();
+
+                $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
+                $request->set_param( 'per_page', self::$per_page ); // There are >10 users at this point.
+                $response = rest_get_server()->dispatch( $request );
+                $data     = $response->get_data();
+                $ids      = wp_list_pluck( $data, 'id' );
+                $this->assertTrue( in_array( $id1, $ids, true ) );
+                $this->assertTrue( in_array( $id2, $ids, true ) );
+
                 $request->set_param( 'exclude', array( $id2 ) );
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
-                $this->assertTrue( in_array( $id1, wp_list_pluck( $data, 'id' ), true ) );
-                $this->assertFalse( in_array( $id2, wp_list_pluck( $data, 'id' ), true ) );
-                // Invalid exlude value should error.
+                $ids      = wp_list_pluck( $data, 'id' );
+                $this->assertTrue( in_array( $id1, $ids, true ) );
+                $this->assertFalse( in_array( $id2, $ids, true ) );
+
+                // Invalid 'exclude' should error.
                 $request->set_param( 'exclude', 'none-of-those-please' );
                 $response = rest_get_server()->dispatch( $request );
@@ -617 +652 @@
         public function test_get_items_search() {
                 wp_set_current_user( self::$user );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
                 $request->set_param( 'search', 'yololololo' );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertEquals( 0, count( $response->get_data() ) );
+
                 $yolo_id = $this->factory->user->create( array( 'display_name' => 'yololololo' ) );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
                 $request->set_param( 'search', 'yololololo' );
@@ -633 +671 @@
                         )
                 );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
                 $request->set_param( 'search', 'ada' );
@@ -643 +682 @@
         public function test_get_items_slug_query() {
                 wp_set_current_user( self::$user );
+
                 $this->factory->user->create(
                         array(
@@ -649 +689 @@
                         )
                 );
-                $id2     = $this->factory->user->create(
+                $id2 = $this->factory->user->create(
                         array(
                                 'display_name' => 'Moo',
@@ -655 +695 @@
                         )
                 );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
                 $request->set_param( 'slug', 'foo' );
@@ -665 +706 @@
         public function test_get_items_slug_array_query() {
                 wp_set_current_user( self::$user );
+
                 $id1 = $this->factory->user->create(
                         array(
@@ -689 +731 @@
                         )
                 );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
                 $request->set_param(
@@ -709 +752 @@
         public function test_get_items_slug_csv_query() {
                 wp_set_current_user( self::$user );
+
                 $id1 = $this->factory->user->create(
                         array(
@@ -733 +777 @@
                         )
                 );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
                 $request->set_param( 'slug', 'taco,burrito , enchilada' );
@@ -747 +792 @@
         public function test_get_items_roles() {
                 wp_set_current_user( self::$user );
-                $tango   = $this->factory->user->create(
+
+                $tango = $this->factory->user->create(
                         array(
                                 'display_name' => 'tango',
@@ -753 +799 @@
                         )
                 );
-                $yolo    = $this->factory->user->create(
+                $yolo  = $this->factory->user->create(
                         array(
                                 'display_name' => 'yolo',
@@ -759 +805 @@
                         )
                 );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
                 $request->set_param( 'roles', 'author,subscriber' );
@@ -766 +813 @@
                 $this->assertEquals( $tango, $data[1]['id'] );
                 $this->assertEquals( $yolo, $data[2]['id'] );
+
                 $request->set_param( 'roles', 'author' );
                 $response = rest_get_server()->dispatch( $request );
@@ -771 +819 @@
                 $this->assertEquals( 1, count( $data ) );
                 $this->assertEquals( $yolo, $data[0]['id'] );
+
                 wp_set_current_user( 0 );
+
                 $request->set_param( 'roles', 'author' );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertErrorResponse( 'rest_user_cannot_view', $response, 401 );
+
                 wp_set_current_user( self::$editor );
+
                 $request->set_param( 'roles', 'author' );
                 $response = rest_get_server()->dispatch( $request );
@@ -783 +835 @@
         public function test_get_items_invalid_roles() {
                 wp_set_current_user( self::$user );
-                $lolz    = $this->factory->user->create(
+
+                $lolz = $this->factory->user->create(
                         array(
                                 'display_name' => 'lolz',
@@ -789 +842 @@
                         )
                 );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
                 $request->set_param( 'roles', 'ilovesteak,author' );
@@ -795 +849 @@
                 $this->assertEquals( 1, count( $data ) );
                 $this->assertEquals( $lolz, $data[0]['id'] );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
                 $request->set_param( 'roles', 'steakisgood' );
@@ -805 +860 @@
         public function test_get_items_who_author_query() {
                 wp_set_current_user( self::$superadmin );
+
                 // First request should include subscriber in the set.
                 $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
@@ -811 +867 @@
                 $this->assertEquals( 200, $response->get_status() );
                 $this->assertCount( 1, $response->get_data() );
+
                 // Second request should exclude subscriber.
                 $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
@@ -822 +879 @@
         public function test_get_items_who_invalid_query() {
                 wp_set_current_user( self::$user );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
                 $request->set_param( 'who', 'editor' );
@@ -834 +892 @@
         public function test_get_items_who_unauthorized_query() {
                 wp_set_current_user( self::$subscriber );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
                 $request->set_param( 'who', 'authors' );
@@ -842 +901 @@
         public function test_get_item() {
                 $user_id = $this->factory->user->create();
-                wp_set_current_user( self::$user );
-
-                $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/users/%d', $user_id ) );
-
+
+                wp_set_current_user( self::$user );
+
+                $request  = new WP_REST_Request( 'GET', sprintf( '/wp/v2/users/%d', $user_id ) );
                 $response = rest_get_server()->dispatch( $request );
                 $this->check_get_user_response( $response, 'embed' );
@@ -852 +911 @@
         public function test_prepare_item() {
                 wp_set_current_user( self::$user );
+
                 $request = new WP_REST_Request;
                 $request->set_param( 'context', 'edit' );
@@ -861 +921 @@
         public function test_prepare_item_limit_fields() {
                 wp_set_current_user( self::$user );
+
                 $request = new WP_REST_Request;
                 $request->set_param( 'context', 'edit' );
@@ -878 +939 @@
                 wp_set_current_user( self::$user );
 
-                $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/users/%d', self::$editor ) );
-
+                $request  = new WP_REST_Request( 'GET', sprintf( '/wp/v2/users/%d', self::$editor ) );
                 $response = rest_get_server()->dispatch( $request );
 
@@ -906 +966 @@
         public function test_get_user_empty_capabilities() {
                 wp_set_current_user( self::$user );
+
                 $this->allow_user_to_manage_multisite();
 
@@ -914 +975 @@
                         )
                 );
+
                 delete_user_option( $lolz, 'capabilities' );
                 delete_user_option( $lolz, 'user_level' );
+
                 $request = new WP_REST_Request( 'GET', '/wp/v2/users/' . $lolz );
                 $request->set_param( 'context', 'edit' );
@@ -932 +995 @@
         public function test_cannot_get_item_without_permission() {
                 wp_set_current_user( self::$editor );
+
                 $request  = new WP_REST_Request( 'GET', sprintf( '/wp/v2/users/%d', self::$user ) );
                 $response = rest_get_server()->dispatch( $request );
@@ -945 +1009 @@
         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 = rest_get_server()->dispatch( $request );
@@ -964 +1029 @@
         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 = rest_get_server()->dispatch( $request );
@@ -993 +1059 @@
                         )
                 );
-                $this->post_id   = $this->factory->post->create(
+
+                $this->post_id = $this->factory->post->create(
                         array(
                                 'post_author' => $this->author_id,
                         )
                 );
+
                 wp_set_current_user( 0 );
+
                 $request  = new WP_REST_Request( 'GET', sprintf( '/wp/v2/users/%d', $this->author_id ) );
                 $response = rest_get_server()->dispatch( $request );
@@ -1010 +1079 @@
                         )
                 );
+
                 wp_set_current_user( 0 );
+
                 $request  = new WP_REST_Request( 'GET', sprintf( '/wp/v2/users/%d', $this->author_id ) );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertEquals( 401, $response->get_status() );
+
                 $this->post_id = $this->factory->post->create(
                         array(
@@ -1020 +1092 @@
                         )
                 );
-                $response      = rest_get_server()->dispatch( $request );
+
+                $response = rest_get_server()->dispatch( $request );
                 $this->check_get_user_response( $response, 'embed' );
         }
@@ -1026 +1099 @@
         public function test_get_user_with_edit_context() {
                 $user_id = $this->factory->user->create();
+
                 $this->allow_user_to_manage_multisite();
 
                 $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/users/%d', $user_id ) );
                 $request->set_param( 'context', 'edit' );
-
                 $response = rest_get_server()->dispatch( $request );
                 $this->check_get_user_response( $response, 'edit' );
@@ -1041 +1114 @@
                         )
                 );
-                $this->post_id   = $this->factory->post->create(
+
+                $this->post_id = $this->factory->post->create(
                         array(
                                 'post_author' => $this->author_id,
                         )
                 );
+
                 wp_set_current_user( 0 );
+
                 $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/users/%d', $this->author_id ) );
                 $request->set_param( 'context', 'edit' );
@@ -1056 +1132 @@
                 wp_set_current_user( self::$user );
 
-                $request = new WP_REST_Request( 'GET', '/wp/v2/users/me' );
-
+                $request  = new WP_REST_Request( 'GET', '/wp/v2/users/me' );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertEquals( 200, $response->get_status() );
@@ -1071 +1146 @@
         public function test_get_current_user_without_permission() {
                 wp_set_current_user( 0 );
+
                 $request  = new WP_REST_Request( 'GET', '/wp/v2/users/me' );
                 $response = rest_get_server()->dispatch( $request );
-
                 $this->assertErrorResponse( 'rest_not_logged_in', $response, 401 );
         }
@@ -1079 +1154 @@
         public function test_create_item() {
                 $this->allow_user_to_manage_multisite();
+
                 wp_set_current_user( self::$user );
 
@@ -1096 +1172 @@
                 $request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
                 $request->set_body_params( $params );
-
-                $response = rest_get_server()->dispatch( $request );
-                $data     = $response->get_data();
+                $response = rest_get_server()->dispatch( $request );
+
+                $data = $response->get_data();
                 $this->assertEquals( 'http://example.com', $data['url'] );
                 $this->assertEquals( array( 'editor' ), $data['roles'] );
@@ -1106 +1182 @@
         public function test_create_item_invalid_username() {
                 $this->allow_user_to_manage_multisite();
+
                 wp_set_current_user( self::$user );
 
@@ -1128 +1205 @@
                 $request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
                 $request->set_body_params( $params );
-
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertErrorResponse( 'rest_invalid_param', $response, 400 );
 
                 $data = $response->get_data();
+
                 if ( is_multisite() ) {
                         $this->assertInternalType( 'array', $data['additional_errors'] );
@@ -1153 +1230 @@
         public function test_create_item_illegal_username() {
                 $this->allow_user_to_manage_multisite();
+
                 wp_set_current_user( self::$user );
 
@@ -1172 +1250 @@
                 $request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
                 $request->set_body_params( $params );
-
                 $response = rest_get_server()->dispatch( $request );
 
@@ -1320 +1397 @@
         public function test_json_create_user() {
                 $this->allow_user_to_manage_multisite();
+
                 wp_set_current_user( self::$user );
 
@@ -1331 +1409 @@
                 $request->add_header( 'content-type', 'application/json' );
                 $request->set_body( wp_json_encode( $params ) );
-
-                $response = rest_get_server()->dispatch( $request );
+                $response = rest_get_server()->dispatch( $request );
+
                 $this->check_add_edit_user_response( $response );
         }
@@ -1355 +1433 @@
         public function test_create_user_invalid_id() {
                 $this->allow_user_to_manage_multisite();
+
                 wp_set_current_user( self::$user );
 
@@ -1374 +1453 @@
         public function test_create_user_invalid_email() {
                 $this->allow_user_to_manage_multisite();
+
                 wp_set_current_user( self::$user );
 
@@ -1392 +1472 @@
         public function test_create_user_invalid_role() {
                 $this->allow_user_to_manage_multisite();
+
                 wp_set_current_user( self::$user );
 
@@ -1420 +1501 @@
                         )
                 );
-                $this->allow_user_to_manage_multisite();
+
+                $this->allow_user_to_manage_multisite();
+
                 wp_set_current_user( self::$user );
 
@@ -1435 +1518 @@
                 $request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
                 $request->set_body_params( $_POST );
-
-                $response = rest_get_server()->dispatch( $request );
+                $response = rest_get_server()->dispatch( $request );
+
                 $this->check_add_edit_user_response( $response, true );
 
@@ -1456 +1539 @@
         public function test_update_item_no_change() {
                 $this->allow_user_to_manage_multisite();
-                wp_set_current_user( self::$user );
+
+                wp_set_current_user( self::$user );
+
                 $user = get_userdata( self::$editor );
 
@@ -1484 +1569 @@
                         )
                 );
-                $this->allow_user_to_manage_multisite();
+
+                $this->allow_user_to_manage_multisite();
+
                 wp_set_current_user( self::$user );
 
@@ -1540 +1627 @@
                         )
                 );
-                $this->allow_user_to_manage_multisite();
+
+                $this->allow_user_to_manage_multisite();
+
                 wp_set_current_user( self::$user );
 
@@ -1557 +1646 @@
                         )
                 );
-                $this->allow_user_to_manage_multisite();
+
+                $this->allow_user_to_manage_multisite();
+
                 wp_set_current_user( self::$user );
 
@@ -1580 +1671 @@
                         )
                 );
-                $this->allow_user_to_manage_multisite();
+
+                $this->allow_user_to_manage_multisite();
+
                 wp_set_current_user( self::$user );
 
@@ -1607 +1700 @@
                         )
                 );
-                $this->allow_user_to_manage_multisite();
+
+                $this->allow_user_to_manage_multisite();
+
                 wp_set_current_user( self::$user );
 
@@ -1630 +1725 @@
                         )
                 );
-                $this->allow_user_to_manage_multisite();
+
+                $this->allow_user_to_manage_multisite();
+
                 wp_set_current_user( self::$user );
 
@@ -1650 +1747 @@
                         )
                 );
-                $this->allow_user_to_manage_multisite();
+
+                $this->allow_user_to_manage_multisite();
+
                 wp_set_current_user( self::$user );
 
@@ -1687 +1786 @@
 
                 wp_set_current_user( self::$user );
+
                 $this->allow_user_to_manage_multisite();
 
@@ -1707 +1807 @@
 
                 wp_set_current_user( self::$user );
+
                 $this->allow_user_to_manage_multisite();
 
@@ -1810 +1911 @@
         public function test_update_user_role_invalid_role() {
                 wp_set_current_user( self::$user );
+
                 $this->allow_user_to_manage_multisite();
 
@@ -1859 +1961 @@
         public function test_update_user_invalid_id() {
                 $this->allow_user_to_manage_multisite();
+
                 wp_set_current_user( self::$user );
 
                 $params = array(
-                        'id'       => '156',
+                        'id'       => '0',
                         'username' => 'lisasimpson',
                         'password' => 'DavidHasselhoff',
@@ -1887 +1990 @@
 
                 wp_set_current_user( self::$editor );
+
                 $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/users/%d', $user_id ) );
                 $request->set_param( 'roles', array( 'editor' ) );
@@ -1904 +2008 @@
 
                 wp_set_current_user( self::$user );
+
                 $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/users/%d', $user_id ) );
                 $request->set_param( 'roles', array( 'editor' ) );
@@ -1924 +2029 @@
 
                 wp_set_current_user( self::$user );
+
                 $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/users/%d', $user_id ) );
                 $request->set_param( 'roles', array( 'editor' ) );
@@ -1946 +2052 @@
         public function test_update_item_invalid_password() {
                 $this->allow_user_to_manage_multisite();
+
                 wp_set_current_user( self::$user );
 
                 $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/users/%d', self::$editor ) );
-
                 $request->set_param( 'password', 'no\\backslashes\\allowed' );
                 $response = rest_get_server()->dispatch( $request );
@@ -2035 +2141 @@
         public function test_user_roundtrip_as_editor() {
                 wp_set_current_user( self::$editor );
+
                 $this->assertEquals( ! is_multisite(), current_user_can( 'unfiltered_html' ) );
                 $this->verify_user_roundtrip(
@@ -2061 +2168 @@
         public function test_user_roundtrip_as_editor_html() {
                 wp_set_current_user( self::$editor );
+
                 if ( is_multisite() ) {
                         $this->assertFalse( current_user_can( 'unfiltered_html' ) );
@@ -2112 +2220 @@
         public function test_user_roundtrip_as_superadmin() {
                 wp_set_current_user( self::$superadmin );
+
                 $this->assertTrue( current_user_can( 'unfiltered_html' ) );
                 $valid_username = is_multisite() ? 'noinvalidcharshere' : 'no-invalid-chars-here';
@@ -2140 +2249 @@
         public function test_user_roundtrip_as_superadmin_html() {
                 wp_set_current_user( self::$superadmin );
+
                 $this->assertTrue( current_user_can( 'unfiltered_html' ) );
                 $valid_username = is_multisite() ? 'noinvalidcharshere' : 'no-invalid-chars-here';
@@ -2170 +2280 @@
 
                 $this->allow_user_to_manage_multisite();
-                wp_set_current_user( self::$user );
-
-                $userdata = get_userdata( $user_id ); // cache for later
+
+                wp_set_current_user( self::$user );
+
+                $userdata = get_userdata( $user_id ); // Cache for later.
                 $request  = new WP_REST_Request( 'DELETE', sprintf( '/wp/v2/users/%d', $user_id ) );
                 $request->set_param( 'force', true );
@@ -2194 +2305 @@
 
                 $this->allow_user_to_manage_multisite();
-                wp_set_current_user( self::$user );
-
-                $userdata = get_userdata( $user_id ); // cache for later
+
+                wp_set_current_user( self::$user );
+
+                $userdata = get_userdata( $user_id ); // Cache for later.
 
                 $request = new WP_REST_Request( 'DELETE', sprintf( '/wp/v2/users/%d', $user_id ) );
@@ -2214 +2326 @@
                 $this->assertErrorResponse( 'rest_trash_not_supported', $response, 501 );
 
-                // Ensure the user still exists
+                // Ensure the user still exists.
                 $user = get_user_by( 'id', $user_id );
                 $this->assertNotEmpty( $user );
@@ -2285 +2397 @@
 
                 $this->allow_user_to_manage_multisite();
+
                 wp_set_current_user( self::$editor );
 
@@ -2304 +2417 @@
         public function test_delete_user_invalid_id() {
                 $this->allow_user_to_manage_multisite();
+
                 wp_set_current_user( self::$user );
 
@@ -2317 +2431 @@
                 $this->allow_user_to_manage_multisite();
 
-                // Test with a new user, to avoid any complications
+                // Test with a new user, to avoid any complications.
                 $user_id     = $this->factory->user->create();
                 $reassign_id = $this->factory->user->create();
@@ -2326 +2440 @@
                 );
 
-                // Sanity check to ensure the factory created the post correctly
+                // Sanity check to ensure the factory created the post correctly.
                 $post = get_post( $test_post );
                 $this->assertEquals( $user_id, $post->post_author );
 
-                // Delete our test user, and reassign to the new author
-                wp_set_current_user( self::$user );
+                wp_set_current_user( self::$user );
+
+                // Delete our test user, and reassign to the new author.
                 $request          = new WP_REST_Request( 'DELETE', sprintf( '/wp/v2/users/%d', $user_id ) );
                 $request['force'] = true;
@@ -2354 +2469 @@
 
                 $this->allow_user_to_manage_multisite();
+
                 wp_set_current_user( self::$user );
 
@@ -2374 +2490 @@
 
                 $this->allow_user_to_manage_multisite();
+
                 wp_set_current_user( self::$user );
 
@@ -2388 +2505 @@
 
                 $this->allow_user_to_manage_multisite();
+
                 wp_set_current_user( self::$user );
 
@@ -2415 +2533 @@
 
                 $this->allow_user_to_manage_multisite();
+
                 wp_set_current_user( self::$user );
 
@@ -2442 +2561 @@
 
                 $this->allow_user_to_manage_multisite();
+
                 wp_set_current_user( self::$user );
 
@@ -2469 +2589 @@
 
                 $this->allow_user_to_manage_multisite();
+
                 wp_set_current_user( self::$user );
 
@@ -2557 +2678 @@
                 );
 
-                $request = new WP_REST_Request( 'OPTIONS', '/wp/v2/users' );
-
+                $request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/users' );
                 $response = rest_get_server()->dispatch( $request );
                 $data     = $response->get_data();
@@ -2566 +2686 @@
 
                 wp_set_current_user( 1 );
+
                 if ( is_multisite() ) {
                         $current_user = wp_get_current_user( 1 );
@@ -2571 +2692 @@
                 }
 
-                $request = new WP_REST_Request( 'GET', '/wp/v2/users/1' );
-
+                $request  = new WP_REST_Request( 'GET', '/wp/v2/users/1' );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertArrayHasKey( 'my_custom_int', $response->data );
@@ -2582 +2702 @@
                         )
                 );
-
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertEquals( 123, get_user_meta( 1, 'my_custom_int', true ) );
@@ -2595 +2714 @@
                         )
                 );
-
-                $response = rest_get_server()->dispatch( $request );
-
+                $response = rest_get_server()->dispatch( $request );
                 $this->assertEquals( 123, $response->data['my_custom_int'] );
 
@@ -2623 +2740 @@
 
                 wp_set_current_user( 1 );
+
                 if ( is_multisite() ) {
                         $current_user = wp_get_current_user( 1 );
@@ -2635 +2753 @@
                         )
                 );
-
                 $response = rest_get_server()->dispatch( $request );
 
@@ -2658 +2775 @@
 
                 wp_set_current_user( self::$user );
-                $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/users/%d', $user_id ) );
-
+
+                $request  = new WP_REST_Request( 'GET', sprintf( '/wp/v2/users/%d', $user_id ) );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertErrorResponse( 'rest_user_invalid_id', $response, 404 );
@@ -2678 +2795 @@
 
                 wp_set_current_user( self::$superadmin );
-                $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/users/%d', $user_id ) );
-
+
+                $request  = new WP_REST_Request( 'GET', sprintf( '/wp/v2/users/%d', $user_id ) );
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertErrorResponse( 'rest_user_invalid_id', $response, 404 );
@@ -2698 +2815 @@
 
                 wp_set_current_user( self::$user );
+
                 $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/users/%d', $user_id ) );
                 $request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
                 $request->set_body_params( array( 'first_name' => 'New Name' ) );
-
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertErrorResponse( 'rest_user_invalid_id', $response, 404 );
@@ -2720 +2837 @@
 
                 wp_set_current_user( self::$superadmin );
+
                 $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/users/%d', $user_id ) );
                 $request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
                 $request->set_body_params( array( 'first_name' => 'New Name' ) );
-
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertErrorResponse( 'rest_user_invalid_id', $response, 404 );
@@ -2742 +2859 @@
 
                 wp_set_current_user( self::$user );
+
                 $request = new WP_REST_Request( 'DELETE', sprintf( '/wp/v2/users/%d', $user_id ) );
                 $request->set_param( 'force', true );
                 $request->set_param( 'reassign', false );
-
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertErrorResponse( 'rest_user_invalid_id', $response, 404 );
@@ -2764 +2881 @@
 
                 wp_set_current_user( self::$superadmin );
+
                 $request = new WP_REST_Request( 'DELETE', sprintf( '/wp/v2/users/%d', $user_id ) );
                 $request->set_param( 'force', true );
                 $request->set_param( 'reassign', false );
-
                 $response = rest_get_server()->dispatch( $request );
                 $this->assertErrorResponse( 'rest_user_invalid_id', $response, 404 );