Changeset 58466 for trunk/tests/phpunit/tests/block-supports/block-style-variations.php

Timestamp:

06/24/2024 08:49:52 AM (17 months ago)

Author:

oandregal

Message:

Section styles: improve performance and conceptual consistency.

These changes involve:

• Move shared variation definitions from styles.blocks.variations to styles.variations
• Remove blockTypes from styles.variations.
• Do not register shared variations from theme style variation or primary theme.json files.
• Move the merging of theme.json data into the WP_Theme_JSON_Resolver and WP_Theme_JSON classes.

These changes improve performance and are more future-proof API wise.
See conversation at ​https://github.com/WordPress/gutenberg/issues/62686

Props aaronrobertshaw, oandregal, andrewserong, joemcgill, talldanwp, andrewserong, ramonopoly, richtabor, youknowriad.

See #61312, #61451.

File:

• trunk/tests/phpunit/tests/block-supports/block-style-variations.php (modified) (4 diffs)

trunk/tests/phpunit/tests/block-supports/block-style-variations.php

@@ -63 +63 @@
      * @ticket 61312
      * @ticket 61440
+     * @ticket 61451
      */
     public function test_add_registered_block_styles_to_theme_data() {
         switch_theme( 'block-theme' );
-
-        // Register theme-defined variations.
-        WP_Theme_JSON_Resolver::get_theme_data();
-        // Register user-defined variations.
-        WP_Theme_JSON_Resolver::get_user_data();
 
         $variation_styles_data = array(
@@ -126 +122 @@
         $expected     = array(
             'variations' => array(
-                // @ticket 61440
-                'WithSlug'                => array(
-                    'color' => array(
-                        'background' => 'aliceblue',
-                        'text'       => 'midnightblue',
-                    ),
-                ),
-                'my-variation'            => $variation_styles_data,
 
                 /*
@@ -152 +140 @@
                     ),
                 ),
+
+                /*
+                 * Manually registered variations.
+                 * @ticket 61440
+                 */
+                'WithSlug'                => array(
+                    'color' => array(
+                        'background' => 'aliceblue',
+                        'text'       => 'midnightblue',
+                    ),
+                ),
+                'my-variation'            => $variation_styles_data,
             ),
         );
@@ -158 +158 @@
         unregister_block_style( 'core/group', 'WithSlug' );
 
-        $this->assertSameSetsWithIndex( $expected, $group_styles );
+        $this->assertSameSetsWithIndex( $expected, $group_styles, 'Variation data does not match' );
     }
 }