<!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>[52314] trunk/tests/phpunit: Editor: Enable incomplete unit tests in `Tests_Block_Template_Utils:: test_get_block_template_from_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/52314">52314</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/52314","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>hellofromTonya</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-12-03 16:57:19 +0000 (Fri, 03 Dec 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'>Editor: Enable incomplete unit tests in `Tests_Block_Template_Utils:: test_get_block_template_from_file()`.
At the time tests were backported from Gutenberg, a block template theme was not available in the test suite; thus, the test was marked as `markTestIncomplete()`.
Now that `block-theme` and `block-theme-child` test fixture block template themes are available, this commit removes the `markTestIncomplete()` and adjusts the test to run by switching to the `block-theme` test fixture.
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/52247">[52247]</a>.
Props bernhard-reiter.
Fixes <a href="https://core.trac.wordpress.org/ticket/54551">#54551</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsblocktemplateutilsphp">trunk/tests/phpunit/tests/block-template-utils.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/tests/phpunit/data/themedir1/block-theme/parts/</li>
<li><a href="#trunktestsphpunitdatathemedir1blockthemepartssmallheaderhtml">trunk/tests/phpunit/data/themedir1/block-theme/parts/small-header.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitdatathemedir1blockthemepartssmallheaderhtml"></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/parts/small-header.html</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/block-theme/parts/small-header.html (rev 0)
+++ trunk/tests/phpunit/data/themedir1/block-theme/parts/small-header.html 2021-12-03 16:57:19 UTC (rev 52314)
</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>Small Header Template Part</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/parts/small-header.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="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-12-03 15:34:51 UTC (rev 52313)
+++ trunk/tests/phpunit/tests/block-template-utils.php 2021-12-03 16:57:19 UTC (rev 52314)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,11 +13,9 @@
</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><span class="cx" style="display: block; padding: 0 10px"> private static $template_part_post;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private static $test_theme = 'block-theme';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public static function wpSetUpBeforeClass() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // We may need a block theme.
- // switch_theme( 'tt1-blocks' );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Set up a template post corresponding to a different theme.
</span><span class="cx" style="display: block; padding: 0 10px"> // We do this to ensure resolution and slug creation works as expected,
</span><span class="cx" style="display: block; padding: 0 10px"> // even with another post of that same name present for another theme.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,12 +43,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_excerpt' => 'Description of my 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">- get_stylesheet(),
</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"> self::$post = self::factory()->post->create_and_get( $args );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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">+ wp_set_post_terms( self::$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"> // Set up template part post.
</span><span class="cx" style="display: block; padding: 0 10px"> $template_part_args = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,7 +59,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_excerpt' => 'Description of my template part',
</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">- get_stylesheet(),
</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">@@ -70,9 +68,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> self::$template_part_post = self::factory()->post->create_and_get( $template_part_args );
</span><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, get_stylesheet(), '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 function set_up() {
+ parent::set_up();
+ switch_theme( self::$test_theme );
+ }
+
</ins><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><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,9 +228,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Should retrieve the template from the theme files.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_get_block_template_from_file() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->markTestIncomplete();
- // Requires switching to a block theme.
- /* $id = get_stylesheet() . '//' . 'index';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = get_stylesheet() . '//' . 'index';
</ins><span class="cx" style="display: block; padding: 0 10px"> $template = get_block_template( $id, 'wp_template' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $id, $template->id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( get_stylesheet(), $template->theme );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -237,16 +238,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'wp_template', $template->type );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test template parts.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = get_stylesheet() . '//' . 'header';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = get_stylesheet() . '//' . 'small-header';
</ins><span class="cx" style="display: block; padding: 0 10px"> $template = get_block_template( $id, 'wp_template_part' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $id, $template->id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( get_stylesheet(), $template->theme );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( 'header', $template->slug );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'small-header', $template->slug );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'publish', $template->status );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'theme', $template->source );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'wp_template_part', $template->type );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( WP_TEMPLATE_PART_AREA_HEADER, $template->area );
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre>
</div>
</div>
</body>
</html>