<!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>[50960] trunk/tests/phpunit: Editor: Fix failing unit test for i18n support in `theme.json`</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/50960">50960</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/50960","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>gziolo</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-05-24 09:49:48 +0000 (Mon, 24 May 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: Fix failing unit test for i18n support in `theme.json`
As part of the change, I also did some code reorganization to match with how other test fixtures are handled.
Follow-up <a href="https://core.trac.wordpress.org/changeset/50959">[50959]</a>.
See <a href="https://core.trac.wordpress.org/ticket/52991">#52991</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitteststhemethemeDirphp">trunk/tests/phpunit/tests/theme/themeDir.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunitdatalanguagesthemesfsepl_PLmo">trunk/tests/phpunit/data/languages/themes/fse-pl_PL.mo</a></li>
<li><a href="#trunktestsphpunitdatalanguagesthemesfsepl_PLpo">trunk/tests/phpunit/data/languages/themes/fse-pl_PL.po</a></li>
<li>trunk/tests/phpunit/data/themedir1/fse/</li>
<li><a href="#trunktestsphpunitdatathemedir1fseindexphp">trunk/tests/phpunit/data/themedir1/fse/index.php</a></li>
<li><a href="#trunktestsphpunitdatathemedir1fsestylecss">trunk/tests/phpunit/data/themedir1/fse/style.css</a></li>
<li><a href="#trunktestsphpunitdatathemedir1fsethemejson">trunk/tests/phpunit/data/themedir1/fse/theme.json</a></li>
<li><a href="#trunktestsphpunitteststhemeclasswpthemejsonresolverphp">trunk/tests/phpunit/tests/theme/class-wp-theme-json-resolver.php</a></li>
<li><a href="#trunktestsphpunitteststhemeclasswpthemejsonphp">trunk/tests/phpunit/tests/theme/class-wp-theme-json.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsblocksclasswpthemejsonresolvertestphp">trunk/tests/phpunit/tests/blocks/class-wp-theme-json-resolver-test.php</a></li>
<li><a href="#trunktestsphpunittestsblocksclasswpthemejsontestphp">trunk/tests/phpunit/tests/blocks/class-wp-theme-json-test.php</a></li>
<li>trunk/tests/phpunit/tests/blocks/data/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitdatalanguagesthemesfsepl_PLmo"></a>
<div class="binary"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/data/languages/themes/fse-pl_PL.mo</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx" style="display: block; padding: 0 10px">Index: trunk/tests/phpunit/data/languages/themes/fse-pl_PL.mo
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- trunk/tests/phpunit/data/languages/themes/fse-pl_PL.mo 2021-05-24 08:36:11 UTC (rev 50959)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ trunk/tests/phpunit/data/languages/themes/fse-pl_PL.mo 2021-05-24 09:49:48 UTC (rev 50960)
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/data/languages/themes/fse-pl_PL.mo
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:mime-type</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+application/octet-stream
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunktestsphpunitdatalanguagesthemesfsepl_PLpo"></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/languages/themes/fse-pl_PL.po</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/languages/themes/fse-pl_PL.po (rev 0)
+++ trunk/tests/phpunit/data/languages/themes/fse-pl_PL.po 2021-05-24 09:49:48 UTC (rev 50960)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,31 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2015-12-31 16:31+0100\n"
+"PO-Revision-Date: 2021-03-15 13:10+0100\n"
+"Language: pl_PL\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 2.4.2\n"
+"X-Poedit-Basepath: .\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-KeywordsList: __;_e;_x:1,2c;_ex:1,2c;_n:1,2;_nx:1,2,4c;_n_noop:1,2;"
+"_nx_noop:1,2,3c;esc_attr__;esc_html__;esc_attr_e;esc_html_e;esc_attr_x:1,2c;"
+"esc_html_x:1,2c\n"
+"X-Textdomain-Support: yes\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"X-Poedit-SearchPath-0: .\n"
+
+msgctxt "Custom template name"
+msgid "Homepage template"
+msgstr "Szablon strony głównej"
+
+msgctxt "Color name"
+msgid "Light"
+msgstr "Jasny"
+
+msgctxt "Color name"
+msgid "Dark"
+msgstr "Ciemny"
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/data/languages/themes/fse-pl_PL.po
</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="trunktestsphpunitdatathemedir1fseindexphp"></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/fse/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/fse/index.php (rev 0)
+++ trunk/tests/phpunit/data/themedir1/fse/index.php 2021-05-24 09:49:48 UTC (rev 50960)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,4 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * Dummy theme.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/data/themedir1/fse/index.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunktestsphpunitdatathemedir1fsestylecss"></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/fse/style.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/fse/style.css (rev 0)
+++ trunk/tests/phpunit/data/themedir1/fse/style.css 2021-05-24 09:49:48 UTC (rev 50960)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,7 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*
+Theme Name: FSE Theme
+Theme URI: https://wordpress.org/
+Description: For testing purposes only.
+Version: 1.0.0
+Text Domain: fse
+*/
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/data/themedir1/fse/style.css
</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="trunktestsphpunitdatathemedir1fsethemejson"></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/fse/theme.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/fse/theme.json (rev 0)
+++ trunk/tests/phpunit/data/themedir1/fse/theme.json 2021-05-24 09:49:48 UTC (rev 50960)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,45 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+{
+ "version": 1,
+ "settings": {
+ "color": {
+ "palette": [
+ {
+ "slug": "light",
+ "name": "Light",
+ "color": "#f5f7f9"
+ },
+ {
+ "slug": "dark",
+ "name": "Dark",
+ "color": "#000"
+ }
+ ],
+ "custom": false
+ },
+ "blocks": {
+ "core/paragraph": {
+ "color": {
+ "palette": [
+ {
+ "slug": "light",
+ "name": "Light",
+ "color": "#f5f7f9"
+ }
+ ]
+ }
+ }
+ }
+ },
+ "customTemplates": [
+ {
+ "name": "page-home",
+ "title": "Homepage template"
+ }
+ ],
+ "templateParts": [
+ {
+ "name": "small-header",
+ "area": "header"
+ }
+ ]
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/data/themedir1/fse/theme.json
</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="trunktestsphpunittestsblocksclasswpthemejsonresolvertestphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/tests/phpunit/tests/blocks/class-wp-theme-json-resolver-test.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/class-wp-theme-json-resolver-test.php 2021-05-24 08:36:11 UTC (rev 50959)
+++ trunk/tests/phpunit/tests/blocks/class-wp-theme-json-resolver-test.php 2021-05-24 09:49:48 UTC (rev 50960)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,147 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-/**
- * Test WP_Theme_JSON_Resolver class.
- *
- * @package Gutenberg
- */
-
-class WP_Theme_JSON_Resolver_Test extends WP_UnitTestCase {
-
- function setUp() {
- parent::setUp();
- $this->theme_root = realpath( __DIR__ . '/data/themedir1' );
-
- $this->orig_theme_dir = $GLOBALS['wp_theme_directories'];
-
- // /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 );
-
- 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'] );
- }
-
- function tearDown() {
- $GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
- wp_clean_themes_cache();
- unset( $GLOBALS['wp_themes'] );
- parent::tearDown();
- }
-
- function filter_set_theme_root() {
- return $this->theme_root;
- }
-
- function filter_set_locale_to_polish() {
- return 'pl_PL';
- }
-
- function test_fields_are_extracted() {
- $actual = WP_Theme_JSON_Resolver::get_fields_to_translate();
-
- $expected = array(
- array(
- 'path' => array( 'settings', 'typography', 'fontSizes' ),
- 'key' => 'name',
- 'context' => 'Font size name',
- ),
- array(
- 'path' => array( 'settings', 'color', 'palette' ),
- 'key' => 'name',
- 'context' => 'Color name',
- ),
- array(
- 'path' => array( 'settings', 'color', 'gradients' ),
- 'key' => 'name',
- 'context' => 'Gradient name',
- ),
- array(
- 'path' => array( 'settings', 'color', 'duotone' ),
- 'key' => 'name',
- 'context' => 'Duotone name',
- ),
- array(
- 'path' => array( 'settings', 'blocks', '*', 'typography', 'fontSizes' ),
- 'key' => 'name',
- 'context' => 'Font size name',
- ),
- array(
- 'path' => array( 'settings', 'blocks', '*', 'color', 'palette' ),
- 'key' => 'name',
- 'context' => 'Color name',
- ),
- array(
- 'path' => array( 'settings', 'blocks', '*', 'color', 'gradients' ),
- 'key' => 'name',
- 'context' => 'Gradient name',
- ),
- );
-
- $this->assertEquals( $expected, $actual );
- }
-
- function test_translations_are_applied() {
- add_filter( 'locale', array( $this, 'filter_set_locale_to_polish' ) );
- load_textdomain( 'fse', realpath( __DIR__ . '/data/languages/themes/fse-pl_PL.mo' ) );
-
- switch_theme( 'fse' );
-
- $actual = WP_Theme_JSON_Resolver::get_theme_data();
-
- unload_textdomain( 'fse' );
- remove_filter( 'locale', array( $this, 'filter_set_locale_to_polish' ) );
-
- $this->assertSame( wp_get_theme()->get( 'TextDomain' ), 'fse' );
- $this->assertSame(
- array(
- 'color' => array(
- 'palette' => array(
- array(
- 'slug' => 'light',
- 'name' => 'Jasny',
- 'color' => '#f5f7f9',
- ),
- array(
- 'slug' => 'dark',
- 'name' => 'Ciemny',
- 'color' => '#000',
- ),
- ),
- 'custom' => false,
- ),
- 'blocks' => array(
- 'core/paragraph' => array(
- 'color' => array(
- 'palette' => array(
- array(
- 'slug' => 'light',
- 'name' => 'Jasny',
- 'color' => '#f5f7f9',
- ),
- ),
- ),
- ),
- ),
- ),
- $actual->get_settings()
- );
- }
-
- function test_switching_themes_recalculates_data() {
- // By default, the theme for unit tests is "default",
- // which doesn't have theme.json support.
- $default = WP_Theme_JSON_Resolver::theme_has_support();
-
- // Switch to a theme that does have support.
- switch_theme( 'fse' );
- $fse = WP_Theme_JSON_Resolver::theme_has_support();
-
- $this->assertSame( false, $default );
- $this->assertSame( true, $fse );
- }
-
-}
</del></span></pre></div>
<a id="trunktestsphpunittestsblocksclasswpthemejsontestphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/tests/phpunit/tests/blocks/class-wp-theme-json-test.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/class-wp-theme-json-test.php 2021-05-24 08:36:11 UTC (rev 50959)
+++ trunk/tests/phpunit/tests/blocks/class-wp-theme-json-test.php 2021-05-24 09:49:48 UTC (rev 50960)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,439 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-/**
- * Test WP_Theme_JSON class.
- *
- * @package Gutenberg
- */
-
-class WP_Theme_JSON_Test extends WP_UnitTestCase {
-
- function test_get_settings() {
- $theme_json = new WP_Theme_JSON(
- array(
- 'version' => WP_Theme_JSON::LATEST_SCHEMA,
- 'settings' => array(
- 'color' => array(
- 'custom' => false,
- ),
- 'invalid/key' => 'value',
- 'blocks' => array(
- 'core/group' => array(
- 'color' => array(
- 'custom' => false,
- ),
- 'invalid/key' => 'value',
- ),
- ),
- ),
- 'styles' => array(
- 'color' => array(
- 'link' => 'blue',
- ),
- ),
- )
- );
-
- $actual = $theme_json->get_settings();
-
- $expected = array(
- 'color' => array(
- 'custom' => false,
- ),
- 'blocks' => array(
- 'core/group' => array(
- 'color' => array(
- 'custom' => false,
- ),
- ),
- ),
- );
-
- $this->assertEqualSetsWithIndex( $expected, $actual );
- }
-
- public function test_merge_incoming_data() {
- $initial = array(
- 'version' => WP_Theme_JSON::LATEST_SCHEMA,
- 'settings' => array(
- 'color' => array(
- 'custom' => false,
- 'palette' => array(
- array(
- 'slug' => 'red',
- 'color' => 'red',
- ),
- array(
- 'slug' => 'green',
- 'color' => 'green',
- ),
- ),
- ),
- 'blocks' => array(
- 'core/paragraph' => array(
- 'color' => array(
- 'custom' => false,
- ),
- ),
- ),
- ),
- 'styles' => array(
- 'typography' => array(
- 'fontSize' => '12',
- ),
- ),
- );
-
- $add_new_block = array(
- 'version' => WP_Theme_JSON::LATEST_SCHEMA,
- 'settings' => array(
- 'blocks' => array(
- 'core/list' => array(
- 'color' => array(
- 'custom' => false,
- ),
- ),
- ),
- ),
- 'styles' => array(
- 'blocks' => array(
- 'core/list' => array(
- 'typography' => array(
- 'fontSize' => '12',
- ),
- 'color' => array(
- 'background' => 'brown',
- ),
- ),
- ),
- ),
- );
-
- $add_key_in_settings = array(
- 'version' => WP_Theme_JSON::LATEST_SCHEMA,
- 'settings' => array(
- 'color' => array(
- 'customGradient' => true,
- ),
- ),
- );
-
- $update_key_in_settings = array(
- 'version' => WP_Theme_JSON::LATEST_SCHEMA,
- 'settings' => array(
- 'color' => array(
- 'custom' => true,
- ),
- ),
- );
-
- $add_styles = array(
- 'version' => WP_Theme_JSON::LATEST_SCHEMA,
- 'styles' => array(
- 'blocks' => array(
- 'core/group' => array(
- 'spacing' => array(
- 'padding' => array(
- 'top' => '12px',
- ),
- ),
- ),
- ),
- ),
- );
-
- $add_key_in_styles = array(
- 'version' => WP_Theme_JSON::LATEST_SCHEMA,
- 'styles' => array(
- 'blocks' => array(
- 'core/group' => array(
- 'spacing' => array(
- 'padding' => array(
- 'bottom' => '12px',
- ),
- ),
- ),
- ),
- ),
- );
-
- $add_invalid_context = array(
- 'version' => WP_Theme_JSON::LATEST_SCHEMA,
- 'styles' => array(
- 'blocks' => array(
- 'core/para' => array(
- 'typography' => array(
- 'lineHeight' => '12',
- ),
- ),
- ),
- ),
- );
-
- $update_presets = array(
- 'version' => WP_Theme_JSON::LATEST_SCHEMA,
- 'settings' => array(
- 'color' => array(
- 'palette' => array(
- array(
- 'slug' => 'blue',
- 'color' => 'blue',
- ),
- ),
- 'gradients' => array(
- array(
- 'slug' => 'gradient',
- 'gradient' => 'gradient',
- ),
- ),
- ),
- 'typography' => array(
- 'fontSizes' => array(
- array(
- 'slug' => 'fontSize',
- 'size' => 'fontSize',
- ),
- ),
- 'fontFamilies' => array(
- array(
- 'slug' => 'fontFamily',
- 'fontFamily' => 'fontFamily',
- ),
- ),
- ),
- ),
- );
-
- $expected = array(
- 'version' => WP_Theme_JSON::LATEST_SCHEMA,
- 'settings' => array(
- 'color' => array(
- 'custom' => true,
- 'customGradient' => true,
- 'palette' => array(
- array(
- 'slug' => 'blue',
- 'color' => 'blue',
- ),
- ),
- 'gradients' => array(
- array(
- 'slug' => 'gradient',
- 'gradient' => 'gradient',
- ),
- ),
- ),
- 'typography' => array(
- 'fontSizes' => array(
- array(
- 'slug' => 'fontSize',
- 'size' => 'fontSize',
- ),
- ),
- ),
- 'blocks' => array(
- 'core/paragraph' => array(
- 'color' => array(
- 'custom' => false,
- ),
- ),
- 'core/list' => array(
- 'color' => array(
- 'custom' => false,
- ),
- ),
- ),
- ),
- );
-
- $theme_json = new WP_Theme_JSON( $initial );
- $theme_json->merge( new WP_Theme_JSON( $add_new_block ) );
- $theme_json->merge( new WP_Theme_JSON( $add_key_in_settings ) );
- $theme_json->merge( new WP_Theme_JSON( $update_key_in_settings ) );
- $theme_json->merge( new WP_Theme_JSON( $add_styles ) );
- $theme_json->merge( new WP_Theme_JSON( $add_key_in_styles ) );
- $theme_json->merge( new WP_Theme_JSON( $add_invalid_context ) );
- $theme_json->merge( new WP_Theme_JSON( $update_presets ) );
- $actual = $theme_json->get_raw_data();
-
- $this->assertEqualSetsWithIndex( $expected, $actual );
- }
-
- function test_get_from_editor_settings() {
- $input = array(
- 'disableCustomColors' => true,
- 'disableCustomGradients' => true,
- 'disableCustomFontSizes' => true,
- 'enableCustomLineHeight' => true,
- 'enableCustomUnits' => true,
- 'colors' => array(
- array(
- 'slug' => 'color-slug',
- 'name' => 'Color Name',
- 'color' => 'colorvalue',
- ),
- ),
- 'gradients' => array(
- array(
- 'slug' => 'gradient-slug',
- 'name' => 'Gradient Name',
- 'gradient' => 'gradientvalue',
- ),
- ),
- 'fontSizes' => array(
- array(
- 'slug' => 'size-slug',
- 'name' => 'Size Name',
- 'size' => 'sizevalue',
- ),
- ),
- );
-
- $expected = array(
- 'version' => WP_Theme_JSON::LATEST_SCHEMA,
- 'settings' => array(
- 'color' => array(
- 'custom' => false,
- 'customGradient' => false,
- 'gradients' => array(
- array(
- 'slug' => 'gradient-slug',
- 'name' => 'Gradient Name',
- 'gradient' => 'gradientvalue',
- ),
- ),
- 'palette' => array(
- array(
- 'slug' => 'color-slug',
- 'name' => 'Color Name',
- 'color' => 'colorvalue',
- ),
- ),
- ),
- 'spacing' => array(
- 'units' => array( 'px', 'em', 'rem', 'vh', 'vw' ),
- ),
- 'typography' => array(
- 'customFontSize' => false,
- 'customLineHeight' => true,
- 'fontSizes' => array(
- array(
- 'slug' => 'size-slug',
- 'name' => 'Size Name',
- 'size' => 'sizevalue',
- ),
- ),
- ),
- ),
- );
-
- $actual = WP_Theme_JSON::get_from_editor_settings( $input );
-
- $this->assertEqualSetsWithIndex( $expected, $actual );
- }
-
- function test_get_editor_settings_no_theme_support() {
- $input = array(
- '__unstableEnableFullSiteEditingBlocks' => false,
- 'disableCustomColors' => false,
- 'disableCustomFontSizes' => false,
- 'disableCustomGradients' => false,
- 'enableCustomLineHeight' => false,
- 'enableCustomUnits' => false,
- 'imageSizes' => array(
- array(
- 'slug' => 'thumbnail',
- 'name' => 'Thumbnail',
- ),
- array(
- 'slug' => 'medium',
- 'name' => 'Medium',
- ),
- array(
- 'slug' => 'large',
- 'name' => 'Large',
- ),
- array(
- 'slug' => 'full',
- 'name' => 'Full Size',
- ),
- ),
- 'isRTL' => false,
- 'maxUploadFileSize' => 123,
- );
-
- $expected = array(
- 'version' => WP_Theme_JSON::LATEST_SCHEMA,
- 'settings' => array(
- 'color' => array(
- 'custom' => true,
- 'customGradient' => true,
- ),
- 'spacing' => array(
- 'units' => false,
- ),
- 'typography' => array(
- 'customFontSize' => true,
- 'customLineHeight' => false,
- ),
- ),
- );
-
- $actual = WP_Theme_JSON::get_from_editor_settings( $input );
-
- $this->assertEqualSetsWithIndex( $expected, $actual );
- }
-
- function test_get_editor_settings_blank() {
- $expected = array(
- 'version' => WP_Theme_JSON::LATEST_SCHEMA,
- 'settings' => array(),
- );
- $actual = WP_Theme_JSON::get_from_editor_settings( array() );
-
- $this->assertEqualSetsWithIndex( $expected, $actual );
- }
-
- function test_get_editor_settings_custom_units_can_be_disabled() {
- add_theme_support( 'custom-units', array() );
- $input = get_default_block_editor_settings();
-
- $expected = array(
- 'units' => array( array() ),
- 'customPadding' => false,
- );
-
- $actual = WP_Theme_JSON::get_from_editor_settings( $input );
-
- $this->assertEqualSetsWithIndex( $expected, $actual['settings']['spacing'] );
- }
-
- function test_get_editor_settings_custom_units_can_be_enabled() {
- add_theme_support( 'custom-units' );
- $input = get_default_block_editor_settings();
-
- $expected = array(
- 'units' => array( 'px', 'em', 'rem', 'vh', 'vw' ),
- 'customPadding' => false,
- );
-
- $actual = WP_Theme_JSON::get_from_editor_settings( $input );
-
- $this->assertEqualSetsWithIndex( $expected, $actual['settings']['spacing'] );
- }
-
- function test_get_editor_settings_custom_units_can_be_filtered() {
- add_theme_support( 'custom-units', 'rem', 'em' );
- $input = get_default_block_editor_settings();
-
- $expected = array(
- 'units' => array( 'rem', 'em' ),
- 'customPadding' => false,
- );
-
- $actual = WP_Theme_JSON::get_from_editor_settings( $input );
-
- $this->assertEqualSetsWithIndex( $expected, $actual['settings']['spacing'] );
- }
-
-}
</del></span></pre></div>
<a id="trunktestsphpunitteststhemeclasswpthemejsonresolverphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/tests/theme/class-wp-theme-json-resolver.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme/class-wp-theme-json-resolver.php (rev 0)
+++ trunk/tests/phpunit/tests/theme/class-wp-theme-json-resolver.php 2021-05-24 09:49:48 UTC (rev 50960)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,157 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * Test WP_Theme_JSON_Resolver class.
+ *
+ * @package WordPress
+ * @since 5.8.0
+ */
+
+class WP_Theme_JSON_Resolver_Test extends WP_UnitTestCase {
+
+ function setUp() {
+ parent::setUp();
+ $this->theme_root = realpath( DIR_TESTDATA . '/themedir1' );
+
+ $this->orig_theme_dir = $GLOBALS['wp_theme_directories'];
+
+ // /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 );
+
+ 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'] );
+ }
+
+ function tearDown() {
+ $GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
+ wp_clean_themes_cache();
+ unset( $GLOBALS['wp_themes'] );
+ parent::tearDown();
+ }
+
+ function filter_set_theme_root() {
+ return $this->theme_root;
+ }
+
+ function filter_set_locale_to_polish() {
+ return 'pl_PL';
+ }
+
+ /**
+ * @ticket 52991
+ */
+ function test_fields_are_extracted() {
+ $actual = WP_Theme_JSON_Resolver::get_fields_to_translate();
+
+ $expected = array(
+ array(
+ 'path' => array( 'settings', 'typography', 'fontSizes' ),
+ 'key' => 'name',
+ 'context' => 'Font size name',
+ ),
+ array(
+ 'path' => array( 'settings', 'color', 'palette' ),
+ 'key' => 'name',
+ 'context' => 'Color name',
+ ),
+ array(
+ 'path' => array( 'settings', 'color', 'gradients' ),
+ 'key' => 'name',
+ 'context' => 'Gradient name',
+ ),
+ array(
+ 'path' => array( 'settings', 'color', 'duotone' ),
+ 'key' => 'name',
+ 'context' => 'Duotone name',
+ ),
+ array(
+ 'path' => array( 'settings', 'blocks', '*', 'typography', 'fontSizes' ),
+ 'key' => 'name',
+ 'context' => 'Font size name',
+ ),
+ array(
+ 'path' => array( 'settings', 'blocks', '*', 'color', 'palette' ),
+ 'key' => 'name',
+ 'context' => 'Color name',
+ ),
+ array(
+ 'path' => array( 'settings', 'blocks', '*', 'color', 'gradients' ),
+ 'key' => 'name',
+ 'context' => 'Gradient name',
+ ),
+ );
+
+ $this->assertEquals( $expected, $actual );
+ }
+
+ /**
+ * @ticket 52991
+ */
+ function test_translations_are_applied() {
+ add_filter( 'locale', array( $this, 'filter_set_locale_to_polish' ) );
+ load_textdomain( 'fse', realpath( DIR_TESTDATA . '/languages/themes/fse-pl_PL.mo' ) );
+
+ switch_theme( 'fse' );
+
+ $actual = WP_Theme_JSON_Resolver::get_theme_data();
+
+ unload_textdomain( 'fse' );
+ remove_filter( 'locale', array( $this, 'filter_set_locale_to_polish' ) );
+
+ $this->assertSame( wp_get_theme()->get( 'TextDomain' ), 'fse' );
+ $this->assertSame(
+ array(
+ 'color' => array(
+ 'palette' => array(
+ array(
+ 'slug' => 'light',
+ 'name' => 'Jasny',
+ 'color' => '#f5f7f9',
+ ),
+ array(
+ 'slug' => 'dark',
+ 'name' => 'Ciemny',
+ 'color' => '#000',
+ ),
+ ),
+ 'custom' => false,
+ ),
+ 'blocks' => array(
+ 'core/paragraph' => array(
+ 'color' => array(
+ 'palette' => array(
+ array(
+ 'slug' => 'light',
+ 'name' => 'Jasny',
+ 'color' => '#f5f7f9',
+ ),
+ ),
+ ),
+ ),
+ ),
+ ),
+ $actual->get_settings()
+ );
+ }
+
+ /**
+ * @ticket 52991
+ */
+ function test_switching_themes_recalculates_data() {
+ // By default, the theme for unit tests is "default",
+ // which doesn't have theme.json support.
+ $default = WP_Theme_JSON_Resolver::theme_has_support();
+
+ // Switch to a theme that does have support.
+ switch_theme( 'fse' );
+ $fse = WP_Theme_JSON_Resolver::theme_has_support();
+
+ $this->assertSame( false, $default );
+ $this->assertSame( true, $fse );
+ }
+
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/tests/theme/class-wp-theme-json-resolver.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunktestsphpunitteststhemeclasswpthemejsonphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/tests/theme/class-wp-theme-json.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme/class-wp-theme-json.php (rev 0)
+++ trunk/tests/phpunit/tests/theme/class-wp-theme-json.php 2021-05-24 09:49:48 UTC (rev 50960)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,464 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * Test WP_Theme_JSON class.
+ *
+ * @package WordPress
+ * @since 5.8.0
+ */
+
+class WP_Theme_JSON_Test extends WP_UnitTestCase {
+
+ /**
+ * @ticket 52991
+ */
+ function test_get_settings() {
+ $theme_json = new WP_Theme_JSON(
+ array(
+ 'version' => WP_Theme_JSON::LATEST_SCHEMA,
+ 'settings' => array(
+ 'color' => array(
+ 'custom' => false,
+ ),
+ 'invalid/key' => 'value',
+ 'blocks' => array(
+ 'core/group' => array(
+ 'color' => array(
+ 'custom' => false,
+ ),
+ 'invalid/key' => 'value',
+ ),
+ ),
+ ),
+ 'styles' => array(
+ 'color' => array(
+ 'link' => 'blue',
+ ),
+ ),
+ )
+ );
+
+ $actual = $theme_json->get_settings();
+
+ $expected = array(
+ 'color' => array(
+ 'custom' => false,
+ ),
+ 'blocks' => array(
+ 'core/group' => array(
+ 'color' => array(
+ 'custom' => false,
+ ),
+ ),
+ ),
+ );
+
+ $this->assertEqualSetsWithIndex( $expected, $actual );
+ }
+
+ /**
+ * @ticket 52991
+ */
+ public function test_merge_incoming_data() {
+ $initial = array(
+ 'version' => WP_Theme_JSON::LATEST_SCHEMA,
+ 'settings' => array(
+ 'color' => array(
+ 'custom' => false,
+ 'palette' => array(
+ array(
+ 'slug' => 'red',
+ 'color' => 'red',
+ ),
+ array(
+ 'slug' => 'green',
+ 'color' => 'green',
+ ),
+ ),
+ ),
+ 'blocks' => array(
+ 'core/paragraph' => array(
+ 'color' => array(
+ 'custom' => false,
+ ),
+ ),
+ ),
+ ),
+ 'styles' => array(
+ 'typography' => array(
+ 'fontSize' => '12',
+ ),
+ ),
+ );
+
+ $add_new_block = array(
+ 'version' => WP_Theme_JSON::LATEST_SCHEMA,
+ 'settings' => array(
+ 'blocks' => array(
+ 'core/list' => array(
+ 'color' => array(
+ 'custom' => false,
+ ),
+ ),
+ ),
+ ),
+ 'styles' => array(
+ 'blocks' => array(
+ 'core/list' => array(
+ 'typography' => array(
+ 'fontSize' => '12',
+ ),
+ 'color' => array(
+ 'background' => 'brown',
+ ),
+ ),
+ ),
+ ),
+ );
+
+ $add_key_in_settings = array(
+ 'version' => WP_Theme_JSON::LATEST_SCHEMA,
+ 'settings' => array(
+ 'color' => array(
+ 'customGradient' => true,
+ ),
+ ),
+ );
+
+ $update_key_in_settings = array(
+ 'version' => WP_Theme_JSON::LATEST_SCHEMA,
+ 'settings' => array(
+ 'color' => array(
+ 'custom' => true,
+ ),
+ ),
+ );
+
+ $add_styles = array(
+ 'version' => WP_Theme_JSON::LATEST_SCHEMA,
+ 'styles' => array(
+ 'blocks' => array(
+ 'core/group' => array(
+ 'spacing' => array(
+ 'padding' => array(
+ 'top' => '12px',
+ ),
+ ),
+ ),
+ ),
+ ),
+ );
+
+ $add_key_in_styles = array(
+ 'version' => WP_Theme_JSON::LATEST_SCHEMA,
+ 'styles' => array(
+ 'blocks' => array(
+ 'core/group' => array(
+ 'spacing' => array(
+ 'padding' => array(
+ 'bottom' => '12px',
+ ),
+ ),
+ ),
+ ),
+ ),
+ );
+
+ $add_invalid_context = array(
+ 'version' => WP_Theme_JSON::LATEST_SCHEMA,
+ 'styles' => array(
+ 'blocks' => array(
+ 'core/para' => array(
+ 'typography' => array(
+ 'lineHeight' => '12',
+ ),
+ ),
+ ),
+ ),
+ );
+
+ $update_presets = array(
+ 'version' => WP_Theme_JSON::LATEST_SCHEMA,
+ 'settings' => array(
+ 'color' => array(
+ 'palette' => array(
+ array(
+ 'slug' => 'blue',
+ 'color' => 'blue',
+ ),
+ ),
+ 'gradients' => array(
+ array(
+ 'slug' => 'gradient',
+ 'gradient' => 'gradient',
+ ),
+ ),
+ ),
+ 'typography' => array(
+ 'fontSizes' => array(
+ array(
+ 'slug' => 'fontSize',
+ 'size' => 'fontSize',
+ ),
+ ),
+ 'fontFamilies' => array(
+ array(
+ 'slug' => 'fontFamily',
+ 'fontFamily' => 'fontFamily',
+ ),
+ ),
+ ),
+ ),
+ );
+
+ $expected = array(
+ 'version' => WP_Theme_JSON::LATEST_SCHEMA,
+ 'settings' => array(
+ 'color' => array(
+ 'custom' => true,
+ 'customGradient' => true,
+ 'palette' => array(
+ array(
+ 'slug' => 'blue',
+ 'color' => 'blue',
+ ),
+ ),
+ 'gradients' => array(
+ array(
+ 'slug' => 'gradient',
+ 'gradient' => 'gradient',
+ ),
+ ),
+ ),
+ 'typography' => array(
+ 'fontSizes' => array(
+ array(
+ 'slug' => 'fontSize',
+ 'size' => 'fontSize',
+ ),
+ ),
+ ),
+ 'blocks' => array(
+ 'core/paragraph' => array(
+ 'color' => array(
+ 'custom' => false,
+ ),
+ ),
+ 'core/list' => array(
+ 'color' => array(
+ 'custom' => false,
+ ),
+ ),
+ ),
+ ),
+ );
+
+ $theme_json = new WP_Theme_JSON( $initial );
+ $theme_json->merge( new WP_Theme_JSON( $add_new_block ) );
+ $theme_json->merge( new WP_Theme_JSON( $add_key_in_settings ) );
+ $theme_json->merge( new WP_Theme_JSON( $update_key_in_settings ) );
+ $theme_json->merge( new WP_Theme_JSON( $add_styles ) );
+ $theme_json->merge( new WP_Theme_JSON( $add_key_in_styles ) );
+ $theme_json->merge( new WP_Theme_JSON( $add_invalid_context ) );
+ $theme_json->merge( new WP_Theme_JSON( $update_presets ) );
+ $actual = $theme_json->get_raw_data();
+
+ $this->assertEqualSetsWithIndex( $expected, $actual );
+ }
+
+ /**
+ * @ticket 52991
+ */
+ function test_get_from_editor_settings() {
+ $input = array(
+ 'disableCustomColors' => true,
+ 'disableCustomGradients' => true,
+ 'disableCustomFontSizes' => true,
+ 'enableCustomLineHeight' => true,
+ 'enableCustomUnits' => true,
+ 'colors' => array(
+ array(
+ 'slug' => 'color-slug',
+ 'name' => 'Color Name',
+ 'color' => 'colorvalue',
+ ),
+ ),
+ 'gradients' => array(
+ array(
+ 'slug' => 'gradient-slug',
+ 'name' => 'Gradient Name',
+ 'gradient' => 'gradientvalue',
+ ),
+ ),
+ 'fontSizes' => array(
+ array(
+ 'slug' => 'size-slug',
+ 'name' => 'Size Name',
+ 'size' => 'sizevalue',
+ ),
+ ),
+ );
+
+ $expected = array(
+ 'version' => WP_Theme_JSON::LATEST_SCHEMA,
+ 'settings' => array(
+ 'color' => array(
+ 'custom' => false,
+ 'customGradient' => false,
+ 'gradients' => array(
+ array(
+ 'slug' => 'gradient-slug',
+ 'name' => 'Gradient Name',
+ 'gradient' => 'gradientvalue',
+ ),
+ ),
+ 'palette' => array(
+ array(
+ 'slug' => 'color-slug',
+ 'name' => 'Color Name',
+ 'color' => 'colorvalue',
+ ),
+ ),
+ ),
+ 'spacing' => array(
+ 'units' => array( 'px', 'em', 'rem', 'vh', 'vw' ),
+ ),
+ 'typography' => array(
+ 'customFontSize' => false,
+ 'customLineHeight' => true,
+ 'fontSizes' => array(
+ array(
+ 'slug' => 'size-slug',
+ 'name' => 'Size Name',
+ 'size' => 'sizevalue',
+ ),
+ ),
+ ),
+ ),
+ );
+
+ $actual = WP_Theme_JSON::get_from_editor_settings( $input );
+
+ $this->assertEqualSetsWithIndex( $expected, $actual );
+ }
+
+ /**
+ * @ticket 52991
+ */
+ function test_get_editor_settings_no_theme_support() {
+ $input = array(
+ '__unstableEnableFullSiteEditingBlocks' => false,
+ 'disableCustomColors' => false,
+ 'disableCustomFontSizes' => false,
+ 'disableCustomGradients' => false,
+ 'enableCustomLineHeight' => false,
+ 'enableCustomUnits' => false,
+ 'imageSizes' => array(
+ array(
+ 'slug' => 'thumbnail',
+ 'name' => 'Thumbnail',
+ ),
+ array(
+ 'slug' => 'medium',
+ 'name' => 'Medium',
+ ),
+ array(
+ 'slug' => 'large',
+ 'name' => 'Large',
+ ),
+ array(
+ 'slug' => 'full',
+ 'name' => 'Full Size',
+ ),
+ ),
+ 'isRTL' => false,
+ 'maxUploadFileSize' => 123,
+ );
+
+ $expected = array(
+ 'version' => WP_Theme_JSON::LATEST_SCHEMA,
+ 'settings' => array(
+ 'color' => array(
+ 'custom' => true,
+ 'customGradient' => true,
+ ),
+ 'spacing' => array(
+ 'units' => false,
+ ),
+ 'typography' => array(
+ 'customFontSize' => true,
+ 'customLineHeight' => false,
+ ),
+ ),
+ );
+
+ $actual = WP_Theme_JSON::get_from_editor_settings( $input );
+
+ $this->assertEqualSetsWithIndex( $expected, $actual );
+ }
+
+ /**
+ * @ticket 52991
+ */
+ function test_get_editor_settings_blank() {
+ $expected = array(
+ 'version' => WP_Theme_JSON::LATEST_SCHEMA,
+ 'settings' => array(),
+ );
+ $actual = WP_Theme_JSON::get_from_editor_settings( array() );
+
+ $this->assertEqualSetsWithIndex( $expected, $actual );
+ }
+
+ /**
+ * @ticket 52991
+ */
+ function test_get_editor_settings_custom_units_can_be_disabled() {
+ add_theme_support( 'custom-units', array() );
+ $input = get_default_block_editor_settings();
+
+ $expected = array(
+ 'units' => array( array() ),
+ 'customPadding' => false,
+ );
+
+ $actual = WP_Theme_JSON::get_from_editor_settings( $input );
+
+ $this->assertEqualSetsWithIndex( $expected, $actual['settings']['spacing'] );
+ }
+
+ /**
+ * @ticket 52991
+ */
+ function test_get_editor_settings_custom_units_can_be_enabled() {
+ add_theme_support( 'custom-units' );
+ $input = get_default_block_editor_settings();
+
+ $expected = array(
+ 'units' => array( 'px', 'em', 'rem', 'vh', 'vw' ),
+ 'customPadding' => false,
+ );
+
+ $actual = WP_Theme_JSON::get_from_editor_settings( $input );
+
+ $this->assertEqualSetsWithIndex( $expected, $actual['settings']['spacing'] );
+ }
+
+ /**
+ * @ticket 52991
+ */
+ function test_get_editor_settings_custom_units_can_be_filtered() {
+ add_theme_support( 'custom-units', 'rem', 'em' );
+ $input = get_default_block_editor_settings();
+
+ $expected = array(
+ 'units' => array( 'rem', 'em' ),
+ 'customPadding' => false,
+ );
+
+ $actual = WP_Theme_JSON::get_from_editor_settings( $input );
+
+ $this->assertEqualSetsWithIndex( $expected, $actual['settings']['spacing'] );
+ }
+
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/tests/theme/class-wp-theme-json.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunktestsphpunitteststhemethemeDirphp"></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/themeDir.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme/themeDir.php 2021-05-24 08:36:11 UTC (rev 50959)
+++ trunk/tests/phpunit/tests/theme/themeDir.php 2021-05-24 09:49:48 UTC (rev 50960)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,6 +161,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Internationalized Theme',
</span><span class="cx" style="display: block; padding: 0 10px"> 'camelCase',
</span><span class="cx" style="display: block; padding: 0 10px"> 'REST Theme',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'FSE 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"> sort( $theme_names );
</span></span></pre>
</div>
</div>
</body>
</html>