From ec7687b1d910101fa53a5b31d0689441c8d1d5fd Mon Sep 17 00:00:00 2001
From: Gary Pendergast <pento@git.wordpress.org>
Date: Wed, 9 Jan 2019 10:30:49 +0000
Subject: [PATCH] Tests: Improve REST API tests for categories and tags.

Props birgire, SergeyBiryukov.
See #39122.
Fixes #45077.



git-svn-id: https://develop.svn.wordpress.org/trunk@44510 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../rest-api/rest-categories-controller.php     | 17 +++++++++++------
 .../tests/rest-api/rest-tags-controller.php     | 16 +++++++++++-----
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/tests/phpunit/tests/rest-api/rest-categories-controller.php b/tests/phpunit/tests/rest-api/rest-categories-controller.php
index 79add82cde..3c9543833b 100644
--- a/tests/phpunit/tests/rest-api/rest-categories-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-categories-controller.php
@@ -690,6 +690,9 @@ class WP_Test_REST_Categories_Controller extends WP_Test_REST_Controller_Testcas
 		$this->check_get_taxonomy_term_response( $response );
 	}
 
+	/**
+	 * @ticket 39122
+	 */
 	public function test_get_item_meta() {
 		$request  = new WP_REST_Request( 'GET', '/wp/v2/categories/1' );
 		$response = rest_get_server()->dispatch( $request );
@@ -698,24 +701,26 @@ class WP_Test_REST_Categories_Controller extends WP_Test_REST_Controller_Testcas
 
 		$meta = (array) $data['meta'];
 		$this->assertArrayHasKey( 'test_single', $meta );
-		$this->assertEquals( $meta['test_single'], '' );
+		$this->assertSame( $meta['test_single'], '' );
 		$this->assertArrayHasKey( 'test_multi', $meta );
-		$this->assertEquals( $meta['test_multi'], array() );
+		$this->assertSame( $meta['test_multi'], array() );
 		$this->assertArrayHasKey( 'test_cat_single', $meta );
-		$this->assertEquals( $meta['test_cat_single'], '' );
+		$this->assertSame( $meta['test_cat_single'], '' );
 		$this->assertArrayHasKey( 'test_cat_multi', $meta );
-		$this->assertEquals( $meta['test_cat_multi'], array() );
+		$this->assertSame( $meta['test_cat_multi'], array() );
 	}
 
+	/**
+	 * @ticket 39122
+	 */
 	public function test_get_item_meta_registered_for_different_taxonomy() {
 		$request  = new WP_REST_Request( 'GET', '/wp/v2/categories/1' );
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
 		$this->assertArrayHasKey( 'meta', $data );
-		$this->assertArrayHasKey( 'meta', $data );
 
 		$meta = (array) $data['meta'];
-		$this->assertEquals( false, isset( $meta['test_tag_meta'] ) );
+		$this->assertFalse( isset( $meta['test_tag_meta'] ) );
 	}
 
 	public function test_get_term_invalid_taxonomy() {
diff --git a/tests/phpunit/tests/rest-api/rest-tags-controller.php b/tests/phpunit/tests/rest-api/rest-tags-controller.php
index 2bb4528c10..96263c4061 100644
--- a/tests/phpunit/tests/rest-api/rest-tags-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-tags-controller.php
@@ -629,6 +629,9 @@ class WP_Test_REST_Tags_Controller extends WP_Test_REST_Controller_Testcase {
 		$this->check_get_taxonomy_term_response( $response, $id );
 	}
 
+	/**
+	 * @ticket 39122
+	 */
 	public function test_get_item_meta() {
 		$id       = $this->factory->tag->create();
 		$request  = new WP_REST_Request( 'GET', '/wp/v2/tags/' . $id );
@@ -638,15 +641,18 @@ class WP_Test_REST_Tags_Controller extends WP_Test_REST_Controller_Testcase {
 
 		$meta = (array) $data['meta'];
 		$this->assertArrayHasKey( 'test_single', $meta );
-		$this->assertEquals( $meta['test_single'], '' );
+		$this->assertSame( $meta['test_single'], '' );
 		$this->assertArrayHasKey( 'test_multi', $meta );
-		$this->assertEquals( $meta['test_multi'], array() );
+		$this->assertSame( $meta['test_multi'], array() );
 		$this->assertArrayHasKey( 'test_tag_single', $meta );
-		$this->assertEquals( $meta['test_tag_single'], '' );
+		$this->assertSame( $meta['test_tag_single'], '' );
 		$this->assertArrayHasKey( 'test_tag_multi', $meta );
-		$this->assertEquals( $meta['test_tag_multi'], array() );
+		$this->assertSame( $meta['test_tag_multi'], array() );
 	}
 
+	/**
+	 * @ticket 39122
+	 */
 	public function test_get_item_meta_registered_for_different_taxonomy() {
 		$id       = $this->factory->tag->create();
 		$request  = new WP_REST_Request( 'GET', '/wp/v2/tags/' . $id );
@@ -655,7 +661,7 @@ class WP_Test_REST_Tags_Controller extends WP_Test_REST_Controller_Testcase {
 		$this->assertArrayHasKey( 'meta', $data );
 
 		$meta = (array) $data['meta'];
-		$this->assertEquals( false, isset( $meta['test_cat_meta'] ) );
+		$this->assertFalse( isset( $meta['test_cat_meta'] ) );
 	}
 
 	public function test_get_term_invalid_term() {