<!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>[52383] trunk: Tests: Add unit tests for theme features that block themes should support by default.</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/52383">52383</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/52383","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-12-16 14:45:32 +0000 (Thu, 16 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'>Tests: Add unit tests for theme features that block themes should support by default.
By default, block themes should have a few theme supports enabled:
* `post-thumbnails`
* `responsive-embeds`
* `editor-styles`
* `html5` for `comment-form`, `comment-list`, `style`, `script`
* `automatic-feed-links`
They should also load core block assets only when the blocks are rendered. This commit adds the associated tests.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/52369">[52369]</a>.
Props costdev.
See <a href="https://core.trac.wordpress.org/ticket/54597">#54597</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesthemephp">trunk/src/wp-includes/theme.php</a></li>
<li><a href="#trunktestsphpunitteststhemewpThemephp">trunk/tests/phpunit/tests/theme/wpTheme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme.php 2021-12-15 19:59:32 UTC (rev 52382)
+++ trunk/src/wp-includes/theme.php 2021-12-16 14:45:32 UTC (rev 52383)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4168,16 +4168,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Adds default theme supports for block themes when the 'setup_theme' action fires.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * See {@see 'setup_theme'}.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @since 5.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _add_default_theme_supports() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( wp_is_block_theme() ) {
- add_theme_support( 'post-thumbnails' );
- add_theme_support( 'responsive-embeds' );
- add_theme_support( 'editor-styles' );
- add_theme_support( 'html5', array( 'comment-form', 'comment-list', 'style', 'script' ) );
- add_theme_support( 'automatic-feed-links' );
- add_filter( 'should_load_separate_core_block_assets', '__return_true' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wp_is_block_theme() ) {
+ return;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ add_theme_support( 'post-thumbnails' );
+ add_theme_support( 'responsive-embeds' );
+ add_theme_support( 'editor-styles' );
+ add_theme_support( 'html5', array( 'comment-form', 'comment-list', 'style', 'script' ) );
+ add_theme_support( 'automatic-feed-links' );
+
+ add_filter( 'should_load_separate_core_block_assets', '__return_true' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunitteststhemewpThemephp"></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/theme/wpTheme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme/wpTheme.php 2021-12-15 19:59:32 UTC (rev 52382)
+++ trunk/tests/phpunit/tests/theme/wpTheme.php 2021-12-16 14:45:32 UTC (rev 52383)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -353,4 +353,135 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Tests that block themes support a feature by default.
+ *
+ * @ticket 54597
+ * @dataProvider data_block_theme_has_default_support
+ *
+ * @covers ::_add_default_theme_supports
+ *
+ * @param array $support {
+ * The feature to check.
+ *
+ * @type string $feature The feature to check.
+ * @type string $sub_feature Optional. The sub-feature to check.
+ * }
+ */
+ public function test_block_theme_has_default_support( $support ) {
+ $this->helper_requires_block_theme();
+
+ $support_data = array_values( $support );
+ $support_data_str = implode( ': ', $support_data );
+
+ // Remove existing support.
+ if ( current_theme_supports( ...$support_data ) ) {
+ remove_theme_support( ...$support_data );
+ }
+
+ $this->assertFalse(
+ current_theme_supports( ...$support_data ),
+ "Could not remove support for $support_data_str."
+ );
+
+ do_action( 'setup_theme' );
+
+ $this->assertTrue(
+ current_theme_supports( ...$support_data ),
+ "Does not have default support for $support_data_str."
+ );
+ }
+
+ /**
+ * Data provider.
+ *
+ * @return array
+ */
+ public function data_block_theme_has_default_support() {
+ return array(
+ 'post-thumbnails' => array(
+ 'support' => array(
+ 'feature' => 'post-thumbnails',
+ ),
+ ),
+ 'responsive-embeds' => array(
+ 'support' => array(
+ 'feature' => 'responsive-embeds',
+ ),
+ ),
+ 'editor-styles' => array(
+ 'support' => array(
+ 'feature' => 'editor-styles',
+ ),
+ ),
+ 'html5: style' => array(
+ 'support' => array(
+ 'feature' => 'html5',
+ 'sub_feature' => 'style',
+ ),
+ ),
+ 'html5: script' => array(
+ 'support' => array(
+ 'feature' => 'html5',
+ 'sub_feature' => 'script',
+ ),
+ ),
+ 'automatic-feed-links' => array(
+ 'support' => array(
+ 'feature' => 'automatic-feed-links',
+ ),
+ ),
+ );
+ }
+
+ /**
+ * Tests that block themes load separate core block assets by default.
+ *
+ * @ticket 54597
+ *
+ * @covers ::wp_should_load_separate_core_block_assets
+ */
+ public function test_block_theme_should_load_separate_core_block_assets_by_default() {
+ $this->helper_requires_block_theme();
+
+ add_filter( 'should_load_separate_core_block_assets', '__return_false' );
+
+ $this->assertFalse(
+ wp_should_load_separate_core_block_assets(),
+ 'Could not disable loading separate core block assets.'
+ );
+
+ do_action( 'setup_theme' );
+
+ $this->assertTrue(
+ wp_should_load_separate_core_block_assets(),
+ 'Block themes do not load separate core block assets by default.'
+ );
+ }
+
+ /**
+ * Helper function to ensure that a block theme is available and active.
+ */
+ private function helper_requires_block_theme() {
+ // No need to switch if we're already on a block theme.
+ if ( wp_is_block_theme() ) {
+ return;
+ }
+
+ $block_theme = 'twentytwentytwo';
+ $block_theme_object = new WP_Theme( $block_theme, WP_CONTENT_DIR . '/themes' );
+
+ // Skip if the block theme is not available.
+ if ( ! $block_theme_object->exists() ) {
+ $this->markTestSkipped( "$block_theme must be available." );
+ }
+
+ switch_theme( $block_theme );
+
+ // Skip if we could not switch to the block theme.
+ if ( wp_get_theme()->stylesheet !== $block_theme ) {
+ $this->markTestSkipped( "Could not switch to $block_theme." );
+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>