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

Timestamp:

05/31/2024 05:47:23 AM (6 months ago)

Author:

noisysocks

Message:

Block Themes: Add section styling via extended block style variations

Provide users with the ability to style entire sections of a page without
having to tediously reapply the same sets of styles.

This is done by extending block style variations to apply to nested blocks.

See ​https://github.com/WordPress/gutenberg/pull/57908.

Fixes #61312.
Props aaronrobertshaw, talldanwp, ramonopoly, isabel_brison, andrewserong.

File:

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

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

@@ -1024 +1024 @@
 
     /**
-     * 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.
+     * Tests that `get_style_variations` returns all the appropriate variations,
+     * including parent variations if the theme is a child, and that the child
+     * variation overwrites the parent variation of the same name.
+     *
+     * Note: This covers both theme and block style variations.
      *
      * @ticket 57545
+     * @ticket 61312
      *
      * @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' );
+     *
+     * @dataProvider data_get_style_variations
+     *
+     * @param string $theme               Name of the theme to use.
+     * @param string $scope               Scope to filter variations by e.g. theme vs block.
+     * @param array  $expected_variations Collection of expected variations.
+     */
+    public function test_get_style_variations( $theme, $scope, $expected_variations ) {
+        switch_theme( $theme );
         wp_set_current_user( self::$administrator_id );
 
-        $actual_settings   = WP_Theme_JSON_Resolver::get_style_variations();
-        $expected_settings = array(
-            array(
-                'version'  => WP_Theme_JSON::LATEST_SCHEMA,
-                'title'    => 'variation-a',
-                'settings' => array(
-                    'blocks' => array(
-                        'core/paragraph' => array(
+        $actual_variations = WP_Theme_JSON_Resolver::get_style_variations( $scope );
+
+        wp_recursive_ksort( $actual_variations );
+        wp_recursive_ksort( $expected_variations );
+
+        $this->assertSame( $expected_variations, $actual_variations );
+    }
+
+    /**
+     * Data provider for test_get_style_variations
+     *
+     * @return array
+     */
+    public function data_get_style_variations() {
+        return array(
+            // @ticket 57545
+            'theme_style_variations' => array(
+                'theme'               => 'block-theme-child',
+                'scope'               => 'theme',
+                'expected_variations' => array(
+                    array(
+                        'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+                        'title'    => 'variation-a',
+                        'settings' => array(
+                            'blocks' => array(
+                                'core/paragraph' => array(
+                                    'color' => array(
+                                        'palette' => array(
+                                            'theme' => array(
+                                                array(
+                                                    'slug' => 'dark',
+                                                    'name' => 'Dark',
+                                                    'color' => '#010101',
+                                                ),
+                                            ),
+                                        ),
+                                    ),
+                                ),
+                            ),
+                        ),
+                    ),
+                    array(
+                        'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+                        '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'  => WP_Theme_JSON::LATEST_SCHEMA,
+                        'title'    => 'Block theme variation',
+                        'settings' => array(
                             'color' => array(
                                 'palette' => array(
                                     'theme' => array(
                                         array(
-                                            'slug'  => 'dark',
-                                            'name'  => 'Dark',
-                                            'color' => '#010101',
+                                            'slug'  => 'foreground',
+                                            'name'  => 'Foreground',
+                                            'color' => '#3F67C6',
                                         ),
                                     ),
@@ -1056 +1123 @@
                             ),
                         ),
-                    ),
-                ),
-            ),
-            array(
-                'version'  => WP_Theme_JSON::LATEST_SCHEMA,
-                'title'    => 'variation-b',
-                'settings' => array(
-                    'blocks' => array(
-                        'core/post-title' => array(
-                            'color' => array(
-                                'palette' => array(
-                                    'theme' => array(
-                                        array(
-                                            'slug'  => 'dark',
-                                            'name'  => 'Dark',
-                                            'color' => '#010101',
-                                        ),
+                        'styles'   => array(
+                            'blocks' => array(
+                                'core/post-title' => array(
+                                    'typography' => array(
+                                        'fontWeight' => '700',
                                     ),
                                 ),
@@ -1080 +1135 @@
                 ),
             ),
-            array(
-                'version'  => WP_Theme_JSON::LATEST_SCHEMA,
-                '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
+            'block_style_variations' => array(
+                'theme'               => 'block-theme-child-with-block-style-variations',
+                'scope'               => 'block',
+                'expected_variations' => array(
+                    array(
+                        'blockTypes' => array( 'core/group', 'core/columns', 'core/media-text' ),
+                        'version'    => 3,
+                        'title'      => 'block-style-variation-a',
+                        'styles'     => array(
+                            'color' => array(
+                                'background' => 'darkcyan',
+                                'text'       => 'aliceblue',
+                            ),
+                        ),
+                    ),
+                    array(
+                        'blockTypes' => array( 'core/group', 'core/columns' ),
+                        'version'    => 3,
+                        'title'      => 'block-style-variation-b',
+                        'styles'     => array(
+                            'color' => array(
+                                'background' => 'midnightblue',
+                                'text'       => 'lightblue',
+                            ),
+                        ),
+                    ),
+                ),
+            ),
         );
     }