Changeset 52401 for trunk/tests/phpunit/tests/theme/wpThemeJson.php

Timestamp:

12/21/2021 06:00:34 AM (3 years ago)

Author:

hellofromTonya

Message:

Editor: Add support for nameless font sizes in WP_Theme_JSON.

With nameless font sizes support, themes use the defaults by not declaring the "name" setting for their fontSizes in theme.json.

Backport from Gutenberg ​https://github.com/WordPress/gutenberg/pull/37410.

Follow-up to [50973], [52049], [52275], [52320].

Props ntsekouras, costdev, hellofromTonya.
Fixes #54640. See #54487.

File:

• trunk/tests/phpunit/tests/theme/wpThemeJson.php (modified) (1 diff)

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

@@ -1482 +1482 @@
 
         $this->assertEqualSetsWithIndex( $expected, $actual );
+    }
+
+    /**
+     * @ticket 54640
+     */
+    public function test_merge_incoming_data_presets_use_default_names() {
+        $defaults   = new WP_Theme_JSON(
+            array(
+                'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+                'settings' => array(
+                    'typography' => array(
+                        'fontSizes' => array(
+                            array(
+                                'name' => 'Small',
+                                'slug' => 'small',
+                                'size' => '12px',
+                            ),
+                            array(
+                                'name' => 'Large',
+                                'slug' => 'large',
+                                'size' => '20px',
+                            ),
+                        ),
+                    ),
+                ),
+            ),
+            'default'
+        );
+        $theme_json = new WP_Theme_JSON(
+            array(
+                'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+                'settings' => array(
+                    'typography' => array(
+                        'fontSizes' => array(
+                            array(
+                                'slug' => 'small',
+                                'size' => '1.1rem',
+                            ),
+                            array(
+                                'slug' => 'large',
+                                'size' => '1.75rem',
+                            ),
+                            array(
+                                'name' => 'Huge',
+                                'slug' => 'huge',
+                                'size' => '3rem',
+                            ),
+                        ),
+                    ),
+                ),
+            ),
+            'theme'
+        );
+        $expected   = array(
+            'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+            'settings' => array(
+                'typography' => array(
+                    'fontSizes' => array(
+                        'default' => array(
+                            array(
+                                'name' => 'Small',
+                                'slug' => 'small',
+                                'size' => '12px',
+                            ),
+                            array(
+                                'name' => 'Large',
+                                'slug' => 'large',
+                                'size' => '20px',
+                            ),
+                        ),
+                        'theme'   => array(
+                            array(
+                                'slug' => 'small',
+                                'size' => '1.1rem',
+                                'name' => 'Small',
+                            ),
+                            array(
+                                'slug' => 'large',
+                                'size' => '1.75rem',
+                                'name' => 'Large',
+                            ),
+                            array(
+                                'name' => 'Huge',
+                                'slug' => 'huge',
+                                'size' => '3rem',
+                            ),
+                        ),
+                    ),
+                ),
+            ),
+        );
+        $defaults->merge( $theme_json );
+        $actual = $defaults->get_raw_data();
+        $this->assertSameSetsWithIndex( $expected, $actual );
     }