<!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>[53153] trunk/tests/phpunit/tests/block-supports: Tests: Improve test cleanup for block supports</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/53153">53153</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/53153","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-04-12 09:38:18 +0000 (Tue, 12 Apr 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: Improve test cleanup for block supports
Let's unregister the block in the tear_down method. The block will be unregistered even if the test fails.
Props ramonopoly, antonvlasenko.
See <a href="https://core.trac.wordpress.org/ticket/55505">#55505</a>.
Follow-up <a href="https://core.trac.wordpress.org/changeset/53085">[53085]</a>, <a href="https://core.trac.wordpress.org/changeset/53076">[53076]</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsblocksupportsborderphp">trunk/tests/phpunit/tests/block-supports/border.php</a></li>
<li><a href="#trunktestsphpunittestsblocksupportscolorsphp">trunk/tests/phpunit/tests/block-supports/colors.php</a></li>
<li><a href="#trunktestsphpunittestsblocksupportsspacingphp">trunk/tests/phpunit/tests/block-supports/spacing.php</a></li>
<li><a href="#trunktestsphpunittestsblocksupportstypographyphp">trunk/tests/phpunit/tests/block-supports/typography.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsblocksupportsborderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/block-supports/border.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/block-supports/border.php 2022-04-12 09:24:51 UTC (rev 53152)
+++ trunk/tests/phpunit/tests/block-supports/border.php 2022-04-12 09:38:18 UTC (rev 53153)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,14 +4,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Test_Block_Supports_Border extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @var string|null
+ */
+ private $test_block_name;
+
+ function set_up() {
+ parent::set_up();
+ $this->test_block_name = null;
+ }
+
+ function tear_down() {
+ unregister_block_type( $this->test_block_name );
+ $this->test_block_name = null;
+ parent::set_up();
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket 55505
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_apply_border_support
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_border_color_slug_with_numbers_is_kebab_cased_properly() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_name = 'test/border-color-slug-with-numbers-is-kebab-cased-properly';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name = 'test/border-color-slug-with-numbers-is-kebab-cased-properly';
</ins><span class="cx" style="display: block; padding: 0 10px"> register_block_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_name,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'api_version' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'attributes' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +49,7 @@
</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"> $registry = WP_Block_Type_Registry::get_instance();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_type = $registry->get_registered( $block_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $block_type = $registry->get_registered( $this->test_block_name );
</ins><span class="cx" style="display: block; padding: 0 10px"> $block_atts = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'borderColor' => 'red',
</span><span class="cx" style="display: block; padding: 0 10px"> 'style' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +68,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"> $this->assertSame( $expected, $actual );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unregister_block_type( $block_name );
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,9 +76,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_apply_border_support
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_border_with_skipped_serialization_block_supports() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_name = 'test/border-with-skipped-serialization-block-supports';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name = 'test/border-with-skipped-serialization-block-supports';
</ins><span class="cx" style="display: block; padding: 0 10px"> register_block_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_name,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'api_version' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'attributes' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,7 +98,7 @@
</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"> $registry = WP_Block_Type_Registry::get_instance();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_type = $registry->get_registered( $block_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $block_type = $registry->get_registered( $this->test_block_name );
</ins><span class="cx" style="display: block; padding: 0 10px"> $block_atts = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'style' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'border' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,7 +114,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unregister_block_type( $block_name );
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,9 +122,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_apply_border_support
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_radius_with_individual_skipped_serialization_block_supports() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_name = 'test/radius-with-individual-skipped-serialization-block-supports';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name = 'test/radius-with-individual-skipped-serialization-block-supports';
</ins><span class="cx" style="display: block; padding: 0 10px"> register_block_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_name,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'api_version' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'attributes' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,7 +144,7 @@
</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"> $registry = WP_Block_Type_Registry::get_instance();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_type = $registry->get_registered( $block_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $block_type = $registry->get_registered( $this->test_block_name );
</ins><span class="cx" style="display: block; padding: 0 10px"> $block_atts = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'style' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'border' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,6 +162,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unregister_block_type( $block_name );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsblocksupportscolorsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/block-supports/colors.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/block-supports/colors.php 2022-04-12 09:24:51 UTC (rev 53152)
+++ trunk/tests/phpunit/tests/block-supports/colors.php 2022-04-12 09:38:18 UTC (rev 53153)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,13 +4,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Block_Supports_Colors extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @var string|null
+ */
+ private $test_block_name;
+
+ function set_up() {
+ parent::set_up();
+ $this->test_block_name = null;
+ }
+
+ function tear_down() {
+ unregister_block_type( $this->test_block_name );
+ $this->test_block_name = null;
+ parent::set_up();
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket 54337
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_apply_colors_support
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_color_slugs_with_numbers_are_kebab_cased_properly() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name = 'test/color-slug-with-numbers';
</ins><span class="cx" style="display: block; padding: 0 10px"> register_block_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test/color-slug-with-numbers',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'api_version' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'attributes' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +51,7 @@
</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"> $registry = WP_Block_Type_Registry::get_instance();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_type = $registry->get_registered( 'test/color-slug-with-numbers' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $block_type = $registry->get_registered( $this->test_block_name );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $block_atts = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'textColor' => 'fg1',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +63,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array( 'class' => 'has-text-color has-fg-1-color has-background has-bg-2-background-color has-background has-gr-3-gradient-background' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unregister_block_type( 'test/color-slug-with-numbers' );
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,9 +71,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_apply_colors_support
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_color_with_skipped_serialization_block_supports() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_name = 'test/color-with-skipped-serialization-block-supports';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name = 'test/color-with-skipped-serialization-block-supports';
</ins><span class="cx" style="display: block; padding: 0 10px"> register_block_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_name,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'api_version' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'attributes' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +92,7 @@
</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"> $registry = WP_Block_Type_Registry::get_instance();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_type = $registry->get_registered( $block_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $block_type = $registry->get_registered( $this->test_block_name );
</ins><span class="cx" style="display: block; padding: 0 10px"> $block_atts = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'style' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'color' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,7 +106,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unregister_block_type( $block_name );
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,9 +114,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_apply_colors_support
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_gradient_with_individual_skipped_serialization_block_supports() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_name = 'test/gradient-with-individual-skipped-serialization-block-support';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name = 'test/gradient-with-individual-skipped-serialization-block-support';
</ins><span class="cx" style="display: block; padding: 0 10px"> register_block_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_name,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'api_version' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'attributes' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,7 +135,7 @@
</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"> $registry = WP_Block_Type_Registry::get_instance();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_type = $registry->get_registered( $block_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $block_type = $registry->get_registered( $this->test_block_name );
</ins><span class="cx" style="display: block; padding: 0 10px"> $block_atts = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'style' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'color' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,6 +151,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unregister_block_type( $block_name );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsblocksupportsspacingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/block-supports/spacing.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/block-supports/spacing.php 2022-04-12 09:24:51 UTC (rev 53152)
+++ trunk/tests/phpunit/tests/block-supports/spacing.php 2022-04-12 09:38:18 UTC (rev 53153)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,14 +4,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Test_Block_Supports_Spacing extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @var string|null
+ */
+ private $test_block_name;
+
+ function set_up() {
+ parent::set_up();
+ $this->test_block_name = null;
+ }
+
+ function tear_down() {
+ unregister_block_type( $this->test_block_name );
+ $this->test_block_name = null;
+ parent::set_up();
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket 55505
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_apply_spacing_support
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_spacing_style_is_applied() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_name = 'test/spacing-style-is-applied';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name = 'test/spacing-style-is-applied';
</ins><span class="cx" style="display: block; padding: 0 10px"> register_block_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_name,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'api_version' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'attributes' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +45,7 @@
</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"> $registry = WP_Block_Type_Registry::get_instance();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_type = $registry->get_registered( $block_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $block_type = $registry->get_registered( $this->test_block_name );
</ins><span class="cx" style="display: block; padding: 0 10px"> $block_atts = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'style' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'spacing' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +67,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"> $this->assertSame( $expected, $actual );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unregister_block_type( $block_name );
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,9 +75,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_apply_spacing_support
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_spacing_with_skipped_serialization_block_supports() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_name = 'test/spacing-with-skipped-serialization-block-supports';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name = 'test/spacing-with-skipped-serialization-block-supports';
</ins><span class="cx" style="display: block; padding: 0 10px"> register_block_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_name,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'api_version' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'attributes' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,7 +96,7 @@
</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"> $registry = WP_Block_Type_Registry::get_instance();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_type = $registry->get_registered( $block_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $block_type = $registry->get_registered( $this->test_block_name );
</ins><span class="cx" style="display: block; padding: 0 10px"> $block_atts = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'style' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'spacing' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +116,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unregister_block_type( $block_name );
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,9 +124,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_apply_spacing_support
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_margin_with_individual_skipped_serialization_block_supports() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_name = 'test/margin-with-individual-skipped-serialization-block-supports';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name = 'test/margin-with-individual-skipped-serialization-block-supports';
</ins><span class="cx" style="display: block; padding: 0 10px"> register_block_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_name,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'api_version' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'attributes' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,7 +145,7 @@
</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"> $registry = WP_Block_Type_Registry::get_instance();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_type = $registry->get_registered( $block_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $block_type = $registry->get_registered( $this->test_block_name );
</ins><span class="cx" style="display: block; padding: 0 10px"> $block_atts = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'style' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'spacing' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,6 +167,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unregister_block_type( $block_name );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsblocksupportstypographyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/block-supports/typography.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/block-supports/typography.php 2022-04-12 09:24:51 UTC (rev 53152)
+++ trunk/tests/phpunit/tests/block-supports/typography.php 2022-04-12 09:38:18 UTC (rev 53153)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,13 +4,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Block_Supports_Typography extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @var string|null
+ */
+ private $test_block_name;
+
+ function set_up() {
+ parent::set_up();
+ $this->test_block_name = null;
+ }
+
+ function tear_down() {
+ unregister_block_type( $this->test_block_name );
+ $this->test_block_name = null;
+ parent::set_up();
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket 54337
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_apply_typography_support
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_font_size_slug_with_numbers_is_kebab_cased_properly() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name = 'test/font-size-slug-with-numbers';
</ins><span class="cx" style="display: block; padding: 0 10px"> register_block_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'test/font-size-slug-with-numbers',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'api_version' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'attributes' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,7 +43,7 @@
</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"> $registry = WP_Block_Type_Registry::get_instance();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_type = $registry->get_registered( 'test/font-size-slug-with-numbers' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $block_type = $registry->get_registered( $this->test_block_name );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $block_atts = array( 'fontSize' => 'h1' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +51,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array( 'class' => 'has-h-1-font-size' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unregister_block_type( 'test/font-size-slug-with-numbers' );
</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"> * @ticket 54337
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,9 +58,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_apply_typography_support
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_font_family_with_legacy_inline_styles_using_a_value() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_name = 'test/font-family-with-inline-styles-using-value';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name = 'test/font-family-with-inline-styles-using-value';
</ins><span class="cx" style="display: block; padding: 0 10px"> register_block_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_name,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'api_version' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'attributes' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,7 +76,7 @@
</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"> $registry = WP_Block_Type_Registry::get_instance();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_type = $registry->get_registered( $block_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $block_type = $registry->get_registered( $this->test_block_name );
</ins><span class="cx" style="display: block; padding: 0 10px"> $block_atts = array( 'style' => array( 'typography' => array( 'fontFamily' => 'serif' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_apply_typography_support( $block_type, $block_atts );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +83,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array( 'style' => 'font-family: serif;' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unregister_block_type( $block_name );
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,9 +91,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_apply_typography_support
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_typography_with_skipped_serialization_block_supports() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_name = 'test/typography-with-skipped-serialization-block-supports';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name = 'test/typography-with-skipped-serialization-block-supports';
</ins><span class="cx" style="display: block; padding: 0 10px"> register_block_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_name,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'api_version' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'attributes' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,7 +113,7 @@
</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"> $registry = WP_Block_Type_Registry::get_instance();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_type = $registry->get_registered( $block_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $block_type = $registry->get_registered( $this->test_block_name );
</ins><span class="cx" style="display: block; padding: 0 10px"> $block_atts = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'style' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'typography' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,7 +129,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unregister_block_type( $block_name );
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,9 +137,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_apply_typography_support
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_letter_spacing_with_individual_skipped_serialization_block_supports() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_name = 'test/letter-spacing-with-individua-skipped-serialization-block-supports';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name = 'test/letter-spacing-with-individua-skipped-serialization-block-supports';
</ins><span class="cx" style="display: block; padding: 0 10px"> register_block_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_name,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'api_version' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'attributes' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,7 +158,7 @@
</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"> $registry = WP_Block_Type_Registry::get_instance();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_type = $registry->get_registered( $block_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $block_type = $registry->get_registered( $this->test_block_name );
</ins><span class="cx" style="display: block; padding: 0 10px"> $block_atts = array( 'style' => array( 'typography' => array( 'letterSpacing' => '22px' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_apply_typography_support( $block_type, $block_atts );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,7 +165,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unregister_block_type( $block_name );
</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"> * @ticket 54337
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,9 +172,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_apply_typography_support
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_font_family_with_legacy_inline_styles_using_a_css_var() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_name = 'test/font-family-with-inline-styles-using-css-var';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name = 'test/font-family-with-inline-styles-using-css-var';
</ins><span class="cx" style="display: block; padding: 0 10px"> register_block_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_name,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'api_version' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'attributes' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,7 +190,7 @@
</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"> $registry = WP_Block_Type_Registry::get_instance();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_type = $registry->get_registered( $block_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $block_type = $registry->get_registered( $this->test_block_name );
</ins><span class="cx" style="display: block; padding: 0 10px"> $block_atts = array( 'style' => array( 'typography' => array( 'fontFamily' => 'var:preset|font-family|h1' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_apply_typography_support( $block_type, $block_atts );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,7 +197,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array( 'style' => 'font-family: var(--wp--preset--font-family--h-1);' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unregister_block_type( $block_name );
</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"> * @ticket 54337
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,9 +204,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_apply_typography_support
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_font_family_with_class() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_name = 'test/font-family-with-class';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name = 'test/font-family-with-class';
</ins><span class="cx" style="display: block; padding: 0 10px"> register_block_type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_name,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->test_block_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'api_version' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'attributes' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,7 +222,7 @@
</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"> $registry = WP_Block_Type_Registry::get_instance();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $block_type = $registry->get_registered( $block_name );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $block_type = $registry->get_registered( $this->test_block_name );
</ins><span class="cx" style="display: block; padding: 0 10px"> $block_atts = array( 'fontFamily' => 'h1' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_apply_typography_support( $block_type, $block_atts );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,7 +229,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array( 'class' => 'has-h-1-font-family' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unregister_block_type( $block_name );
</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"> }
</span></span></pre>
</div>
</div>
</body>
</html>