Changeset 58241 for trunk/tests/phpunit/tests/block-supports/wpGetLayoutStyle.php

Timestamp:

05/30/2024 01:14:15 AM (12 months ago)

Author:

isabel_brison

Message:

Editor: level global styles specificity at 0-1-0.

Adjusts the block level global styles selectors so they have a consistent specificity of 0-1-0, and adjusts base and layout global style selectors to their minimum required specificity.

Props aaronrobertshaw, isabel_brison, andrewserong, mukesh27.
Fixes #61165.

File:

• trunk/tests/phpunit/tests/block-supports/wpGetLayoutStyle.php (modified) (8 diffs)

trunk/tests/phpunit/tests/block-supports/wpGetLayoutStyle.php

@@ -19 +19 @@
      * @dataProvider data_wp_get_layout_style
      * @ticket       56467
+     * @ticket       61165
      *
      * @param array  $args            Dataset to test.
@@ -73 +74 @@
                     'gap_value'             => '1em',
                 ),
-                'expected_output' => '.wp-layout > *{margin-block-start:0;margin-block-end:0;}.wp-layout.wp-layout > * + *{margin-block-start:1em;margin-block-end:0;}',
+                'expected_output' => '.wp-layout > *{margin-block-start:0;margin-block-end:0;}.wp-layout > * + *{margin-block-start:1em;margin-block-end:0;}',
             ),
             'skip serialization should return empty value' => array(
@@ -90 +91 @@
                     'gap_value'             => array( 'top' => '1em' ),
                 ),
-                'expected_output' => '.wp-layout > *{margin-block-start:0;margin-block-end:0;}.wp-layout.wp-layout > * + *{margin-block-start:1em;margin-block-end:0;}',
+                'expected_output' => '.wp-layout > *{margin-block-start:0;margin-block-end:0;}.wp-layout > * + *{margin-block-start:1em;margin-block-end:0;}',
             ),
             'constrained layout with sizes'                => array(
@@ -129 +130 @@
                     'gap_value'             => '2.5rem',
                 ),
-                'expected_output' => '.wp-layout > *{margin-block-start:0;margin-block-end:0;}.wp-layout.wp-layout > * + *{margin-block-start:2.5rem;margin-block-end:0;}',
+                'expected_output' => '.wp-layout > *{margin-block-start:0;margin-block-end:0;}.wp-layout > * + *{margin-block-start:2.5rem;margin-block-end:0;}',
             ),
             'constrained layout with axial block gap support' => array(
@@ -140 +141 @@
                     'gap_value'             => array( 'top' => '2.5rem' ),
                 ),
-                'expected_output' => '.wp-layout > *{margin-block-start:0;margin-block-end:0;}.wp-layout.wp-layout > * + *{margin-block-start:2.5rem;margin-block-end:0;}',
+                'expected_output' => '.wp-layout > *{margin-block-start:0;margin-block-end:0;}.wp-layout > * + *{margin-block-start:2.5rem;margin-block-end:0;}',
             ),
             'constrained layout with block gap support and spacing preset' => array(
@@ -151 +152 @@
                     'gap_value'             => 'var:preset|spacing|50',
                 ),
-                'expected_output' => '.wp-layout > *{margin-block-start:0;margin-block-end:0;}.wp-layout.wp-layout > * + *{margin-block-start:var(--wp--preset--spacing--50);margin-block-end:0;}',
+                'expected_output' => '.wp-layout > *{margin-block-start:0;margin-block-end:0;}.wp-layout > * + *{margin-block-start:var(--wp--preset--spacing--50);margin-block-end:0;}',
             ),
             'flex layout with no args should return empty value' => array(
@@ -249 +250 @@
                 'expected_output' => '.wp-layout{flex-wrap:nowrap;flex-direction:column;align-items:flex-start;justify-content:flex-end;}',
             ),
+            'default grid layout'                          => array(
+                'args'            => array(
+                    'selector' => '.wp-layout',
+                    'layout'   => array(
+                        'type' => 'grid',
+                    ),
+                ),
+                'expected_output' => '.wp-layout{grid-template-columns:repeat(auto-fill, minmax(min(12rem, 100%), 1fr));container-type:inline-size;}',
+            ),
+            'grid layout with columnCount'                 => array(
+                'args'            => array(
+                    'selector' => '.wp-layout',
+                    'layout'   => array(
+                        'type'        => 'grid',
+                        'columnCount' => 3,
+                    ),
+                ),
+                'expected_output' => '.wp-layout{grid-template-columns:repeat(3, minmax(0, 1fr));}',
+            ),
             'default layout with blockGap to verify converting gap value into valid CSS' => array(
                 'args'            => array(
@@ -261 +281 @@
                     ),
                 ),
-                'expected_output' => '.wp-block-group.wp-container-6 > *{margin-block-start:0;margin-block-end:0;}.wp-block-group.wp-container-6.wp-block-group.wp-container-6 > * + *{margin-block-start:var(--wp--preset--spacing--70);margin-block-end:0;}',
+                'expected_output' => '.wp-block-group.wp-container-6 > *{margin-block-start:0;margin-block-end:0;}.wp-block-group.wp-container-6 > * + *{margin-block-start:var(--wp--preset--spacing--70);margin-block-end:0;}',
             ),
         );