<!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>[52246] trunk/tests/phpunit: Themes: Add block template resolution algorithm unit tests.</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/52246">52246</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/52246","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>youknowriad</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-11-25 09:20:03 +0000 (Thu, 25 Nov 2021)</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'>Themes: Add block template resolution algorithm unit tests.
Backports the unit tests for block templates
and hybrid themes template resolution from the Gutenberg plugin.
Props bernhard-reiter, jorgefilipecosta.
Fixes <a href="https://core.trac.wordpress.org/ticket/54478">#54478</a>. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsblocktemplateutilsphp">trunk/tests/phpunit/tests/block-template-utils.php</a></li>
<li><a href="#trunktestsphpunittestsblocktemplatephp">trunk/tests/phpunit/tests/block-template.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/tests/phpunit/data/themedir1/block-theme/block-templates/</li>
<li><a href="#trunktestsphpunitdatathemedir1blockthemeblocktemplatesindexhtml">trunk/tests/phpunit/data/themedir1/block-theme/block-templates/index.html</a></li>
<li><a href="#trunktestsphpunitdatathemedir1blockthemeblocktemplatespagehomehtml">trunk/tests/phpunit/data/themedir1/block-theme/block-templates/page-home.html</a></li>
<li><a href="#trunktestsphpunitdatathemedir1blockthemeblocktemplatespagehtml">trunk/tests/phpunit/data/themedir1/block-theme/block-templates/page.html</a></li>
<li><a href="#trunktestsphpunitdatathemedir1blockthemepage1php">trunk/tests/phpunit/data/themedir1/block-theme/page-1.php</a></li>
<li>trunk/tests/phpunit/data/themedir1/block-theme-child/block-templates/</li>
<li><a href="#trunktestsphpunitdatathemedir1blockthemechildblocktemplatespage1html">trunk/tests/phpunit/data/themedir1/block-theme-child/block-templates/page-1.html</a></li>
<li><a href="#trunktestsphpunitdatathemedir1blockthemechildpagehomephp">trunk/tests/phpunit/data/themedir1/block-theme-child/page-home.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitdatathemedir1blockthemeblocktemplatesindexhtml"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/data/themedir1/block-theme/block-templates/index.html</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/block-theme/block-templates/index.html (rev 0)
+++ trunk/tests/phpunit/data/themedir1/block-theme/block-templates/index.html 2021-11-25 09:20:03 UTC (rev 52246)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,3 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<!-- wp:paragraph -->
+<p>Index Template</p>
+<!-- /wp:paragraph -->
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/data/themedir1/block-theme/block-templates/index.html
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunktestsphpunitdatathemedir1blockthemeblocktemplatespagehomehtml"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/data/themedir1/block-theme/block-templates/page-home.html</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/block-theme/block-templates/page-home.html (rev 0)
+++ trunk/tests/phpunit/data/themedir1/block-theme/block-templates/page-home.html 2021-11-25 09:20:03 UTC (rev 52246)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,3 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<!-- wp:paragraph -->
+<p>Page (Home) Template</p>
+<!-- /wp:paragraph -->
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/data/themedir1/block-theme/block-templates/page-home.html
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunktestsphpunitdatathemedir1blockthemeblocktemplatespagehtml"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/data/themedir1/block-theme/block-templates/page.html</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/block-theme/block-templates/page.html (rev 0)
+++ trunk/tests/phpunit/data/themedir1/block-theme/block-templates/page.html 2021-11-25 09:20:03 UTC (rev 52246)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,3 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<!-- wp:paragraph -->
+<p>Page Template</p>
+<!-- /wp:paragraph -->
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/data/themedir1/block-theme/block-templates/page.html
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunktestsphpunitdatathemedir1blockthemepage1php"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/data/themedir1/block-theme/page-1.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/block-theme/page-1.php (rev 0)
+++ trunk/tests/phpunit/data/themedir1/block-theme/page-1.php 2021-11-25 09:20:03 UTC (rev 52246)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,3 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+echo 'PHP template for page with ID 1';
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/data/themedir1/block-theme/page-1.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunktestsphpunitdatathemedir1blockthemechildblocktemplatespage1html"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/data/themedir1/block-theme-child/block-templates/page-1.html</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/block-theme-child/block-templates/page-1.html (rev 0)
+++ trunk/tests/phpunit/data/themedir1/block-theme-child/block-templates/page-1.html 2021-11-25 09:20:03 UTC (rev 52246)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,3 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<!-- wp:paragraph -->
+<p>Page (ID 1) Template</p>
+<!-- /wp:paragraph -->
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/data/themedir1/block-theme-child/block-templates/page-1.html
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunktestsphpunitdatathemedir1blockthemechildpagehomephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/data/themedir1/block-theme-child/page-home.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/block-theme-child/page-home.php (rev 0)
+++ trunk/tests/phpunit/data/themedir1/block-theme-child/page-home.php 2021-11-25 09:20:03 UTC (rev 52246)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,3 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+echo 'PHP template for page with slug "home"';
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/data/themedir1/block-theme-child/page-home.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><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 2021-11-25 08:34:01 UTC (rev 52245)
+++ trunk/tests/phpunit/tests/block-template-utils.php 2021-11-25 09:20:03 UTC (rev 52246)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,6 +7,8 @@
</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"> * Tests for the Block Templates abstraction layer.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @group block-templates
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Block_Template_Utils_Test extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> private static $post;
</span></span></pre></div>
<a id="trunktestsphpunittestsblocktemplatephp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/block-template.php 2021-11-25 08:34:01 UTC (rev 52245)
+++ trunk/tests/phpunit/tests/block-template.php 2021-11-25 09:20:03 UTC (rev 52246)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,6 +7,8 @@
</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"> * Tests for the block template loading algorithm.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @group block-templates
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Block_Template_Test extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> private static $post;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,34 +15,123 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> private static $template_canvas_path = ABSPATH . WPINC . '/template-canvas.php';
</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 wpSetUpBeforeClass() {
- // Set up custom template post.
- $args = array(
- 'post_type' => 'wp_template',
- 'post_name' => 'wp-custom-template-my-block-template',
- 'post_title' => 'My Custom Block Template',
- 'post_content' => 'Content',
- 'post_excerpt' => 'Description of my block template',
- 'tax_input' => array(
- 'wp_theme' => array(
- get_stylesheet(),
- ),
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_up() {
+ parent::set_up();
+ switch_theme( 'block-theme' );
+ }
+
+ public function tear_down() {
+ global $_wp_current_template_content;
+ unset( $_wp_current_template_content );
+
+ parent::tear_down();
+ }
+
+ function test_page_home_block_template_takes_precedence_over_less_specific_block_templates() {
+ global $_wp_current_template_content;
+ $type = 'page';
+ $templates = array(
+ 'page-home.php',
+ 'page-1.php',
+ 'page.php',
</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, get_stylesheet(), 'wp_theme' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $resolved_template_path = locate_block_template( get_stylesheet_directory() . '/page-home.php', $type, $templates );
+ $this->assertEquals( self::$template_canvas_path, $resolved_template_path );
+ $this->assertStringEqualsFile( get_stylesheet_directory() . '/block-templates/page-home.html', $_wp_current_template_content );
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function test_page_block_template_takes_precedence() {
+ global $_wp_current_template_content;
+ $type = 'page';
+ $templates = array(
+ 'page-slug-doesnt-exist.php',
+ 'page-1.php',
+ 'page.php',
+ );
+ $resolved_template_path = locate_block_template( get_stylesheet_directory() . '/page.php', $type, $templates );
+ $this->assertEquals( self::$template_canvas_path, $resolved_template_path );
+ $this->assertStringEqualsFile( get_stylesheet_directory() . '/block-templates/page.html', $_wp_current_template_content );
</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 function tear_down() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function test_block_template_takes_precedence_over_equally_specific_php_template() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $_wp_current_template_content;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset( $_wp_current_template_content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $type = 'index';
+ $templates = array(
+ 'index.php',
+ );
+ $resolved_template_path = locate_block_template( get_stylesheet_directory() . '/index.php', $type, $templates );
+ $this->assertEquals( self::$template_canvas_path, $resolved_template_path );
+ $this->assertStringEqualsFile( get_stylesheet_directory() . '/block-templates/index.html', $_wp_current_template_content );
</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">+ * In a hybrid theme, a PHP template of higher specificity will take precedence over a block template
+ * with lower specificity.
+ *
+ * Covers https://github.com/WordPress/gutenberg/pull/29026.
+ */
+ function test_more_specific_php_template_takes_precedence_over_less_specific_block_template() {
+ $page_id_template = 'page-1.php';
+ $page_id_template_path = get_stylesheet_directory() . '/' . $page_id_template;
+ $type = 'page';
+ $templates = array(
+ 'page-slug-doesnt-exist.php',
+ 'page-1.php',
+ 'page.php',
+ );
+ $resolved_template_path = locate_block_template( $page_id_template_path, $type, $templates );
+ $this->assertEquals( $page_id_template_path, $resolved_template_path );
+ }
+
+ /**
+ * If a theme is a child of a block-based parent theme but has php templates for some of its pages,
+ * a php template of the child will take precedence over the parent's block template if they have
+ * otherwise equal specificity.
+ *
+ * Covers https://github.com/WordPress/gutenberg/pull/31123.
+ *
+ */
+ function test_child_theme_php_template_takes_precedence_over_equally_specific_parent_theme_block_template() {
+ /**
+ * @todo This test is currently marked as skipped, since it wouldn't pass. Turns out that in Gutenberg,
+ * it only passed due to a erroneous test setup.
+ * For details, see https://github.com/WordPress/wordpress-develop/pull/1920#issuecomment-975929818.
+ */
+ $this->markTestSkipped( 'The block template resolution algorithm needs fixing in order for this test to pass.' );
+
+ switch_theme( 'block-theme-child' );
+
+ $page_slug_template = 'page-home.php';
+ $page_slug_template_path = get_stylesheet_directory() . '/' . $page_slug_template;
+ $type = 'page';
+ $templates = array(
+ 'page-home.php',
+ 'page-1.php',
+ 'page.php',
+ );
+ $resolved_template_path = locate_block_template( $page_slug_template_path, $type, $templates );
+ $this->assertEquals( $page_slug_template_path, $resolved_template_path );
+ }
+
+ function test_child_theme_block_template_takes_precedence_over_equally_specific_parent_theme_php_template() {
+ global $_wp_current_template_content;
+
+ switch_theme( 'block-theme-child' );
+
+ $page_template = 'page-1.php';
+ $parent_theme_page_template_path = get_template_directory() . '/' . $page_template;
+ $type = 'page';
+ $templates = array(
+ 'page-slug-doesnt-exist.php',
+ 'page-1.php',
+ 'page.php',
+ );
+ $resolved_template_path = locate_block_template( $parent_theme_page_template_path, $type, $templates );
+ $this->assertEquals( self::$template_canvas_path, $resolved_template_path );
+ $this->assertStringEqualsFile( get_stylesheet_directory() . '/block-templates/page-1.html', $_wp_current_template_content );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Regression: https://github.com/WordPress/gutenberg/issues/31399.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_custom_page_php_template_takes_precedence_over_all_other_templates() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,6 +154,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_custom_page_block_template_takes_precedence_over_all_other_templates() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $_wp_current_template_content;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set up custom template post.
+ $args = array(
+ 'post_type' => 'wp_template',
+ 'post_name' => 'wp-custom-template-my-block-template',
+ 'post_title' => 'My Custom Block Template',
+ 'post_content' => 'Content',
+ 'post_excerpt' => 'Description of my block template',
+ 'tax_input' => array(
+ 'wp_theme' => array(
+ get_stylesheet(),
+ ),
+ ),
+ );
+ $post = self::factory()->post->create_and_get( $args );
+ wp_set_post_terms( $post->ID, get_stylesheet(), 'wp_theme' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $custom_page_block_template = 'wp-custom-template-my-block-template';
</span><span class="cx" style="display: block; padding: 0 10px"> $page_template_path = get_stylesheet_directory() . '/' . 'page.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $type = 'page';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,7 +181,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $resolved_template_path = locate_block_template( $page_template_path, $type, $templates );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( self::$template_canvas_path, $resolved_template_path );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( self::$post->post_content, $_wp_current_template_content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $post->post_content, $_wp_current_template_content );
+
+ wp_delete_post( $post->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"> /**
</span></span></pre>
</div>
</div>
</body>
</html>