<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[43567] trunk/tests/phpunit/tests/rest-api: Tests: Improve coverage for REST API term meta registration.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/43567">43567</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/43567","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>kadamwhite</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-08-12 00:05:39 +0000 (Sun, 12 Aug 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Tests: Improve coverage for REST API term meta registration.
Introduce tests to validate that register_meta and register_term_meta work as expected in WP_REST_Terms_Controller.
props timmydcrawford.
Fixes <a href="https://core.trac.wordpress.org/ticket/39122">#39122</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsrestapirestcategoriescontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-categories-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapiresttagscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-tags-controller.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsrestapirestcategoriescontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/rest-api/rest-categories-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-categories-controller.php 2018-08-11 18:50:23 UTC (rev 43566)
+++ trunk/tests/phpunit/tests/rest-api/rest-categories-controller.php 2018-08-12 00:05:39 UTC (rev 43567)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,6 +38,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> self::delete_user( self::$subscriber );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function setUp() {
+ parent::setUp();
+
+ register_meta( 'term', 'test_single', array(
+ 'show_in_rest' => true,
+ 'single' => true,
+ 'type' => 'string',
+ ));
+ register_meta( 'term', 'test_multi', array(
+ 'show_in_rest' => true,
+ 'single' => false,
+ 'type' => 'string',
+ ));
+ register_term_meta( 'category', 'test_cat_single', array(
+ 'show_in_rest' => true,
+ 'single' => true,
+ 'type' => 'string',
+ ));
+ register_term_meta( 'category', 'test_cat_multi', array(
+ 'show_in_rest' => true,
+ 'single' => false,
+ 'type' => 'string',
+ ));
+ register_term_meta( 'post_tag', 'test_tag_meta', array(
+ 'show_in_rest' => true,
+ 'single' => true,
+ 'type' => 'string',
+ ));
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_register_routes() {
</span><span class="cx" style="display: block; padding: 0 10px"> $routes = rest_get_server()->get_routes();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( '/wp/v2/categories', $routes );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -634,6 +664,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->check_get_taxonomy_term_response( $response );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_item_meta() {
+ $request = new WP_REST_Request( 'GET', '/wp/v2/categories/1' );
+ $response = rest_get_server()->dispatch( $request );
+ $data = $response->get_data();
+ $this->assertArrayHasKey( 'meta', $data );
+
+ $meta = (array) $data['meta'];
+ $this->assertArrayHasKey( 'test_single', $meta );
+ $this->assertEquals( $meta['test_single'], '' );
+ $this->assertArrayHasKey( 'test_multi', $meta );
+ $this->assertEquals( $meta['test_multi'], array() );
+ $this->assertArrayHasKey( 'test_cat_single', $meta );
+ $this->assertEquals( $meta['test_cat_single'], '' );
+ $this->assertArrayHasKey( 'test_cat_multi', $meta );
+ $this->assertEquals( $meta['test_cat_multi'], array() );
+ }
+
+ 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'] ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_get_term_invalid_taxonomy() {
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', '/wp/v2/invalid-taxonomy/1' );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = rest_get_server()->dispatch( $request );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -782,6 +840,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( 'name', 'New Name' );
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( 'description', 'New Description' );
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( 'slug', 'new-slug' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $request->set_param( 'meta', array(
+ 'test_single' => 'just meta',
+ 'test_cat_single' => 'category-specific meta',
+ 'test_tag_meta' => 'tag-specific meta',
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $response = rest_get_server()->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 200, $response->get_status() );
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $response->get_data();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -788,6 +851,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'New Name', $data['name'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'New Description', $data['description'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'new-slug', $data['slug'] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 'just meta', $data['meta']['test_single'] );
+ $this->assertEquals( 'category-specific meta', $data['meta']['test_cat_single'] );
+ $this->assertFalse( isset( $data['meta']['test_tag_meta'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_update_item_invalid_taxonomy() {
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapiresttagscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/rest-api/rest-tags-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-tags-controller.php 2018-08-11 18:50:23 UTC (rev 43566)
+++ trunk/tests/phpunit/tests/rest-api/rest-tags-controller.php 2018-08-12 00:05:39 UTC (rev 43567)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,6 +55,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> self::delete_user( self::$subscriber );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function setUp() {
+ parent::setUp();
+
+ register_meta( 'term', 'test_single', array(
+ 'show_in_rest' => true,
+ 'single' => true,
+ 'type' => 'string',
+ ));
+ register_meta( 'term', 'test_multi', array(
+ 'show_in_rest' => true,
+ 'single' => false,
+ 'type' => 'string',
+ ));
+ register_term_meta( 'post_tag', 'test_tag_single', array(
+ 'show_in_rest' => true,
+ 'single' => true,
+ 'type' => 'string',
+ ));
+ register_term_meta( 'post_tag', 'test_tag_multi', array(
+ 'show_in_rest' => true,
+ 'single' => false,
+ 'type' => 'string',
+ ));
+ register_term_meta( 'category', 'test_cat_meta', array(
+ 'show_in_rest' => true,
+ 'single' => true,
+ 'type' => 'string',
+ ));
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_register_routes() {
</span><span class="cx" style="display: block; padding: 0 10px"> $routes = rest_get_server()->get_routes();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( '/wp/v2/tags', $routes );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -572,6 +602,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->check_get_taxonomy_term_response( $response, $id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_get_item_meta() {
+ $id = $this->factory->tag->create();
+ $request = new WP_REST_Request( 'GET', '/wp/v2/tags/' . $id );
+ $response = rest_get_server()->dispatch( $request );
+ $data = $response->get_data();
+ $this->assertArrayHasKey( 'meta', $data );
+
+ $meta = (array) $data['meta'];
+ $this->assertArrayHasKey( 'test_single', $meta );
+ $this->assertEquals( $meta['test_single'], '' );
+ $this->assertArrayHasKey( 'test_multi', $meta );
+ $this->assertEquals( $meta['test_multi'], array() );
+ $this->assertArrayHasKey( 'test_tag_single', $meta );
+ $this->assertEquals( $meta['test_tag_single'], '' );
+ $this->assertArrayHasKey( 'test_tag_multi', $meta );
+ $this->assertEquals( $meta['test_tag_multi'], array() );
+ }
+
+ 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 );
+ $response = rest_get_server()->dispatch( $request );
+ $data = $response->get_data();
+ $this->assertArrayHasKey( 'meta', $data );
+
+ $meta = (array) $data['meta'];
+ $this->assertEquals( false, isset( $meta['test_cat_meta'] ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_get_term_invalid_term() {
</span><span class="cx" style="display: block; padding: 0 10px"> $request = new WP_REST_Request( 'GET', '/wp/v2/tags/' . REST_TESTS_IMPOSSIBLY_HIGH_NUMBER );
</span><span class="cx" style="display: block; padding: 0 10px"> $response = rest_get_server()->dispatch( $request );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -683,6 +742,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( 'name', 'New Name' );
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( 'description', 'New Description' );
</span><span class="cx" style="display: block; padding: 0 10px"> $request->set_param( 'slug', 'new-slug' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $request->set_param( 'meta', array(
+ 'test_single' => 'just meta',
+ 'test_tag_single' => 'tag-specific meta',
+ 'test_cat_meta' => 'category-specific meta',
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $response = rest_get_server()->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 200, $response->get_status() );
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $response->get_data();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -689,6 +753,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'New Name', $data['name'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'New Description', $data['description'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'new-slug', $data['slug'] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 'just meta', $data['meta']['test_single'] );
+ $this->assertEquals( 'tag-specific meta', $data['meta']['test_tag_single'] );
+ $this->assertFalse( isset( $data['meta']['test_cat_meta'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_update_item_no_change() {
</span></span></pre>
</div>
</div>
</body>
</html>