Changeset 55231 for trunk/tests/phpunit/tests/theme/wpThemeJsonResolver.php

Timestamp:

02/06/2023 03:31:50 PM (4 years ago)

Author:

jorgefilipecosta

Message:

Block editor: Update WP_Theme_JSON_Resolver and improve its performance.

This commit includes the latest updates WP_Theme_JSON_Resolver class made in the block editor. Some of these updates improve the performance of the class.

Props Mamaduka, hellofromTonya, flixos90, jorgefilipecosta, oandregal, spacedmonkey, audrasjb, costdev, scruffian.
Closes #57545.

File:

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

trunk/tests/phpunit/tests/theme/wpThemeJsonResolver.php

@@ -236 +236 @@
                 $this->assertSame(
                         'Wariant motywu blokowego',
-                        $style_variations[0]['title']
+                        $style_variations[1]['title']
                 );
         }
@@ -776 +776 @@
                 $this->assertNull( $property->getValue(), 'Theme i18n schema should not have been loaded without theme support.' );
         }
+
+        /**
+         * Tests that get_merged_data returns the data merged up to the proper origin.
+         *
+         * @ticket 57545
+         *
+         * @covers WP_Theme_JSON_Resolver::get_merged_data
+         *
+         * @dataProvider data_get_merged_data_returns_origin
+         *
+         * @param string $origin             What origin to get data from.
+         * @param bool   $core_palette       Whether the core palette is present.
+         * @param string $core_palette_text  Message.
+         * @param string $block_styles       Whether the block styles are present.
+         * @param string $block_styles_text  Message.
+         * @param bool   $theme_palette      Whether the theme palette is present.
+         * @param string $theme_palette_text Message.
+         * @param bool   $user_palette        Whether the user palette is present.
+         * @param string $user_palette_text   Message.
+         */
+        public function test_get_merged_data_returns_origin( $origin, $core_palette, $core_palette_text, $block_styles, $block_styles_text, $theme_palette, $theme_palette_text, $user_palette, $user_palette_text ) {
+                // Make sure there is data from the blocks origin.
+                register_block_type(
+                        'my/block-with-styles',
+                        array(
+                                'api_version' => 2,
+                                'attributes'  => array(
+                                        'borderColor' => array(
+                                                'type' => 'string',
+                                        ),
+                                        'style'       => array(
+                                                'type' => 'object',
+                                        ),
+                                ),
+                                'supports'    => array(
+                                        '__experimentalStyle' => array(
+                                                'typography' => array(
+                                                        'fontSize' => '42rem',
+                                                ),
+                                        ),
+                                ),
+                        )
+                );
+
+                // Make sure there is data from the theme origin.
+                switch_theme( 'block-theme' );
+
+                // Make sure there is data from the user origin.
+                wp_set_current_user( self::$administrator_id );
+                $user_cpt = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( wp_get_theme(), true );
+                $config   = json_decode( $user_cpt['post_content'], true );
+                $config['settings']['color']['palette']['custom'] = array(
+                        array(
+                                'color' => 'hotpink',
+                                'name'  => 'My color',
+                                'slug'  => 'my-color',
+                        ),
+                );
+                $user_cpt['post_content']                         = wp_json_encode( $config );
+                wp_update_post( $user_cpt, true, false );
+
+                $theme_json = WP_Theme_JSON_Resolver::get_merged_data( $origin );
+                $settings   = $theme_json->get_settings();
+                $styles     = $theme_json->get_styles_block_nodes();
+                $styles     = array_filter(
+                        $styles,
+                        static function( $element ) {
+                                return isset( $element['name'] ) && 'my/block-with-styles' === $element['name'];
+                        }
+                );
+                unregister_block_type( 'my/block-with-styles' );
+
+                $this->assertSame( $core_palette, isset( $settings['color']['palette']['default'] ), $core_palette_text );
+                $this->assertSame( $block_styles, count( $styles ) === 1, $block_styles_text );
+                $this->assertSame( $theme_palette, isset( $settings['color']['palette']['theme'] ), $theme_palette_text );
+                $this->assertSame( $user_palette, isset( $settings['color']['palette']['custom'] ), $user_palette_text );
+
+        }
+
+        /**
+         * Data provider.
+         *
+         * @return array[]
+         */
+        public function data_get_merged_data_returns_origin() {
+                return array(
+                        'origin_default' => array(
+                                'origin'             => 'default',
+                                'core_palette'       => true,
+                                'core_palette_text'  => 'Core palette must be present',
+                                'block_styles'       => false,
+                                'block_styles_text'  => 'Block styles should not be present',
+                                'theme_palette'      => false,
+                                'theme_palette_text' => 'Theme palette should not be present',
+                                'user_palette'       => false,
+                                'user_palette_text'  => 'User palette should not be present',
+                        ),
+                        'origin_blocks'  => array(
+                                'origin'             => 'blocks',
+                                'core_palette'       => true,
+                                'core_palette_text'  => 'Core palette must be present',
+                                'block_styles'       => true,
+                                'block_styles_text'  => 'Block styles must be present',
+                                'theme_palette'      => false,
+                                'theme_palette_text' => 'Theme palette should not be present',
+                                'user_palette'       => false,
+                                'user_palette_text'  => 'User palette should not be present',
+                        ),
+                        'origin_theme'   => array(
+                                'origin'             => 'theme',
+                                'core_palette'       => true,
+                                'core_palette_text'  => 'Core palette must be present',
+                                'block_styles'       => true,
+                                'block_styles_text'  => 'Block styles must be present',
+                                'theme_palette'      => true,
+                                'theme_palette_text' => 'Theme palette must be present',
+                                'user_palette'       => false,
+                                'user_palette_text'  => 'User palette should not be present',
+                        ),
+                        'origin_custom'  => array(
+                                'origin'             => 'custom',
+                                'core_palette'       => true,
+                                'core_palette_text'  => 'Core palette must be present',
+                                'block_styles'       => true,
+                                'block_styles_text'  => 'Block styles must be present',
+                                'theme_palette'      => true,
+                                'theme_palette_text' => 'Theme palette must be present',
+                                'user_palette'       => true,
+                                'user_palette_text'  => 'User palette must be present',
+                        ),
+                );
+        }
+
+        /**
+         * Tests that get_style_variations returns all variations, including parent theme variations if the theme is a child,
+         * and that the child variation overwrites the parent variation of the same name.
+         *
+         * @ticket 57545
+         *
+         * @covers WP_Theme_JSON_Resolver::get_style_variations
+         **/
+        public function test_get_style_variations_returns_all_variations() {
+                // Switch to a child theme.
+                switch_theme( 'block-theme-child' );
+                wp_set_current_user( self::$administrator_id );
+
+                $actual_settings   = WP_Theme_JSON_Resolver::get_style_variations();
+                $expected_settings = array(
+                        array(
+                                'version'  => 2,
+                                'title'    => 'variation-b',
+                                'settings' => array(
+                                        'blocks' => array(
+                                                'core/post-title' => array(
+                                                        'color' => array(
+                                                                'palette' => array(
+                                                                        'theme' => array(
+                                                                                array(
+                                                                                        'slug'  => 'dark',
+                                                                                        'name'  => 'Dark',
+                                                                                        'color' => '#010101',
+                                                                                ),
+                                                                        ),
+                                                                ),
+                                                        ),
+                                                ),
+                                        ),
+                                ),
+                        ),
+                        array(
+                                'version'  => 2,
+                                'title'    => 'Block theme variation',
+                                'settings' => array(
+                                        'color' => array(
+                                                'palette' => array(
+                                                        'theme' => array(
+                                                                array(
+                                                                        'slug'  => 'foreground',
+                                                                        'name'  => 'Foreground',
+                                                                        'color' => '#3F67C6',
+                                                                ),
+                                                        ),
+                                                ),
+                                        ),
+                                ),
+                                'styles'   => array(
+                                        'blocks' => array(
+                                                'core/post-title' => array(
+                                                        'typography' => array(
+                                                                'fontWeight' => '700',
+                                                        ),
+                                                ),
+                                        ),
+                                ),
+                        ),
+                );
+
+                wp_recursive_ksort( $actual_settings );
+                wp_recursive_ksort( $expected_settings );
+
+                $this->assertSame(
+                        $expected_settings,
+                        $actual_settings
+                );
+        }
 }