Changeset 52383

Timestamp:

12/16/2021 02:45:32 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Tests: Add unit tests for theme features that block themes should support by default.

By default, block themes should have a few theme supports enabled:

• post-thumbnails
• responsive-embeds
• editor-styles
• html5 for comment-form, comment-list, style, script
• automatic-feed-links

They should also load core block assets only when the blocks are rendered. This commit adds the associated tests.

Follow-up to [52369].

Props costdev.
See #54597.

Location:

trunk

Files:

• src/wp-includes/theme.php (modified) (1 diff)
• tests/phpunit/tests/theme/wpTheme.php (modified) (1 diff)

trunk/src/wp-includes/theme.php

@@ -4169 +4169 @@
  * Adds default theme supports for block themes when the 'setup_theme' action fires.
  *
+ * See {@see 'setup_theme'}.
+ *
  * @since 5.9.0
  * @access private
  */
 function _add_default_theme_supports() {
-    if ( wp_is_block_theme() ) {
-        add_theme_support( 'post-thumbnails' );
-        add_theme_support( 'responsive-embeds' );
-        add_theme_support( 'editor-styles' );
-        add_theme_support( 'html5', array( 'comment-form', 'comment-list', 'style', 'script' ) );
-        add_theme_support( 'automatic-feed-links' );
-        add_filter( 'should_load_separate_core_block_assets', '__return_true' );
-    }
-}
+    if ( ! wp_is_block_theme() ) {
+        return;
+    }
+
+    add_theme_support( 'post-thumbnails' );
+    add_theme_support( 'responsive-embeds' );
+    add_theme_support( 'editor-styles' );
+    add_theme_support( 'html5', array( 'comment-form', 'comment-list', 'style', 'script' ) );
+    add_theme_support( 'automatic-feed-links' );
+
+    add_filter( 'should_load_separate_core_block_assets', '__return_true' );
+}

trunk/tests/phpunit/tests/theme/wpTheme.php

@@ -354 +354 @@
         );
     }
+
+    /**
+     * Tests that block themes support a feature by default.
+     *
+     * @ticket 54597
+     * @dataProvider data_block_theme_has_default_support
+     *
+     * @covers ::_add_default_theme_supports
+     *
+     * @param array $support {
+     *     The feature to check.
+     *
+     *     @type string $feature     The feature to check.
+     *     @type string $sub_feature Optional. The sub-feature to check.
+     * }
+     */
+    public function test_block_theme_has_default_support( $support ) {
+        $this->helper_requires_block_theme();
+
+        $support_data     = array_values( $support );
+        $support_data_str = implode( ': ', $support_data );
+
+        // Remove existing support.
+        if ( current_theme_supports( ...$support_data ) ) {
+            remove_theme_support( ...$support_data );
+        }
+
+        $this->assertFalse(
+            current_theme_supports( ...$support_data ),
+            "Could not remove support for $support_data_str."
+        );
+
+        do_action( 'setup_theme' );
+
+        $this->assertTrue(
+            current_theme_supports( ...$support_data ),
+            "Does not have default support for $support_data_str."
+        );
+    }
+
+    /**
+     * Data provider.
+     *
+     * @return array
+     */
+    public function data_block_theme_has_default_support() {
+        return array(
+            'post-thumbnails'      => array(
+                'support' => array(
+                    'feature' => 'post-thumbnails',
+                ),
+            ),
+            'responsive-embeds'    => array(
+                'support' => array(
+                    'feature' => 'responsive-embeds',
+                ),
+            ),
+            'editor-styles'        => array(
+                'support' => array(
+                    'feature' => 'editor-styles',
+                ),
+            ),
+            'html5: style'         => array(
+                'support' => array(
+                    'feature'     => 'html5',
+                    'sub_feature' => 'style',
+                ),
+            ),
+            'html5: script'        => array(
+                'support' => array(
+                    'feature'     => 'html5',
+                    'sub_feature' => 'script',
+                ),
+            ),
+            'automatic-feed-links' => array(
+                'support' => array(
+                    'feature' => 'automatic-feed-links',
+                ),
+            ),
+        );
+    }
+
+    /**
+     * Tests that block themes load separate core block assets by default.
+     *
+     * @ticket 54597
+     *
+     * @covers ::wp_should_load_separate_core_block_assets
+     */
+    public function test_block_theme_should_load_separate_core_block_assets_by_default() {
+        $this->helper_requires_block_theme();
+
+        add_filter( 'should_load_separate_core_block_assets', '__return_false' );
+
+        $this->assertFalse(
+            wp_should_load_separate_core_block_assets(),
+            'Could not disable loading separate core block assets.'
+        );
+
+        do_action( 'setup_theme' );
+
+        $this->assertTrue(
+            wp_should_load_separate_core_block_assets(),
+            'Block themes do not load separate core block assets by default.'
+        );
+    }
+
+    /**
+     * Helper function to ensure that a block theme is available and active.
+     */
+    private function helper_requires_block_theme() {
+        // No need to switch if we're already on a block theme.
+        if ( wp_is_block_theme() ) {
+            return;
+        }
+
+        $block_theme        = 'twentytwentytwo';
+        $block_theme_object = new WP_Theme( $block_theme, WP_CONTENT_DIR . '/themes' );
+
+        // Skip if the block theme is not available.
+        if ( ! $block_theme_object->exists() ) {
+            $this->markTestSkipped( "$block_theme must be available." );
+        }
+
+        switch_theme( $block_theme );
+
+        // Skip if we could not switch to the block theme.
+        if ( wp_get_theme()->stylesheet !== $block_theme ) {
+            $this->markTestSkipped( "Could not switch to $block_theme." );
+        }
+    }
 }