<!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>[52266] trunk/tests/phpunit/tests: Tests: Replace `assertEquals()` with `assertSame()` in block template 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/52266">52266</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/52266","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>2021-11-29 08:45:31 +0000 (Mon, 29 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'>Tests: Replace `assertEquals()` with `assertSame()` in block template tests.
This ensures that not only the return values match the expected results, but also that their type is the same.
Going forward, stricter type checking by using `assertSame()`, `assertSameSets()`, or `assertSameSetsWithIndex()` should generally be preferred, to make the tests more reliable.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/51003">[51003]</a>, <a href="https://core.trac.wordpress.org/changeset/51079">[51079]</a>, <a href="https://core.trac.wordpress.org/changeset/52062">[52062]</a>, <a href="https://core.trac.wordpress.org/changeset/52265">[52265]</a>.
See <a href="https://core.trac.wordpress.org/ticket/53364">#53364</a>, <a href="https://core.trac.wordpress.org/ticket/53363">#53363</a>, <a href="https://core.trac.wordpress.org/ticket/54335">#54335</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>
</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 2021-11-29 03:21:26 UTC (rev 52265)
+++ trunk/tests/phpunit/tests/block-template-utils.php 2021-11-29 08:45:31 UTC (rev 52266)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,8 +1,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?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">- * Block_Template_Utils_Test class
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests_Block_Template_Utils class
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @package WordPress
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @package WordPress
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,14 +84,14 @@
</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"> $this->assertNotWPError( $template );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( get_stylesheet() . '//my_template', $template->id );
- $this->assertEquals( get_stylesheet(), $template->theme );
- $this->assertEquals( 'my_template', $template->slug );
- $this->assertEquals( 'publish', $template->status );
- $this->assertEquals( 'custom', $template->source );
- $this->assertEquals( 'My Template', $template->title );
- $this->assertEquals( 'Description of my template', $template->description );
- $this->assertEquals( 'wp_template', $template->type );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( get_stylesheet() . '//my_template', $template->id );
+ $this->assertSame( get_stylesheet(), $template->theme );
+ $this->assertSame( 'my_template', $template->slug );
+ $this->assertSame( 'publish', $template->status );
+ $this->assertSame( 'custom', $template->source );
+ $this->assertSame( 'My Template', $template->title );
+ $this->assertSame( 'Description of my template', $template->description );
+ $this->assertSame( 'wp_template', $template->type );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test template parts.
</span><span class="cx" style="display: block; padding: 0 10px"> $template_part = _build_block_template_result_from_post(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,15 +99,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp_template_part'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $template_part );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( get_stylesheet() . '//my_template_part', $template_part->id );
- $this->assertEquals( get_stylesheet(), $template_part->theme );
- $this->assertEquals( 'my_template_part', $template_part->slug );
- $this->assertEquals( 'publish', $template_part->status );
- $this->assertEquals( 'custom', $template_part->source );
- $this->assertEquals( 'My Template Part', $template_part->title );
- $this->assertEquals( 'Description of my template part', $template_part->description );
- $this->assertEquals( 'wp_template_part', $template_part->type );
- $this->assertEquals( WP_TEMPLATE_PART_AREA_HEADER, $template_part->area );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( get_stylesheet() . '//my_template_part', $template_part->id );
+ $this->assertSame( get_stylesheet(), $template_part->theme );
+ $this->assertSame( 'my_template_part', $template_part->slug );
+ $this->assertSame( 'publish', $template_part->status );
+ $this->assertSame( 'custom', $template_part->source );
+ $this->assertSame( 'My Template Part', $template_part->title );
+ $this->assertSame( 'Description of my template part', $template_part->description );
+ $this->assertSame( 'wp_template_part', $template_part->type );
+ $this->assertSame( WP_TEMPLATE_PART_AREA_HEADER, $template_part->area );
</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"> function test_build_block_template_result_from_file() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,14 +119,14 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( get_stylesheet() . '//single', $template->id );
- $this->assertEquals( get_stylesheet(), $template->theme );
- $this->assertEquals( 'single', $template->slug );
- $this->assertEquals( 'publish', $template->status );
- $this->assertEquals( 'theme', $template->source );
- $this->assertEquals( 'Single Post', $template->title );
- $this->assertEquals( 'Template used to display a single blog post.', $template->description );
- $this->assertEquals( 'wp_template', $template->type );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( get_stylesheet() . '//single', $template->id );
+ $this->assertSame( get_stylesheet(), $template->theme );
+ $this->assertSame( 'single', $template->slug );
+ $this->assertSame( 'publish', $template->status );
+ $this->assertSame( 'theme', $template->source );
+ $this->assertSame( 'Single Post', $template->title );
+ $this->assertSame( 'Template used to display a single blog post.', $template->description );
+ $this->assertSame( 'wp_template', $template->type );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test template parts.
</span><span class="cx" style="display: block; padding: 0 10px"> $template_part = _build_block_template_result_from_file(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,15 +137,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp_template_part'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( get_stylesheet() . '//header', $template_part->id );
- $this->assertEquals( get_stylesheet(), $template_part->theme );
- $this->assertEquals( 'header', $template_part->slug );
- $this->assertEquals( 'publish', $template_part->status );
- $this->assertEquals( 'theme', $template_part->source );
- $this->assertEquals( 'header', $template_part->title );
- $this->assertEquals( '', $template_part->description );
- $this->assertEquals( 'wp_template_part', $template_part->type );
- $this->assertEquals( WP_TEMPLATE_PART_AREA_HEADER, $template_part->area );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( get_stylesheet() . '//header', $template_part->id );
+ $this->assertSame( get_stylesheet(), $template_part->theme );
+ $this->assertSame( 'header', $template_part->slug );
+ $this->assertSame( 'publish', $template_part->status );
+ $this->assertSame( 'theme', $template_part->source );
+ $this->assertSame( 'header', $template_part->title );
+ $this->assertSame( '', $template_part->description );
+ $this->assertSame( 'wp_template_part', $template_part->type );
+ $this->assertSame( WP_TEMPLATE_PART_AREA_HEADER, $template_part->area );
</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"> function test_inject_theme_attribute_in_block_template_content() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,7 +159,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<!-- wp:template-part {"slug":"header","align":"full","tagName":"header","className":"site-header","theme":"%s"} /-->',
</span><span class="cx" style="display: block; padding: 0 10px"> get_stylesheet()
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( $expected, $template_content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $expected, $template_content );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content_without_theme_attribute_nested = '<!-- wp:group --><!-- wp:template-part {"slug":"header","align":"full", "tagName":"header","className":"site-header"} /--><!-- /wp:group -->';
</span><span class="cx" style="display: block; padding: 0 10px"> $template_content = _inject_theme_attribute_in_block_template_content(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,7 +170,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<!-- wp:group --><!-- wp:template-part {"slug":"header","align":"full","tagName":"header","className":"site-header","theme":"%s"} /--><!-- /wp:group -->',
</span><span class="cx" style="display: block; padding: 0 10px"> get_stylesheet()
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( $expected, $template_content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $expected, $template_content );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Does not inject theme when there is an existing theme attribute.
</span><span class="cx" style="display: block; padding: 0 10px"> $content_with_existing_theme_attribute = '<!-- wp:template-part {"slug":"header","theme":"fake-theme","align":"full", "tagName":"header","className":"site-header"} /-->';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -178,7 +178,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content_with_existing_theme_attribute,
</span><span class="cx" style="display: block; padding: 0 10px"> $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">- $this->assertEquals( $content_with_existing_theme_attribute, $template_content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $content_with_existing_theme_attribute, $template_content );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Does not inject theme when there is no template part.
</span><span class="cx" style="display: block; padding: 0 10px"> $content_with_no_template_part = '<!-- wp:post-content /-->';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -186,7 +186,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content_with_no_template_part,
</span><span class="cx" style="display: block; padding: 0 10px"> $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">- $this->assertEquals( $content_with_no_template_part, $template_content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $content_with_no_template_part, $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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,23 +197,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Requires switching to a block theme.
</span><span class="cx" style="display: block; padding: 0 10px"> /* $id = get_stylesheet() . '//' . 'index';
</span><span class="cx" style="display: block; padding: 0 10px"> $template = get_block_template( $id, 'wp_template' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( $id, $template->id );
- $this->assertEquals( get_stylesheet(), $template->theme );
- $this->assertEquals( 'index', $template->slug );
- $this->assertEquals( 'publish', $template->status );
- $this->assertEquals( 'theme', $template->source );
- $this->assertEquals( 'wp_template', $template->type );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $id, $template->id );
+ $this->assertSame( get_stylesheet(), $template->theme );
+ $this->assertSame( 'index', $template->slug );
+ $this->assertSame( 'publish', $template->status );
+ $this->assertSame( 'theme', $template->source );
+ $this->assertSame( 'wp_template', $template->type );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test template parts.
</span><span class="cx" style="display: block; padding: 0 10px"> $id = get_stylesheet() . '//' . 'header';
</span><span class="cx" style="display: block; padding: 0 10px"> $template = get_block_template( $id, 'wp_template_part' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( $id, $template->id );
- $this->assertEquals( get_stylesheet(), $template->theme );
- $this->assertEquals( 'header', $template->slug );
- $this->assertEquals( 'publish', $template->status );
- $this->assertEquals( 'theme', $template->source );
- $this->assertEquals( 'wp_template_part', $template->type );
- $this->assertEquals( WP_TEMPLATE_PART_AREA_HEADER, $template->area );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $id, $template->id );
+ $this->assertSame( get_stylesheet(), $template->theme );
+ $this->assertSame( 'header', $template->slug );
+ $this->assertSame( 'publish', $template->status );
+ $this->assertSame( 'theme', $template->source );
+ $this->assertSame( 'wp_template_part', $template->type );
+ $this->assertSame( WP_TEMPLATE_PART_AREA_HEADER, $template->area );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,23 +223,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_block_template_from_post() {
</span><span class="cx" style="display: block; padding: 0 10px"> $id = get_stylesheet() . '//' . 'my_template';
</span><span class="cx" style="display: block; padding: 0 10px"> $template = get_block_template( $id, 'wp_template' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( $id, $template->id );
- $this->assertEquals( get_stylesheet(), $template->theme );
- $this->assertEquals( 'my_template', $template->slug );
- $this->assertEquals( 'publish', $template->status );
- $this->assertEquals( 'custom', $template->source );
- $this->assertEquals( 'wp_template', $template->type );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $id, $template->id );
+ $this->assertSame( get_stylesheet(), $template->theme );
+ $this->assertSame( 'my_template', $template->slug );
+ $this->assertSame( 'publish', $template->status );
+ $this->assertSame( 'custom', $template->source );
+ $this->assertSame( 'wp_template', $template->type );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test template parts.
</span><span class="cx" style="display: block; padding: 0 10px"> $id = get_stylesheet() . '//' . 'my_template_part';
</span><span class="cx" style="display: block; padding: 0 10px"> $template = get_block_template( $id, 'wp_template_part' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( $id, $template->id );
- $this->assertEquals( get_stylesheet(), $template->theme );
- $this->assertEquals( 'my_template_part', $template->slug );
- $this->assertEquals( 'publish', $template->status );
- $this->assertEquals( 'custom', $template->source );
- $this->assertEquals( 'wp_template_part', $template->type );
- $this->assertEquals( WP_TEMPLATE_PART_AREA_HEADER, $template->area );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $id, $template->id );
+ $this->assertSame( get_stylesheet(), $template->theme );
+ $this->assertSame( 'my_template_part', $template->slug );
+ $this->assertSame( 'publish', $template->status );
+ $this->assertSame( 'custom', $template->source );
+ $this->assertSame( 'wp_template_part', $template->type );
+ $this->assertSame( WP_TEMPLATE_PART_AREA_HEADER, $template->area );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -268,18 +268,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Filter by slug.
</span><span class="cx" style="display: block; padding: 0 10px"> $templates = get_block_templates( array( 'slug__in' => array( 'my_template' ) ), 'wp_template' );
</span><span class="cx" style="display: block; padding: 0 10px"> $template_ids = get_template_ids( $templates );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( array( get_stylesheet() . '//' . 'my_template' ), $template_ids );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( get_stylesheet() . '//' . 'my_template' ), $template_ids );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Filter by CPT ID.
</span><span class="cx" style="display: block; padding: 0 10px"> $templates = get_block_templates( array( 'wp_id' => self::$post->ID ), 'wp_template' );
</span><span class="cx" style="display: block; padding: 0 10px"> $template_ids = get_template_ids( $templates );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( array( get_stylesheet() . '//' . 'my_template' ), $template_ids );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( get_stylesheet() . '//' . 'my_template' ), $template_ids );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Filter template part by area.
</span><span class="cx" style="display: block; padding: 0 10px"> // Requires a block theme.
</span><span class="cx" style="display: block; padding: 0 10px"> /*$templates = get_block_templates( array( 'area' => WP_TEMPLATE_PART_AREA_HEADER ), 'wp_template_part' );
</span><span class="cx" style="display: block; padding: 0 10px"> $template_ids = get_template_ids( $templates );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> get_stylesheet() . '//' . 'my_template_part',
</span><span class="cx" style="display: block; padding: 0 10px"> get_stylesheet() . '//' . 'header',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -297,18 +297,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $blocks = parse_blocks( $content_template_part_inside_group );
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = _flatten_blocks( $blocks );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array( $blocks[0], $blocks[0]['innerBlocks'][0] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( $expected, $actual );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $expected, $actual );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content_template_part_inside_group_inside_group = '<!-- wp:group --><!-- wp:group --><!-- wp:template-part {"slug":"header"} /--><!-- /wp:group --><!-- /wp:group -->';
</span><span class="cx" style="display: block; padding: 0 10px"> $blocks = parse_blocks( $content_template_part_inside_group_inside_group );
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = _flatten_blocks( $blocks );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array( $blocks[0], $blocks[0]['innerBlocks'][0], $blocks[0]['innerBlocks'][0]['innerBlocks'][0] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( $expected, $actual );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $expected, $actual );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content_without_inner_blocks = '<!-- wp:group /-->';
</span><span class="cx" style="display: block; padding: 0 10px"> $blocks = parse_blocks( $content_without_inner_blocks );
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = _flatten_blocks( $blocks );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array( $blocks[0] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( $expected, $actual );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $expected, $actual );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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-29 03:21:26 UTC (rev 52265)
+++ trunk/tests/phpunit/tests/block-template.php 2021-11-29 08:45:31 UTC (rev 52266)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?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">- * Block_Template_Test class
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests_Block_Template class
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @package WordPress
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,7 +36,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'page.php',
</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( get_stylesheet_directory() . '/page-home.php', $type, $templates );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( self::$template_canvas_path, $resolved_template_path );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( self::$template_canvas_path, $resolved_template_path );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringEqualsFile( get_stylesheet_directory() . '/templates/page-home.html', $_wp_current_template_content );
</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">@@ -49,7 +49,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'page.php',
</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( get_stylesheet_directory() . '/page.php', $type, $templates );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( self::$template_canvas_path, $resolved_template_path );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( self::$template_canvas_path, $resolved_template_path );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringEqualsFile( get_stylesheet_directory() . '/templates/page.html', $_wp_current_template_content );
</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">@@ -60,7 +60,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'index.php',
</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( get_stylesheet_directory() . '/index.php', $type, $templates );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( self::$template_canvas_path, $resolved_template_path );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( self::$template_canvas_path, $resolved_template_path );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringEqualsFile( get_stylesheet_directory() . '/templates/index.html', $_wp_current_template_content );
</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">@@ -80,7 +80,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'page.php',
</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_id_template_path, $type, $templates );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( $page_id_template_path, $resolved_template_path );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $page_id_template_path, $resolved_template_path );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,7 +110,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'page.php',
</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_slug_template_path, $type, $templates );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( $page_slug_template_path, $resolved_template_path );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $page_slug_template_path, $resolved_template_path );
</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"> function test_child_theme_block_template_takes_precedence_over_equally_specific_parent_theme_php_template() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,7 +127,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'page.php',
</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( $parent_theme_page_template_path, $type, $templates );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( self::$template_canvas_path, $resolved_template_path );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( self::$template_canvas_path, $resolved_template_path );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringEqualsFile( get_stylesheet_directory() . '/templates/page-1.html', $_wp_current_template_content );
</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>