<!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>[54187] trunk/tests/phpunit/tests: Tests: Update the test for respecting the post type in `get_block_templates()`.</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/54187">54187</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/54187","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-09-16 15:10:58 +0000 (Fri, 16 Sep 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: Update the test for respecting the post type in `get_block_templates()`.

* Use `assertSameSets()` to avoid a failure when array items are returned in different order ([https://github.com/WordPress/wordpress-develop/actions/runs/3067320461/jobs/4953478602#step:19:274 example]).
* Move the test to a more appropriate place now that the function has its own test class.
* Rename the test method to match the function name.

Follow-up to <a href="https://core.trac.wordpress.org/changeset/52062">[52062]</a>, <a href="https://core.trac.wordpress.org/changeset/53927">[53927]</a>, <a href="https://core.trac.wordpress.org/changeset/54184">[54184]</a>.

See <a href="https://core.trac.wordpress.org/ticket/55881">#55881</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsblocktemplateutilsphp">trunk/tests/phpunit/tests/block-template-utils.php</a></li>
<li><a href="#trunktestsphpunittestsblocksgetBlockTemplatesphp">trunk/tests/phpunit/tests/blocks/getBlockTemplates.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsblocktemplateutilsphp"></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/block-template-utils.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/block-template-utils.php        2022-09-16 10:55:58 UTC (rev 54186)
+++ trunk/tests/phpunit/tests/block-template-utils.php  2022-09-16 15:10:58 UTC (rev 54187)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Block_Template_Utils extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">        private static $post;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        private static $custom_single_post_template_post;
</del><span class="cx" style="display: block; padding: 0 10px">         private static $template_part_post;
</span><span class="cx" style="display: block; padding: 0 10px">        private static $test_theme = 'block-theme';
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,22 +50,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                self::$post = self::factory()->post->create_and_get( $args );
</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_post_terms( self::$post->ID, self::$test_theme, 'wp_theme' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set up template post.
-               $args                                   = array(
-                       'post_type'    => 'wp_template',
-                       'post_name'    => 'custom-single-post-template',
-                       'post_title'   => 'Custom Single Post template (modified)',
-                       'post_content' => 'Content',
-                       'post_excerpt' => 'Description of custom single post template',
-                       'tax_input'    => array(
-                               'wp_theme' => array(
-                                       self::$test_theme,
-                               ),
-                       ),
-               );
-               self::$custom_single_post_template_post = self::factory()->post->create_and_get( $args );
-               wp_set_post_terms( self::$custom_single_post_template_post->ID, self::$test_theme, 'wp_theme' );
-
</del><span class="cx" style="display: block; padding: 0 10px">                 // Set up template part post.
</span><span class="cx" style="display: block; padding: 0 10px">                $template_part_args       = array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'post_type'    => 'wp_template_part',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,7 +78,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        public static function wpTearDownAfterClass() {
</span><span class="cx" style="display: block; padding: 0 10px">                wp_delete_post( self::$post->ID );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                wp_delete_post( self::$custom_single_post_template_post->ID );
</del><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_build_block_template_result_from_post() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -340,62 +322,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">-         * @dataProvider data_get_block_template_should_respect_posttypes_property
-        * @ticket 55881
-        * @covers ::get_block_templates
-        *
-        * @param string $post_type Post type for query.
-        * @param array  $expected  Expected template IDs.
-        */
-       public function test_get_block_template_should_respect_posttypes_property( $post_type, $expected ) {
-               $templates = get_block_templates( array( 'post_type' => $post_type ) );
-
-               $this->assertSame(
-                       $expected,
-                       $this->get_template_ids( $templates )
-               );
-       }
-
-       /**
-        * Data provider.
-        *
-        * @return array
-        */
-       public function data_get_block_template_should_respect_posttypes_property() {
-               return array(
-                       'post' => array(
-                               'post_type' => 'post',
-                               'expected'  => array(
-                                       'block-theme//my_template',
-                                       'block-theme//custom-single-post-template',
-                               ),
-                       ),
-                       'page' => array(
-                               'post_type' => 'page',
-                               'expected'  => array(
-                                       'block-theme//my_template',
-                                       'block-theme//page-home',
-                               ),
-                       ),
-               );
-       }
-
-       /**
-        * Gets the template IDs from the given array.
-        *
-        * @param object[] $templates Array of template objects to parse.
-        * @return string[] The template IDs.
-        */
-       private function get_template_ids( $templates ) {
-               return array_map(
-                       static function( $template ) {
-                               return $template->id;
-                       },
-                       $templates
-               );
-       }
-
-       /**
</del><span class="cx" style="display: block; padding: 0 10px">          * Should flatten nested blocks
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        function test_flatten_blocks() {
</span></span></pre></div>
<a id="trunktestsphpunittestsblocksgetBlockTemplatesphp"></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/blocks/getBlockTemplates.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/getBlockTemplates.php    2022-09-16 10:55:58 UTC (rev 54186)
+++ trunk/tests/phpunit/tests/blocks/getBlockTemplates.php      2022-09-16 15:10:58 UTC (rev 54187)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,6 +16,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><span class="cx" style="display: block; padding: 0 10px">         * @var WP_Post
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        private static $custom_single_post_template;
+
+       /**
+        * @var WP_Post
+        */
</ins><span class="cx" style="display: block; padding: 0 10px">         private static $template_part;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        public static function set_up_before_class() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,6 +44,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_post_terms( static::$template->ID, static::TEST_THEME, 'wp_theme' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                static::$custom_single_post_template = self::factory()->post->create_and_get(
+                       array(
+                               'post_type'    => 'wp_template',
+                               'post_name'    => 'custom-single-post-template',
+                               'post_title'   => 'Custom Single Post template (modified)',
+                               'post_content' => 'Content',
+                               'post_excerpt' => 'Description of custom single post template',
+                               'tax_input'    => array(
+                                       'wp_theme' => array(
+                                               static::TEST_THEME,
+                                       ),
+                               ),
+                       )
+               );
+
+               wp_set_post_terms( static::$custom_single_post_template->ID, static::TEST_THEME, 'wp_theme' );
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 /*
</span><span class="cx" style="display: block; padding: 0 10px">                 * This template part has to have the same ID ("block-theme/small-header") as the template part
</span><span class="cx" style="display: block; padding: 0 10px">                 * that is shipped with the "block-theme" theme. This is needed for testing purposes.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,6 +86,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        public static function tear_down_after_class() {
</span><span class="cx" style="display: block; padding: 0 10px">                wp_delete_post( static::$template->ID );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                wp_delete_post( static::$custom_single_post_template->ID );
</ins><span class="cx" style="display: block; padding: 0 10px">                 wp_delete_post( static::$template_part->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                parent::tear_down_after_class();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,4 +136,57 @@
</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">+
+       /**
+        * @dataProvider data_get_block_templates_should_respect_posttypes_property
+        * @ticket 55881
+        *
+        * @param string $post_type Post type for query.
+        * @param array  $expected  Expected template IDs.
+        */
+       public function test_get_block_templates_should_respect_posttypes_property( $post_type, $expected ) {
+               $templates = get_block_templates( array( 'post_type' => $post_type ) );
+
+               $this->assertSameSets(
+                       $expected,
+                       $this->get_template_ids( $templates )
+               );
+       }
+
+       /**
+        * Data provider.
+        *
+        * @return array
+        */
+       public function data_get_block_templates_should_respect_posttypes_property() {
+               return array(
+                       'post' => array(
+                               'post_type' => 'post',
+                               'expected'  => array(
+                                       'block-theme//custom-single-post-template',
+                               ),
+                       ),
+                       'page' => array(
+                               'post_type' => 'page',
+                               'expected'  => array(
+                                       'block-theme//page-home',
+                               ),
+                       ),
+               );
+       }
+
+       /**
+        * Gets the template IDs from the given array.
+        *
+        * @param object[] $templates Array of template objects to parse.
+        * @return string[] The template IDs.
+        */
+       private function get_template_ids( $templates ) {
+               return array_map(
+                       static function( $template ) {
+                               return $template->id;
+                       },
+                       $templates
+               );
+       }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>

</body>
</html>