Changeset 51374

Timestamp:

07/07/2021 06:59:21 PM (3 years ago)

Author:

desrosj

Message:

Themes: Remove mention of “FSE” in Core.

“FSE” themes are block themes.

Follow up to [51373].

Unprops desrosj.
Merges [51370-51371] to the 5.8 branch.
Fixes #53497.

Location:

branches/5.8

Files:

• . (modified) (1 prop)
• tests/phpunit/data/languages/themes/block-theme-pl_PL.mo (copied) (copied from trunk/tests/phpunit/data/languages/themes/block-theme-pl_PL.mo)
• tests/phpunit/data/languages/themes/block-theme-pl_PL.po (copied) (copied from trunk/tests/phpunit/data/languages/themes/block-theme-pl_PL.po)
• tests/phpunit/data/languages/themes/fse-pl_PL.mo (deleted)
• tests/phpunit/data/languages/themes/fse-pl_PL.po (deleted)
• tests/phpunit/data/themedir1/fse (deleted)
• tests/phpunit/tests/blocks/block-editor.php (modified) (1 diff)
• tests/phpunit/tests/theme/themeDir.php (modified) (1 diff)
• tests/phpunit/tests/theme/wpThemeJsonResolver.php (modified) (2 diffs)

branches/5.8/tests/phpunit/tests/blocks/block-editor.php

@@ -345 +345 @@
 
     /**
+     * @ticket 53458
+     */
+    function test_get_block_editor_settings_theme_json_settings() {
+        switch_theme( 'block-theme' );
+
+        $post_editor_context = new WP_Block_Editor_Context( array( 'post' => get_post() ) );
+
+        $settings = get_block_editor_settings( array(), $post_editor_context );
+
+        // Related entry in theme.json: settings.color.palette
+        $this->assertSameSetsWithIndex(
+            array(
+                array(
+                    'slug'  => 'light',
+                    'name'  => 'Light',
+                    'color' => '#f5f7f9',
+                ),
+                array(
+                    'slug'  => 'dark',
+                    'name'  => 'Dark',
+                    'color' => '#000',
+                ),
+            ),
+            $settings['colors']
+        );
+        // settings.color.gradients
+        $this->assertSameSetsWithIndex(
+            array(
+                array(
+                    'name'     => 'Custom gradient',
+                    'gradient' => 'linear-gradient(135deg,rgba(0,0,0) 0%,rgb(0,0,0) 100%)',
+                    'slug'     => 'custom-gradient',
+                ),
+            ),
+            $settings['gradients']
+        );
+        // settings.typography.fontSizes
+        $this->assertSameSetsWithIndex(
+            array(
+                array(
+                    'name' => 'Custom',
+                    'slug' => 'custom',
+                    'size' => '100px',
+                ),
+            ),
+            $settings['fontSizes']
+        );
+        // settings.color.custom
+        $this->assertTrue( $settings['disableCustomColors'] );
+        // settings.color.customGradient
+        $this->assertTrue( $settings['disableCustomGradients'] );
+        // settings.typography.customFontSize
+        $this->assertTrue( $settings['disableCustomFontSizes'] );
+        // settings.typography.customLineHeight
+        $this->assertTrue( $settings['enableCustomLineHeight'] );
+        // settings.spacing.enableCustomUnits
+        $this->assertSameSets( array( 'rem' ), $settings['enableCustomUnits'] );
+        // settings.spacing.customPadding
+        $this->assertTrue( $settings['enableCustomSpacing'] );
+
+        switch_theme( WP_DEFAULT_THEME );
+    }
+
+    /**
      * @ticket 52920
      * @expectedDeprecated block_editor_settings

branches/5.8/tests/phpunit/tests/theme/themeDir.php

@@ -162 +162 @@
             'camelCase',
             'REST Theme',
-            'FSE Theme',
+            'Block Theme',
         );
 

branches/5.8/tests/phpunit/tests/theme/wpThemeJsonResolver.php

@@ -97 +97 @@
     public function test_translations_are_applied() {
         add_filter( 'locale', array( $this, 'filter_set_locale_to_polish' ) );
-        load_textdomain( 'fse', realpath( DIR_TESTDATA . '/languages/themes/fse-pl_PL.mo' ) );
+        load_textdomain( 'block-theme', realpath( DIR_TESTDATA . '/languages/themes/block-theme-pl_PL.mo' ) );
 
-        switch_theme( 'fse' );
+        switch_theme( 'block-theme' );
 
         $actual = WP_Theme_JSON_Resolver::get_theme_data();
 
-        unload_textdomain( 'fse' );
+        unload_textdomain( 'block-theme' );
         remove_filter( 'locale', array( $this, 'filter_set_locale_to_polish' ) );
 
-        $this->assertSame( wp_get_theme()->get( 'TextDomain' ), 'fse' );
+        $this->assertSame( wp_get_theme()->get( 'TextDomain' ), 'block-theme' );
         $this->assertSame(
             array(
@@ -155 +155 @@
 
         // Switch to a theme that does have support.
-        switch_theme( 'fse' );
-        $fse = WP_Theme_JSON_Resolver::theme_has_support();
+        switch_theme( 'block-theme' );
+        $has_theme_json_support = WP_Theme_JSON_Resolver::theme_has_support();
 
         $this->assertFalse( $default );
-        $this->assertTrue( $fse );
+        $this->assertTrue( $has_theme_json_support );
     }