<!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>[55572] trunk/tests/phpunit/tests/theme/wpGetGlobalStylesheet.php: Tests: Rename test class and improve tests for wp_get_global_stylesheet().</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/55572">55572</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/55572","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>2023-03-21 13:52:29 +0000 (Tue, 21 Mar 2023)</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: Rename test class and improve tests for wp_get_global_stylesheet().
Changes include:
* Renames the test class to be compliant with test coding standards.
* Converts the test class to extend `WP_Theme_UnitTestCase` to reuse test fixtures.
* Implements data providers to encapsulate datasets and reduce code repetition.
* Adds a `@covers` annotation.
* Improves assertion messages to help with diagnosing failed tests.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/55567">[55567]</a>, <a href="https://core.trac.wordpress.org/changeset/55148">[55148]</a>, <a href="https://core.trac.wordpress.org/changeset/52682">[52682]</a>, <a href="https://core.trac.wordpress.org/changeset/53916">[53916]</a>, [52675-52677].
Props costdev, hellofromTonya.
See <a href="https://core.trac.wordpress.org/ticket/57841">#57841</a>, <a href="https://core.trac.wordpress.org/ticket/57958">#57958</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitteststhemewpGetGlobalStylesheetphp">trunk/tests/phpunit/tests/theme/wpGetGlobalStylesheet.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitteststhemewpGetGlobalStylesheetphp"></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/wpGetGlobalStylesheet.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme/wpGetGlobalStylesheet.php 2023-03-21 13:25:50 UTC (rev 55571)
+++ trunk/tests/phpunit/tests/theme/wpGetGlobalStylesheet.php 2023-03-21 13:52:29 UTC (rev 55572)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,216 +1,264 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+require_once __DIR__ . '/base.php';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Tests wp_get_global_stylesheet().
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @group themes
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @covers ::wp_get_global_stylesheet
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class Tests_Theme_wpGetGlobalStylesheet extends WP_UnitTestCase {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class Tests_Theme_WpGetGlobalStylesheet extends WP_Theme_UnitTestCase {
</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">- * Theme root directory.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Flag to indicate whether to remove 'editor-font-sizes' theme support at tear_down().
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @var string
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @var bool
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- private $theme_root;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private $remove_theme_support_at_teardown = false;
</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">- * Original theme directory.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Flag to indicate whether to switch back to the default theme at tear down.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @var string
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @var bool
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- private $orig_theme_dir;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private $switch_to_default_theme_at_teardown = false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function set_up() {
- parent::set_up();
-
- $this->orig_theme_dir = $GLOBALS['wp_theme_directories'];
- $this->theme_root = realpath( DIR_TESTDATA . '/themedir1' );
-
- // /themes is necessary as theme.php functions assume /themes is the root if there is only one root.
- $GLOBALS['wp_theme_directories'] = array( WP_CONTENT_DIR . '/themes', $this->theme_root );
-
- // Set up the new root.
- add_filter( 'theme_root', array( $this, 'filter_set_theme_root' ) );
- add_filter( 'stylesheet_root', array( $this, 'filter_set_theme_root' ) );
- add_filter( 'template_root', array( $this, 'filter_set_theme_root' ) );
-
- // Clear caches.
- wp_clean_themes_cache();
- unset( $GLOBALS['wp_themes'] );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> public function tear_down() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Reset the theme support.
+ if ( $this->remove_theme_support_at_teardown ) {
+ $this->remove_theme_support_at_teardown = false;
+ remove_theme_support( 'editor-font-sizes' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Clear up the filters to modify the theme root.
- remove_filter( 'theme_root', array( $this, 'filter_set_theme_root' ) );
- remove_filter( 'stylesheet_root', array( $this, 'filter_set_theme_root' ) );
- remove_filter( 'template_root', array( $this, 'filter_set_theme_root' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $this->switch_to_default_theme_at_teardown ) {
+ $this->switch_to_default_theme_at_teardown = false;
+ switch_theme( WP_DEFAULT_THEME );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_clean_themes_cache();
- unset( $GLOBALS['wp_themes'] );
-
</del><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</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">- public function filter_set_theme_root() {
- return $this->theme_root;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @ticket 54782
+ *
+ * @dataProvider data_should_conditionally_include_font_sizes
+ *
+ * @param array $expected Expected CSS for each font size.
+ * @param string $theme The theme to switch to / use.
+ * @param array $types Optional. Types of styles to load. Default empty array.
+ * @param bool $classic_has_presets Optional. Whether to apply presets for classic theme tests. Default false.
+ */
+ public function test_should_conditionally_include_font_sizes( array $expected, $theme, array $types = array(), $classic_has_presets = false ) {
+ $this->maybe_switch_theme( $theme );
+ $this->add_custom_font_sizes( $classic_has_presets );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_block_theme_using_variables() {
- switch_theme( 'block-theme' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $styles = wp_get_global_stylesheet( $types );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $styles = wp_get_global_stylesheet( array( 'variables' ) );
- $this->assertStringContainsString( '--wp--preset--font-size--small: 13px', $styles, 'small font size is 13px' );
- $this->assertStringContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is 20px' );
- $this->assertStringContainsString( '--wp--preset--font-size--large: 36px', $styles, 'large font size is 36px' );
- $this->assertStringContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is 42px' );
- $this->assertStringContainsString( '--wp--preset--font-size--custom: 100px;', $styles, 'custom font size is 100px' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertStringContainsString( $expected['small'], $styles, 'The small font size should be included.' );
+ $this->assertStringContainsString( $expected['medium'], $styles, 'The medium font size should be included.' );
+ $this->assertStringContainsString( $expected['large'], $styles, 'The large font size should be included.' );
+ $this->assertStringContainsString( $expected['x-large'], $styles, 'The x-large font size should be included.' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- switch_theme( WP_DEFAULT_THEME );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'default' !== $theme ) {
+ $this->assertStringContainsString( $expected['custom'], $styles, 'The custom font size should be included.' );
+ }
</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 test_block_theme_using_presets() {
- switch_theme( 'block-theme' );
-
- $styles = wp_get_global_stylesheet( array( 'presets' ) );
- $this->assertStringNotContainsString( '--wp--preset--font-size--small: 13px', $styles, 'small font size is not present' );
- $this->assertStringNotContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is not present' );
- $this->assertStringNotContainsString( '--wp--preset--font-size--large: 36px', $styles, 'large font size is not present' );
- $this->assertStringNotContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is not present' );
- $this->assertStringNotContainsString( '--wp--preset--font-size--custom: 100px;', $styles, 'custom font size is not present' );
-
- switch_theme( WP_DEFAULT_THEME );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Data provider.
+ *
+ * @return array[]
+ */
+ public function data_should_conditionally_include_font_sizes() {
+ return array(
+ 'block theme using defaults' => array(
+ 'expected' => array(
+ 'small' => '--wp--preset--font-size--small: 13px',
+ 'medium' => '--wp--preset--font-size--medium: 20px',
+ 'large' => '--wp--preset--font-size--large: 36px',
+ 'x-large' => '--wp--preset--font-size--x-large: 42px',
+ 'custom' => '--wp--preset--font-size--custom: 100px;',
+ ),
+ 'theme' => 'block-theme',
+ ),
+ 'block theme using variables' => array(
+ 'expected' => array(
+ 'small' => '--wp--preset--font-size--small: 13px',
+ 'medium' => '--wp--preset--font-size--medium: 20px',
+ 'large' => '--wp--preset--font-size--large: 36px',
+ 'x-large' => '--wp--preset--font-size--x-large: 42px',
+ 'custom' => '--wp--preset--font-size--custom: 100px;',
+ ),
+ 'theme' => 'block-theme',
+ 'types' => array( 'variables' ),
+ ),
+ 'classic theme without presets using defaults' => array(
+ 'expected' => array(
+ 'small' => '--wp--preset--font-size--small: 13px',
+ 'medium' => '--wp--preset--font-size--medium: 20px',
+ 'large' => '--wp--preset--font-size--large: 36px',
+ 'x-large' => '--wp--preset--font-size--x-large: 42px',
+ ),
+ 'theme' => 'default',
+ ),
+ 'classic theme without presets using variables' => array(
+ 'expected' => array(
+ 'small' => '--wp--preset--font-size--small: 13px',
+ 'medium' => '--wp--preset--font-size--medium: 20px',
+ 'large' => '--wp--preset--font-size--large: 36px',
+ 'x-large' => '--wp--preset--font-size--x-large: 42px',
+ ),
+ 'theme' => 'default',
+ 'types' => array( 'variables' ),
+ ),
+ 'classic theme with presets using defaults' => array(
+ 'expected' => array(
+ 'small' => '--wp--preset--font-size--small: 18px',
+ 'medium' => '--wp--preset--font-size--medium: 20px',
+ 'large' => '--wp--preset--font-size--large: 26.25px',
+ 'x-large' => '--wp--preset--font-size--x-large: 42px',
+ ),
+ 'theme' => 'default',
+ 'types' => array(),
+ 'classic_has_presets' => true,
+ ),
+ 'classic theme with presets using variables' => array(
+ 'expected' => array(
+ 'small' => '--wp--preset--font-size--small: 18px',
+ 'medium' => '--wp--preset--font-size--medium: 20px',
+ 'large' => '--wp--preset--font-size--large: 26.25px',
+ 'x-large' => '--wp--preset--font-size--x-large: 42px',
+ ),
+ 'theme' => 'default',
+ 'types' => array( 'variables' ),
+ 'classic_has_presets' => true,
+ ),
+ );
</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 test_block_theme_using_defaults() {
- switch_theme( 'block-theme' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @ticket 54782
+ *
+ * @dataProvider data_should_not_conditionally_include_font_sizes
+ *
+ * @param array $expected Expected CSS for each font size.
+ * @param string $theme The theme to switch to / use.
+ * @param array $types Optional. Types of styles to load. Default empty array.
+ * @param bool $classic_has_presets Optional. Whether to apply presets for classic theme tests. Default false.
+ */
+ public function test_should_not_conditionally_include_font_sizes( array $expected, $theme, array $types = array(), $classic_has_presets = false ) {
+ $this->maybe_switch_theme( $theme );
+ $this->add_custom_font_sizes( $classic_has_presets );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $styles = wp_get_global_stylesheet();
- $this->assertStringContainsString( '--wp--preset--font-size--small: 13px', $styles, 'small font size is 13px' );
- $this->assertStringContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is 20px' );
- $this->assertStringContainsString( '--wp--preset--font-size--large: 36px', $styles, 'large font size is 36px' );
- $this->assertStringContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is 42px' );
- $this->assertStringContainsString( '--wp--preset--font-size--custom: 100px;', $styles, 'custom font size is 100px' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $styles = wp_get_global_stylesheet( $types );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- switch_theme( WP_DEFAULT_THEME );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertStringNotContainsString( $expected['small'], $styles, 'The small font size should not be included.' );
+ $this->assertStringNotContainsString( $expected['medium'], $styles, 'The medium font size should not be included.' );
+ $this->assertStringNotContainsString( $expected['large'], $styles, 'The large font size should not be included.' );
+ $this->assertStringNotContainsString( $expected['x-large'], $styles, 'The x-large font size should not be included.' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_variables_in_classic_theme_with_no_presets_using_variables() {
- $styles = wp_get_global_stylesheet( array( 'variables' ) );
- $this->assertStringContainsString( '--wp--preset--font-size--small: 13px', $styles, 'small font size is 13px' );
- $this->assertStringContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is 20px' );
- $this->assertStringContainsString( '--wp--preset--font-size--large: 36px', $styles, 'large font size is 36px' );
- $this->assertStringContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is 42px' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'default' !== $theme ) {
+ $this->assertStringNotContainsString( $expected['custom'], $styles, 'The custom font size should not be included.' );
+ }
</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 test_variables_in_classic_theme_with_no_presets_using_presets() {
- $styles = wp_get_global_stylesheet( array( 'presets' ) );
- $this->assertStringNotContainsString( '--wp--preset--font-size--small: 13px', $styles, 'small font size is not present' );
- $this->assertStringNotContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is not present' );
- $this->assertStringNotContainsString( '--wp--preset--font-size--large: 36px', $styles, 'large font size is not present' );
- $this->assertStringNotContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is not present' );
- }
-
- public function test_variables_in_classic_theme_with_no_presets_using_defaults() {
- $styles = wp_get_global_stylesheet();
- $this->assertStringContainsString( '--wp--preset--font-size--small: 13px', $styles, 'small font size is 13px' );
- $this->assertStringContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is 20px' );
- $this->assertStringContainsString( '--wp--preset--font-size--large: 36px', $styles, 'large font size is 36px' );
- $this->assertStringContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is 42px' );
- }
-
- public function test_variables_in_classic_theme_with_presets_using_variables() {
- add_theme_support(
- 'editor-font-sizes',
- array(
- array(
- 'name' => 'Small',
- 'size' => 18,
- 'slug' => 'small',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Data provider.
+ *
+ * @return array[]
+ */
+ public function data_should_not_conditionally_include_font_sizes() {
+ return array(
+ 'block theme using presets' => array(
+ 'expected' => array(
+ 'small' => '--wp--preset--font-size--small: 13px',
+ 'medium' => '--wp--preset--font-size--medium: 20px',
+ 'large' => '--wp--preset--font-size--large: 36px',
+ 'x-large' => '--wp--preset--font-size--x-large: 42px',
+ 'custom' => '--wp--preset--font-size--custom: 100px;',
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array(
- 'name' => 'Large',
- 'size' => 26.25,
- 'slug' => 'large',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'theme' => 'block-theme',
+ 'types' => array( 'presets' ),
+ ),
+ 'classic theme without presets using presets' => array(
+ 'expected' => array(
+ 'small' => '--wp--preset--font-size--small: 13px',
+ 'medium' => '--wp--preset--font-size--medium: 20px',
+ 'large' => '--wp--preset--font-size--large: 36px',
+ 'x-large' => '--wp--preset--font-size--x-large: 42px',
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'theme' => 'default',
+ 'types' => array( 'presets' ),
+ ),
+ 'classic theme with presets using presets' => array(
+ 'expected' => array(
+ 'small' => '--wp--preset--font-size--small: 18px',
+ 'medium' => '--wp--preset--font-size--medium: 20px',
+ 'large' => '--wp--preset--font-size--large: 26.25px',
+ 'x-large' => '--wp--preset--font-size--x-large: 42px',
+ ),
+ 'theme' => 'default',
+ 'types' => array( 'presets' ),
+ 'classic_has_presets' => true,
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $styles = wp_get_global_stylesheet( array( 'variables' ) );
- $this->assertStringContainsString( '--wp--preset--font-size--small: 18px', $styles, 'small font size is 18px' );
- $this->assertStringContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is 20px' );
- $this->assertStringContainsString( '--wp--preset--font-size--large: 26.25px', $styles, 'large font size is 26.25px' );
- $this->assertStringContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is 42px' );
-
- remove_theme_support( 'editor-font-sizes' );
</del><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 test_variables_in_classic_theme_with_presets_using_presets() {
- add_theme_support(
- 'editor-font-sizes',
- array(
- array(
- 'name' => 'Small',
- 'size' => 18,
- 'slug' => 'small',
- ),
- array(
- 'name' => 'Large',
- 'size' => 26.25,
- 'slug' => 'large',
- ),
- )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @ticket 56970
+ */
+ public function test_switching_themes_should_recalculate_stylesheet() {
+ $expected = '--wp--preset--font-size--custom: 100px;';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $styles = wp_get_global_stylesheet( array( 'presets' ) );
- $this->assertStringNotContainsString( '--wp--preset--font-size--small: 18px', $styles, 'small font size is not present' );
- $this->assertStringNotContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is not present' );
- $this->assertStringNotContainsString( '--wp--preset--font-size--large: 26.25px', $styles, 'large font size is not present' );
- $this->assertStringNotContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is not present' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $stylesheet_for_default_theme = wp_get_global_stylesheet();
+ $this->assertStringNotContainsString( $expected, $stylesheet_for_default_theme, 'Custom font size (100px) should not present for default theme' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_theme_support( 'editor-font-sizes' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->maybe_switch_theme( 'block-theme' );
+ $stylesheet_for_block_theme = wp_get_global_stylesheet();
+ $this->assertStringContainsString( $expected, $stylesheet_for_block_theme, 'Custom font size (100px) should be present for block theme' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_variables_in_classic_theme_with_presets_using_defaults() {
- add_theme_support(
- 'editor-font-sizes',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Adds the 'editor-font-sizes' theme support with custom font sizes.
+ *
+ * @param bool $add_theme_support Whether to add the theme support.
+ * @param int $small Optional. Small font size in pixels. Default 18.
+ * @param int $large Optional. Large font size in pixels. Default 26.25.
+ */
+ private function add_custom_font_sizes( $add_theme_support, $small = 18, $large = 26.25 ) {
+ if ( ! $add_theme_support ) {
+ return;
+ }
+
+ $args = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array(
- 'name' => 'Small',
- 'size' => 18,
- 'slug' => 'small',
- ),
- array(
- 'name' => 'Large',
- 'size' => 26.25,
- 'slug' => 'large',
- ),
- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => 'Small',
+ 'size' => $small,
+ 'slug' => 'small',
+ ),
+ array(
+ 'name' => 'Large',
+ 'size' => $large,
+ 'slug' => 'large',
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $styles = wp_get_global_stylesheet();
- $this->assertStringContainsString( '--wp--preset--font-size--small: 18px', $styles, 'small font size is 18px' );
- $this->assertStringContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is 20px' );
- $this->assertStringContainsString( '--wp--preset--font-size--large: 26.25px', $styles, 'large font size is 26.25px' );
- $this->assertStringContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'small font size is 42px' );
-
- remove_theme_support( 'editor-font-sizes' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_theme_support( 'editor-font-sizes', $args );
+ $this->remove_theme_support_at_teardown = true;
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Tests that switching themes recalculates the stylesheet.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Switches the theme when not the 'default' theme.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @ticket 56970
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $theme Theme name to switch to.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_switching_themes_should_recalculate_stylesheet() {
- $stylesheet_for_default_theme = wp_get_global_stylesheet();
- switch_theme( 'block-theme' );
- $stylesheet_for_block_theme = wp_get_global_stylesheet();
- switch_theme( WP_DEFAULT_THEME );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function maybe_switch_theme( $theme ) {
+ if ( 'default' === $theme ) {
+ return;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertStringNotContainsString( '--wp--preset--font-size--custom: 100px;', $stylesheet_for_default_theme, 'custom font size (100px) not present for default theme' );
- $this->assertStringContainsString( '--wp--preset--font-size--custom: 100px;', $stylesheet_for_block_theme, 'custom font size (100px) is present for block theme' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ switch_theme( $theme );
+ $this->switch_to_default_theme_at_teardown = true;
</ins><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>