Changeset 52434 for trunk/tests/phpunit/tests/theme/wpThemeJson.php

Timestamp:

01/04/2022 05:37:25 AM (5 years ago)

Author:

noisysocks

Message:

Update @wordpress packages

Update packages to include these bug fixes from Gutenberg:

• Site Logo: Add option to set site icon from Site Logo block
• Navigation: Enable even more compact setup state.
• Remove template parts from post content inserter an unstable filter
• Template Editor Mode: Hide editor mode switcher
• Avoid using CSS variables for block gap styles
• Try to fix auto resizing in template part focus mode
• Lower the specificity of font size CSS Custom Properties in the editor
• Site icon: Fix site icon styling to display non-square site icons within a square button
• [Site Editor]: Register block editor shortcuts
• Update regex to handle 404 template slug
• Site Editor: Remove dead code
• [Block Editor]: Restrict delete multi selected blocks shortcut
• Fix: Gradients are not being applied by class
• Update: Make the global styles subtitles font smaller
• Post Content/Title: Reflect changes when previewing post
• ServerSideRender: Fix loading state
• [Block Library]: Fix editable post blocks in Query Loop with zero queryId
• Post Excerpt: Fix previews
• WP59: Contextualize "Export" string to differentiate it from other occurrences in WP Core
• Tools Panel: Fix race conditions caused by conditionally displayed ToolsPanelItems
• ToolsPanel: Allow items to register when panelId is null
• Font Size Picker: Allow non-integers as simple CSS values and in hints
• [Components - FontSizePicker]: Use incremental sequence of numbers as labels for the available font-sizes at the segmented control (conditionally)

See #54487.

File:

• trunk/tests/phpunit/tests/theme/wpThemeJson.php (modified) (2 diffs)

trunk/tests/phpunit/tests/theme/wpThemeJson.php

@@ -420 +420 @@
                                                 'blockGap' => '1em',
                                         ),
-                                        'blocks'  => array(
-                                                'core/columns' => array(
-                                                        'spacing' => array(
-                                                                'blockGap' => '24px',
-                                                        ),
-                                                ),
-                                        ),
-                                ),
-                        )
-                );
-
-                $expected = 'body { margin: 0; }body{--wp--style--block-gap: 1em;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }.wp-site-blocks > * { margin-top: 0; margin-bottom: 0; }.wp-site-blocks > * + * { margin-top: var( --wp--style--block-gap ); }.wp-block-columns{--wp--style--block-gap: 24px;}';
+                                ),
+                        )
+                );
+
+                $expected = 'body { margin: 0; }body{--wp--style--block-gap: 1em;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }.wp-site-blocks > * { margin-top: 0; margin-bottom: 0; }.wp-site-blocks > * + * { margin-top: var( --wp--style--block-gap ); }';
                 $this->assertSame( $expected, $theme_json->get_stylesheet() );
                 $this->assertSame( $expected, $theme_json->get_stylesheet( array( 'styles' ) ) );
@@ -2349 +2342 @@
         }
 
+        /**
+         * @ticket 54487
+         */
+        public function test_sanitization() {
+                $theme_json = new WP_Theme_JSON(
+                        array(
+                                'version' => 2,
+                                'styles'  => array(
+                                        'spacing' => array(
+                                                'blockGap' => 'valid value',
+                                        ),
+                                        'blocks'  => array(
+                                                'core/group' => array(
+                                                        'spacing' => array(
+                                                                'margin'   => 'valid value',
+                                                                'blockGap' => 'invalid value',
+                                                        ),
+                                                ),
+                                        ),
+                                ),
+                        )
+                );
+
+                $actual   = $theme_json->get_raw_data();
+                $expected = array(
+                        'version' => 2,
+                        'styles'  => array(
+                                'spacing' => array(
+                                        'blockGap' => 'valid value',
+                                ),
+                                'blocks'  => array(
+                                        'core/group' => array(
+                                                'spacing' => array(
+                                                        'margin' => 'valid value',
+                                                ),
+                                        ),
+                                ),
+                        ),
+                );
+
+                $this->assertEqualSetsWithIndex( $expected, $actual );
+        }
+
 }