Changeset 51054

Timestamp:

06/01/2021 11:30:05 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Tests: Remove the ::append_to_selector() method from Tests_Theme_wpThemeJson.

The method exists in the WP_Theme_JSON class and appears to be erroneously duplicated in the test class.

Add a unit test that was meant to be included instead, as per ​https://github.com/WordPress/gutenberg/pull/32190.

Follow-up to [51051].

See #52991.

File:

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

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

@@ -168 +168 @@
                         'body{--wp--preset--color--grey: grey;}.wp-block-group{--wp--custom--base-font: 16;--wp--custom--line-height--small: 1.2;--wp--custom--line-height--medium: 1.4;--wp--custom--line-height--large: 1.8;}',
                         $theme_json->get_stylesheet( 'css_variables' )
+                );
+        }
+
+        function test_get_stylesheet_preset_classes_work_with_compounded_selectors() {
+                $theme_json = new WP_Theme_JSON(
+                        array(
+                                'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+                                'settings' => array(
+                                        'blocks' => array(
+                                                'core/heading' => array(
+                                                        'color' => array(
+                                                                'palette' => array(
+                                                                        array(
+                                                                                'slug'  => 'white',
+                                                                                'color' => '#fff',
+                                                                        ),
+                                                                ),
+                                                        ),
+                                                ),
+                                        ),
+                                ),
+                        )
+                );
+
+                $this->assertEquals(
+                        'h1.has-white-color,h2.has-white-color,h3.has-white-color,h4.has-white-color,h5.has-white-color,h6.has-white-color{color: #fff !important;}h1.has-white-background-color,h2.has-white-background-color,h3.has-white-background-color,h4.has-white-background-color,h5.has-white-background-color,h6.has-white-background-color{background-color: #fff !important;}',
+                        $theme_json->get_stylesheet( 'block_styles' )
                 );
         }
@@ -621 +648 @@
 
         /**
-         * Function that appends a sub-selector to a existing one.
-         *
-         * Given the compounded $selector "h1, h2, h3"
-         * and the $to_append selector ".some-class" the result will be
-         * "h1.some-class, h2.some-class, h3.some-class".
-         *
-         * @param string $selector Original selector.
-         * @param string $to_append Selector to append.
-         *
-         * @return string
-         */
-        private static function append_to_selector( $selector, $to_append ) {
-                $new_selectors = array();
-                $selectors     = explode( ',', $selector );
-                foreach ( $selectors as $sel ) {
-                        $new_selectors[] = $sel . $to_append;
-                }
-
-                return implode( ',', $new_selectors );
-        }
-
-        /**
          * @ticket 52991
          */