Changeset 52308 for trunk/tests/phpunit/tests/block-template.php

Timestamp:

12/02/2021 11:35:20 PM (4 years ago)

Author:

audrasjb

Message:

Editor: Allow child theme PHP templates to take precedence over parent theme block templates.

This change fixes template resolution to give precedence to child theme PHP templates over parent theme block templates with equal specificity.

Before this change, when a theme was using a PHP template of a certain specificity (e.g. page-home.php), and it happened to be a child theme of another theme which had a block template for the same specificity (e.g. page-home.html), WordPress was picking the parent theme’s block template over the child theme’s PHP template to render the page. If the PHP and block template have equal specificity, the child theme's template should be used.

The issue was fixed before in Gutenberg so the fix now needs to happen in Core.

This change also re-enables the preexisting template resolution unit tests.

Follow-up to [51003].

Props bernhard-reiter, youknowriad.
Fixes #54515.

File:

• trunk/tests/phpunit/tests/block-template.php (modified) (1 diff)

trunk/tests/phpunit/tests/block-template.php

@@ -90 +90 @@
      *
      * Covers https://github.com/WordPress/gutenberg/pull/31123.
+     * Covers https://core.trac.wordpress.org/ticket/54515.
      *
      */
     function test_child_theme_php_template_takes_precedence_over_equally_specific_parent_theme_block_template() {
-        /**
-         * @todo This test is currently marked as skipped, since it wouldn't pass. Turns out that in Gutenberg,
-         * it only passed due to a erroneous test setup.
-         * For details, see https://github.com/WordPress/wordpress-develop/pull/1920#issuecomment-975929818.
-         */
-        $this->markTestSkipped( 'The block template resolution algorithm needs fixing in order for this test to pass.' );
-
         switch_theme( 'block-theme-child' );