<!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>[54036] trunk/tests/phpunit: Tests: Increase coverage for translations applied to 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/54036">54036</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/54036","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>2022-08-31 10:11:30 +0000 (Wed, 31 Aug 2022)</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: Increase coverage for translations applied to theme.json
Ensures that translations are correctly applied to the `title` field in the `theme.json` and all style variations located in the them inside the `styles` folder.
Follow-up <a href="https://core.trac.wordpress.org/ticket/55495">#55495</a>, <a href="https://core.trac.wordpress.org/changeset/53038">[53038]</a>.
See also <a href="https://core.trac.wordpress.org/ticket/54336">#54336</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitdatalanguagesthemesblockthemepl_PLmo">trunk/tests/phpunit/data/languages/themes/block-theme-pl_PL.mo</a></li>
<li><a href="#trunktestsphpunitdatalanguagesthemesblockthemepl_PLpo">trunk/tests/phpunit/data/languages/themes/block-theme-pl_PL.po</a></li>
<li><a href="#trunktestsphpunitdatathemedir1blockthemestylesvariationjson">trunk/tests/phpunit/data/themedir1/block-theme/styles/variation.json</a></li>
<li><a href="#trunktestsphpunitdatathemedir1blockthemethemejson">trunk/tests/phpunit/data/themedir1/block-theme/theme.json</a></li>
<li><a href="#trunktestsphpunittestsrestapirestglobalstylescontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-global-styles-controller.php</a></li>
<li><a href="#trunktestsphpunitteststhemewpThemeJsonResolverphp">trunk/tests/phpunit/tests/theme/wpThemeJsonResolver.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitdatalanguagesthemesblockthemepl_PLmo"></a>
<div class="binary"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/data/languages/themes/block-theme-pl_PL.mo</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunktestsphpunitdatalanguagesthemesblockthemepl_PLpo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/data/languages/themes/block-theme-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/block-theme-pl_PL.po 2022-08-30 19:43:51 UTC (rev 54035)
+++ trunk/tests/phpunit/data/languages/themes/block-theme-pl_PL.po 2022-08-31 10:11:30 UTC (rev 54036)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,22 +2,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> msgstr ""
</span><span class="cx" style="display: block; padding: 0 10px"> "Project-Id-Version: \n"
</span><span class="cx" style="display: block; padding: 0 10px"> "POT-Creation-Date: 2015-12-31 16:31+0100\n"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-"PO-Revision-Date: 2021-03-15 13:10+0100\n"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+"PO-Revision-Date: 2022-08-31 11:08+0200\n"
+"Last-Translator: \n"
+"Language-Team: \n"
</ins><span class="cx" style="display: block; padding: 0 10px"> "Language: pl_PL\n"
</span><span class="cx" style="display: block; padding: 0 10px"> "MIME-Version: 1.0\n"
</span><span class="cx" style="display: block; padding: 0 10px"> "Content-Type: text/plain; charset=UTF-8\n"
</span><span class="cx" style="display: block; padding: 0 10px"> "Content-Transfer-Encoding: 8bit\n"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-"X-Generator: Poedit 2.4.2\n"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 3.1.1\n"
</ins><span class="cx" style="display: block; padding: 0 10px"> "X-Poedit-Basepath: .\n"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
</del><span class="cx" style="display: block; padding: 0 10px"> "X-Poedit-KeywordsList: __;_e;_x:1,2c;_ex:1,2c;_n:1,2;_nx:1,2,4c;_n_noop:1,2;"
</span><span class="cx" style="display: block; padding: 0 10px"> "_nx_noop:1,2,3c;esc_attr__;esc_html__;esc_attr_e;esc_html_e;esc_attr_x:1,2c;"
</span><span class="cx" style="display: block; padding: 0 10px"> "esc_html_x:1,2c\n"
</span><span class="cx" style="display: block; padding: 0 10px"> "X-Textdomain-Support: yes\n"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-"Last-Translator: \n"
-"Language-Team: \n"
</del><span class="cx" style="display: block; padding: 0 10px"> "X-Poedit-SearchPath-0: .\n"
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+msgctxt "Style variation name"
+msgid "Block theme"
+msgstr "Motyw blokowy"
+
+msgctxt "Style variation name"
+msgid "Block theme variation"
+msgstr "Wariant motywu blokowego"
+
</ins><span class="cx" style="display: block; padding: 0 10px"> msgctxt "Custom template name"
</span><span class="cx" style="display: block; padding: 0 10px"> msgid "Homepage template"
</span><span class="cx" style="display: block; padding: 0 10px"> msgstr "Szablon strony głównej"
</span></span></pre></div>
<a id="trunktestsphpunitdatathemedir1blockthemestylesvariationjson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/data/themedir1/block-theme/styles/variation.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/block-theme/styles/variation.json 2022-08-30 19:43:51 UTC (rev 54035)
+++ trunk/tests/phpunit/data/themedir1/block-theme/styles/variation.json 2022-08-31 10:11:30 UTC (rev 54036)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,23 +1,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "version": 2,
- "settings": {
- "color": {
- "palette": [
- {
- "slug": "foreground",
- "color": "#3F67C6",
- "name": "Foreground"
- }
- ]
- }
- },
- "styles": {
- "blocks": {
- "core/post-title": {
- "typography": {
- "fontWeight": "700"
- }
- }
- }
- }
-}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "version": 2,
+ "title": "Block theme variation",
+ "settings": {
+ "color": {
+ "palette": [
+ {
+ "slug": "foreground",
+ "color": "#3F67C6",
+ "name": "Foreground"
+ }
+ ]
+ }
+ },
+ "styles": {
+ "blocks": {
+ "core/post-title": {
+ "typography": {
+ "fontWeight": "700"
+ }
+ }
+ }
+ }
+}
</ins></span></pre></div>
<a id="trunktestsphpunitdatathemedir1blockthemethemejson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/data/themedir1/block-theme/theme.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/block-theme/theme.json 2022-08-30 19:43:51 UTC (rev 54035)
+++ trunk/tests/phpunit/data/themedir1/block-theme/theme.json 2022-08-31 10:11:30 UTC (rev 54036)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> "version": 1,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "title": "Block theme",
</ins><span class="cx" style="display: block; padding: 0 10px"> "settings": {
</span><span class="cx" style="display: block; padding: 0 10px"> "color": {
</span><span class="cx" style="display: block; padding: 0 10px"> "palette": [
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,9 +37,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "customLineHeight": true
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "spacing": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "units": [
- "rem"
- ],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "units": ["rem"],
</ins><span class="cx" style="display: block; padding: 0 10px"> "customPadding": true
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "blocks": {
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestglobalstylescontrollerphp"></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/rest-api/rest-global-styles-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-global-styles-controller.php 2022-08-30 19:43:51 UTC (rev 54035)
+++ trunk/tests/phpunit/tests/rest-api/rest-global-styles-controller.php 2022-08-31 10:11:30 UTC (rev 54036)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -471,6 +471,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'version' => 2,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'title' => 'Block theme variation',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'settings' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'color' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'palette' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -493,7 +494,6 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'title' => 'variation',
</del><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSameSetsWithIndex( $data, $expected );
</span></span></pre></div>
<a id="trunktestsphpunitteststhemewpThemeJsonResolverphp"></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/wpThemeJsonResolver.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme/wpThemeJsonResolver.php 2022-08-30 19:43:51 UTC (rev 54035)
+++ trunk/tests/phpunit/tests/theme/wpThemeJsonResolver.php 2022-08-31 10:11:30 UTC (rev 54036)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,13 +82,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> load_textdomain( 'block-theme', realpath( DIR_TESTDATA . '/languages/themes/block-theme-pl_PL.mo' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_theme( 'block-theme' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actual = WP_Theme_JSON_Resolver::get_theme_data();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $theme_data = WP_Theme_JSON_Resolver::get_theme_data();
+ $style_variations = WP_Theme_JSON_Resolver::get_style_variations();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> unload_textdomain( 'block-theme' );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'locale', array( $this, 'filter_set_locale_to_polish' ) );
</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->assertSame( wp_get_theme()->get( 'TextDomain' ), 'block-theme' );
- $this->assertSame(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'block-theme', wp_get_theme()->get( 'TextDomain' ) );
+ $this->assertSame( 'Motyw blokowy', $theme_data->get_data()['title'] );
+ $this->assertSameSets(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'color' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'custom' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,26 +152,30 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actual->get_settings()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $theme_data->get_settings()
</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->assertSame(
- $actual->get_custom_templates(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSameSets(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page-home' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'Szablon strony głównej',
</span><span class="cx" style="display: block; padding: 0 10px"> 'postTypes' => array( 'page' ),
</span><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_data->get_custom_templates()
</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->assertSame(
- $actual->get_template_parts(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSameSets(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'small-header' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'Mały nagłówek',
</span><span class="cx" style="display: block; padding: 0 10px"> 'area' => 'header',
</span><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_data->get_template_parts()
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame(
+ 'Wariant motywu blokowego',
+ $style_variations[0]['title']
+ );
</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></pre>
</div>
</div>
</body>
</html>