<!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>[54198] trunk/tests/phpunit/tests: Tests: Move the basic `get_block_templates()` test to the dedicated file.</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/54198">54198</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/54198","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-18 13:08:33 +0000 (Sun, 18 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: Move the basic `get_block_templates()` test to the dedicated file.
Now that the function has its own test class, the remaining test from `Tests_Block_Template_Utils` can be moved to `Tests_Blocks_GetBlockTemplates` for consistency.
Includes:
* Uncommenting some assertions previously commented out.
* Moving the `get_template_ids()` helper method to the top of the class.
* Standardizing on `wpSetUpBeforeClass()`/`wpTearDownAfterClass()` in both classes.
* Declaring the test theme name as a constant in both classes, since the value is not changed by any of the tests.
* Renaming some properties in both classes for clarity.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/51003">[51003]</a>, <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>, <a href="https://core.trac.wordpress.org/changeset/54187">[54187]</a>.
See <a href="https://core.trac.wordpress.org/ticket/55652">#55652</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-18 01:27:13 UTC (rev 54197)
+++ trunk/tests/phpunit/tests/block-template-utils.php 2022-09-18 13:08:33 UTC (rev 54198)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,78 +11,88 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group block-templates
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- private static $post;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ const TEST_THEME = 'block-theme';
+
+ private static $template_post;
</ins><span class="cx" style="display: block; padding: 0 10px"> private static $template_part_post;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- private static $test_theme = 'block-theme';
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static function wpSetUpBeforeClass() {
- // Set up a template post corresponding to a different theme.
- // We do this to ensure resolution and slug creation works as expected,
- // even with another post of that same name present for another theme.
- $args = array(
- 'post_type' => 'wp_template',
- 'post_name' => 'my_template',
- 'post_title' => 'My Template',
- 'post_content' => 'Content',
- 'post_excerpt' => 'Description of my template',
- 'tax_input' => array(
- 'wp_theme' => array(
- 'this-theme-should-not-resolve',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+ /*
+ * Set up a template post corresponding to a different theme.
+ * We do this to ensure resolution and slug creation works as expected,
+ * even with another post of that same name present for another theme.
+ */
+ self::$template_post = $factory->post->create_and_get(
+ array(
+ 'post_type' => 'wp_template',
+ 'post_name' => 'my_template',
+ 'post_title' => 'My Template',
+ 'post_content' => 'Content',
+ 'post_excerpt' => 'Description of my template',
+ 'tax_input' => array(
+ 'wp_theme' => array(
+ 'this-theme-should-not-resolve',
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$post = self::factory()->post->create_and_get( $args );
- wp_set_post_terms( self::$post->ID, 'this-theme-should-not-resolve', 'wp_theme' );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_post_terms( self::$template_post->ID, 'this-theme-should-not-resolve', 'wp_theme' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Set up template post.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args = array(
- 'post_type' => 'wp_template',
- 'post_name' => 'my_template',
- 'post_title' => 'My Template',
- 'post_content' => 'Content',
- 'post_excerpt' => 'Description of my template',
- 'tax_input' => array(
- 'wp_theme' => array(
- self::$test_theme,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$template_post = $factory->post->create_and_get(
+ array(
+ 'post_type' => 'wp_template',
+ 'post_name' => 'my_template',
+ 'post_title' => 'My Template',
+ 'post_content' => 'Content',
+ 'post_excerpt' => 'Description of my template',
+ 'tax_input' => array(
+ 'wp_theme' => array(
+ self::TEST_THEME,
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$post = self::factory()->post->create_and_get( $args );
- wp_set_post_terms( self::$post->ID, self::$test_theme, 'wp_theme' );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_post_terms( self::$template_post->ID, self::TEST_THEME, 'wp_theme' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Set up template part post.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $template_part_args = array(
- 'post_type' => 'wp_template_part',
- 'post_name' => 'my_template_part',
- 'post_title' => 'My Template Part',
- 'post_content' => 'Content',
- 'post_excerpt' => 'Description of my template part',
- 'tax_input' => array(
- 'wp_theme' => array(
- self::$test_theme,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$template_part_post = $factory->post->create_and_get(
+ array(
+ 'post_type' => 'wp_template_part',
+ 'post_name' => 'my_template_part',
+ 'post_title' => 'My Template Part',
+ 'post_content' => 'Content',
+ 'post_excerpt' => 'Description of my template part',
+ 'tax_input' => array(
+ 'wp_theme' => array(
+ self::TEST_THEME,
+ ),
+ 'wp_template_part_area' => array(
+ WP_TEMPLATE_PART_AREA_HEADER,
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp_template_part_area' => array(
- WP_TEMPLATE_PART_AREA_HEADER,
- ),
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$template_part_post = self::factory()->post->create_and_get( $template_part_args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_post_terms( self::$template_part_post->ID, WP_TEMPLATE_PART_AREA_HEADER, 'wp_template_part_area' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_post_terms( self::$template_part_post->ID, self::$test_theme, 'wp_theme' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_post_terms( self::$template_part_post->ID, self::TEST_THEME, 'wp_theme' );
</ins><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 static function wpTearDownAfterClass() {
+ wp_delete_post( self::$template_post->ID );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function set_up() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- switch_theme( self::$test_theme );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ switch_theme( self::TEST_THEME );
</ins><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">- public static function wpTearDownAfterClass() {
- wp_delete_post( self::$post->ID );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> public function test_build_block_template_result_from_post() {
</span><span class="cx" style="display: block; padding: 0 10px"> $template = _build_block_template_result_from_post(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$post,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$template_post,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'wp_template'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -275,53 +285,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">- * Should retrieve block templates (file and CPT)
- */
- public function test_get_block_templates() {
- function get_template_ids( $templates ) {
- return array_map(
- static function( $template ) {
- return $template->id;
- },
- $templates
- );
- }
-
- // All results.
- $templates = get_block_templates( array(), 'wp_template' );
- $template_ids = get_template_ids( $templates );
-
- // Avoid testing the entire array because the theme might add/remove templates.
- $this->assertContains( get_stylesheet() . '//' . 'my_template', $template_ids );
-
- // The result might change in a block theme.
- // $this->assertContains( get_stylesheet() . '//' . 'index', $template_ids );
-
- // Filter by slug.
- $templates = get_block_templates( array( 'slug__in' => array( 'my_template' ) ), 'wp_template' );
- $template_ids = get_template_ids( $templates );
- $this->assertSame( array( get_stylesheet() . '//' . 'my_template' ), $template_ids );
-
- // Filter by CPT ID.
- $templates = get_block_templates( array( 'wp_id' => self::$post->ID ), 'wp_template' );
- $template_ids = get_template_ids( $templates );
- $this->assertSame( array( get_stylesheet() . '//' . 'my_template' ), $template_ids );
-
- // Filter template part by area.
- // Requires a block theme.
- /*$templates = get_block_templates( array( 'area' => WP_TEMPLATE_PART_AREA_HEADER ), 'wp_template_part' );
- $template_ids = get_template_ids( $templates );
- $this->assertSame(
- array(
- get_stylesheet() . '//' . 'my_template_part',
- get_stylesheet() . '//' . 'header',
- ),
- $template_ids
- );
- */
- }
-
- /**
</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-18 01:27:13 UTC (rev 54197)
+++ trunk/tests/phpunit/tests/blocks/getBlockTemplates.php 2022-09-18 13:08:33 UTC (rev 54198)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,7 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- private static $template;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private static $index_template;
</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"> * @var WP_Post
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,30 +21,28 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- private static $template_part;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private static $small_header_template_part;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static function set_up_before_class() {
- parent::set_up_before_class();
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * This template has to have the same ID ("block-theme/index") as the template
</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="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- static::$template = self::factory()->post->create_and_get(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$index_template = $factory->post->create_and_get(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'wp_template',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'index',
</span><span class="cx" style="display: block; padding: 0 10px"> 'tax_input' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp_theme' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- static::TEST_THEME,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::TEST_THEME,
</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"> )
</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">- wp_set_post_terms( static::$template->ID, static::TEST_THEME, 'wp_theme' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_post_terms( self::$index_template->ID, self::TEST_THEME, 'wp_theme' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- static::$custom_single_post_template = self::factory()->post->create_and_get(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$custom_single_post_template = $factory->post->create_and_get(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'wp_template',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'custom-single-post-template',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,25 +51,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_excerpt' => 'Description of custom single post template',
</span><span class="cx" style="display: block; padding: 0 10px"> 'tax_input' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp_theme' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- static::TEST_THEME,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::TEST_THEME,
</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"> )
</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">- wp_set_post_terms( static::$custom_single_post_template->ID, static::TEST_THEME, 'wp_theme' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_post_terms( self::$custom_single_post_template->ID, self::TEST_THEME, 'wp_theme' );
</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"> * 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="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::$template_part = self::factory()->post->create_and_get(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$small_header_template_part = $factory->post->create_and_get(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'wp_template_part',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_name' => 'small-header',
</span><span class="cx" style="display: block; padding: 0 10px"> 'tax_input' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp_theme' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- static::TEST_THEME,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::TEST_THEME,
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp_template_part_area' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> WP_TEMPLATE_PART_AREA_HEADER,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,24 +78,73 @@
</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">- wp_set_post_terms( self::$template_part->ID, WP_TEMPLATE_PART_AREA_HEADER, 'wp_template_part_area' );
- wp_set_post_terms( self::$template_part->ID, static::TEST_THEME, 'wp_theme' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_post_terms( self::$small_header_template_part->ID, WP_TEMPLATE_PART_AREA_HEADER, 'wp_template_part_area' );
+ wp_set_post_terms( self::$small_header_template_part->ID, self::TEST_THEME, 'wp_theme' );
</ins><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">- public static function tear_down_after_class() {
- wp_delete_post( static::$template->ID );
- wp_delete_post( static::$custom_single_post_template->ID );
- wp_delete_post( static::$template_part->ID );
-
- parent::tear_down_after_class();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function wpTearDownAfterClass() {
+ wp_delete_post( self::$index_template->ID );
+ wp_delete_post( self::$custom_single_post_template->ID );
+ wp_delete_post( self::$small_header_template_part->ID );
</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 set_up() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- switch_theme( static::TEST_THEME );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ switch_theme( self::TEST_THEME );
</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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 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
+ );
+ }
+
+ /**
+ * Should retrieve block templates (file and CPT)
+ */
+ public function test_get_block_templates() {
+ // All results.
+ $templates = get_block_templates( array(), 'wp_template' );
+ $template_ids = $this->get_template_ids( $templates );
+
+ // Avoid testing the entire array because the theme might add/remove templates.
+ $this->assertContains( get_stylesheet() . '//' . 'custom-single-post-template', $template_ids );
+
+ // The result might change in a block theme.
+ $this->assertContains( get_stylesheet() . '//' . 'index', $template_ids );
+
+ // Filter by slug.
+ $templates = get_block_templates( array( 'slug__in' => array( 'custom-single-post-template' ) ), 'wp_template' );
+ $template_ids = $this->get_template_ids( $templates );
+ $this->assertSame( array( get_stylesheet() . '//' . 'custom-single-post-template' ), $template_ids );
+
+ // Filter by CPT ID.
+ $templates = get_block_templates( array( 'wp_id' => self::$custom_single_post_template->ID ), 'wp_template' );
+ $template_ids = $this->get_template_ids( $templates );
+ $this->assertSame( array( get_stylesheet() . '//' . 'custom-single-post-template' ), $template_ids );
+
+ // Filter template part by area.
+ // Requires a block theme.
+ $templates = get_block_templates( array( 'area' => WP_TEMPLATE_PART_AREA_HEADER ), 'wp_template_part' );
+ $template_ids = $this->get_template_ids( $templates );
+ $this->assertSame(
+ array(
+ get_stylesheet() . '//' . 'small-header',
+ ),
+ $template_ids
+ );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket 56271
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_get_block_templates_returns_unique_entities
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,19 +221,4 @@
</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">-
- /**
- * 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"> }
</span></span></pre>
</div>
</div>
</body>
</html>