<!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>[53371] trunk/tests/phpunit/tests: Tests: Move `get_inline_data()` tests to a more appropriate place.</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/53371">53371</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/53371","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-05-09 17:56:36 +0000 (Mon, 09 May 2022)</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: Move `get_inline_data()` tests to a more appropriate place.
Since this is an admin template function and the tests check for specific output with certain taxonomy parameters, placing the tests along with other tests for the functions in the same file should make them easier to find and extend than when placed between general taxonomy registration tests.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/52841">[52841]</a>, <a href="https://core.trac.wordpress.org/changeset/53368">[53368]</a>.
See <a href="https://core.trac.wordpress.org/ticket/55652">#55652</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsadminincludesTemplatephp">trunk/tests/phpunit/tests/admin/includesTemplate.php</a></li>
<li><a href="#trunktestsphpunitteststaxonomyphp">trunk/tests/phpunit/tests/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsadminincludesTemplatephp"></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/admin/includesTemplate.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesTemplate.php 2022-05-09 13:49:29 UTC (rev 53370)
+++ trunk/tests/phpunit/tests/admin/includesTemplate.php 2022-05-09 17:56:36 UTC (rev 53371)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,6 +43,58 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @ticket 49701
+ *
+ * @covers ::get_inline_data
+ */
+ public function test_get_inline_data_contains_term_if_show_ui_is_false_but_show_on_quick_edit_is_true_for_hierarchical_taxonomy() {
+ // Create a post with a term from a hierarchical taxonomy.
+ register_taxonomy(
+ 'wptests_tax_1',
+ 'post',
+ array(
+ 'show_ui' => false,
+ 'show_in_quick_edit' => true,
+ 'hierarchical' => true,
+ )
+ );
+ $term = wp_insert_term( 'Test', 'wptests_tax_1' );
+ $post = self::factory()->post->create_and_get();
+ wp_set_object_terms( $post->ID, $term['term_id'], 'wptests_tax_1' );
+
+ // Test that get_inline_data() has `post_category` div containing the assigned term.
+ wp_set_current_user( self::factory()->user->create( array( 'role' => 'editor' ) ) );
+ get_inline_data( $post );
+ $this->expectOutputRegex( '/<div class="post_category" id="wptests_tax_1_' . $post->ID . '">' . $term['term_id'] . '<\/div>/' );
+ }
+
+ /**
+ * @ticket 49701
+ *
+ * @covers ::get_inline_data
+ */
+ public function test_get_inline_data_contains_term_if_show_ui_is_false_but_show_on_quick_edit_is_true_for_nonhierarchical_taxonomy() {
+ // Create a post with a term from a non-hierarchical taxonomy.
+ register_taxonomy(
+ 'wptests_tax_1',
+ 'post',
+ array(
+ 'show_ui' => false,
+ 'show_in_quick_edit' => true,
+ 'hierarchical' => false,
+ )
+ );
+ $term = wp_insert_term( 'Test', 'wptests_tax_1' );
+ $post = self::factory()->post->create_and_get();
+ wp_set_object_terms( $post->ID, $term['term_id'], 'wptests_tax_1' );
+
+ // Test that get_inline_data() has `tags_input` div containing the assigned term.
+ wp_set_current_user( self::factory()->user->create( array( 'role' => 'editor' ) ) );
+ get_inline_data( $post );
+ $this->expectOutputRegex( '/<div class="tags_input" id="wptests_tax_1_' . $post->ID . '">Test<\/div>/' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_add_meta_box() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_meta_boxes;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunitteststaxonomyphp"></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/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/taxonomy.php 2022-05-09 13:49:29 UTC (rev 53370)
+++ trunk/tests/phpunit/tests/taxonomy.php 2022-05-09 17:56:36 UTC (rev 53371)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,7 +221,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $tax_2->show_in_quick_edit );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 53212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -239,58 +238,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @ticket 49701
- *
- * @covers ::get_inline_data
- */
- public function test_get_inline_data_contains_term_if_show_ui_false_but_show_on_quick_edit_true_for_hierarchical_taxonomy() {
- // Create a post with a term from a hierarchical taxonomy.
- register_taxonomy(
- 'wptests_tax_1',
- 'post',
- array(
- 'show_ui' => false,
- 'show_in_quick_edit' => true,
- 'hierarchical' => true,
- )
- );
- $term = wp_insert_term( 'Test', 'wptests_tax_1' );
- $post = self::factory()->post->create_and_get();
- wp_set_object_terms( $post->ID, $term['term_id'], 'wptests_tax_1' );
-
- // Test get_inline_data() has post_category div containing assigned term.
- wp_set_current_user( self::factory()->user->create( array( 'role' => 'editor' ) ) );
- get_inline_data( $post );
- $this->expectOutputRegex( '/<div class="post_category" id="wptests_tax_1_' . $post->ID . '">' . $term['term_id'] . '<\/div>/' );
- }
-
- /**
- * @ticket 49701
- *
- * @covers ::get_inline_data
- */
- public function test_get_inline_data_contains_term_if_show_ui_false_but_show_on_quick_edit_true_for_nonhierarchical_taxonomy() {
- // Create a post with a term from a hierarchical taxonomy.
- register_taxonomy(
- 'wptests_tax_1',
- 'post',
- array(
- 'show_ui' => false,
- 'show_in_quick_edit' => true,
- 'hierarchical' => false,
- )
- );
- $term = wp_insert_term( 'Test', 'wptests_tax_1' );
- $post = self::factory()->post->create_and_get();
- wp_set_object_terms( $post->ID, $term['term_id'], 'wptests_tax_1' );
-
- // Test get_inline_data() has tags_input div containing assigned term.
- wp_set_current_user( self::factory()->user->create( array( 'role' => 'editor' ) ) );
- get_inline_data( $post );
- $this->expectOutputRegex( '/<div class="tags_input" id="wptests_tax_1_' . $post->ID . '">Test<\/div>/' );
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * @ticket 11058
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_registering_taxonomies_to_object_types() {
</span></span></pre>
</div>
</div>
</body>
</html>