Changeset 52314

Timestamp:

12/03/2021 04:57:19 PM (3 years ago)

Author:

hellofromTonya

Message:

Editor: Enable incomplete unit tests in Tests_Block_Template_Utils:: test_get_block_template_from_file().

At the time tests were backported from Gutenberg, a block template theme was not available in the test suite; thus, the test was marked as markTestIncomplete().

Now that block-theme and block-theme-child test fixture block template themes are available, this commit removes the markTestIncomplete() and adjusts the test to run by switching to the block-theme test fixture.

Follow-up to [51003], [52062], [52247].

Props bernhard-reiter.
Fixes #54551.

Location:

trunk/tests/phpunit

Files:

• data/themedir1/block-theme/parts (added)
• data/themedir1/block-theme/parts/small-header.html (added)
• tests/block-template-utils.php (modified) (6 diffs)

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

@@ -14 +14 @@
     private static $post;
     private static $template_part_post;
+    private static $test_theme = 'block-theme';
 
     public static function wpSetUpBeforeClass() {
-        // We may need a block theme.
-        // switch_theme( 'tt1-blocks' );
-
         // Set up a template post corresponding to a different theme.
         // We do this to ensure resolution and slug creation works as expected,
@@ -46 +44 @@
             'tax_input'    => array(
                 'wp_theme' => array(
-                    get_stylesheet(),
+                    self::$test_theme,
                 ),
             ),
         );
         self::$post = self::factory()->post->create_and_get( $args );
-        wp_set_post_terms( self::$post->ID, get_stylesheet(), 'wp_theme' );
+        wp_set_post_terms( self::$post->ID, self::$test_theme, 'wp_theme' );
 
         // Set up template part post.
@@ -62 +60 @@
             'tax_input'    => array(
                 'wp_theme'              => array(
-                    get_stylesheet(),
+                    self::$test_theme,
                 ),
                 'wp_template_part_area' => array(
@@ -71 +69 @@
         self::$template_part_post = self::factory()->post->create_and_get( $template_part_args );
         wp_set_post_terms( self::$template_part_post->ID, WP_TEMPLATE_PART_AREA_HEADER, 'wp_template_part_area' );
-        wp_set_post_terms( self::$template_part_post->ID, get_stylesheet(), 'wp_theme' );
+        wp_set_post_terms( self::$template_part_post->ID, self::$test_theme, 'wp_theme' );
+    }
+
+    public function set_up() {
+        parent::set_up();
+        switch_theme( self::$test_theme );
     }
 
@@ -226 +229 @@
      */
     function test_get_block_template_from_file() {
-        $this->markTestIncomplete();
-        // Requires switching to a block theme.
-        /* $id       = get_stylesheet() . '//' . 'index';
+        $id       = get_stylesheet() . '//' . 'index';
         $template = get_block_template( $id, 'wp_template' );
         $this->assertSame( $id, $template->id );
@@ -238 +239 @@
 
         // Test template parts.
-        $id       = get_stylesheet() . '//' . 'header';
+        $id       = get_stylesheet() . '//' . 'small-header';
         $template = get_block_template( $id, 'wp_template_part' );
         $this->assertSame( $id, $template->id );
         $this->assertSame( get_stylesheet(), $template->theme );
-        $this->assertSame( 'header', $template->slug );
+        $this->assertSame( 'small-header', $template->slug );
         $this->assertSame( 'publish', $template->status );
         $this->assertSame( 'theme', $template->source );
         $this->assertSame( 'wp_template_part', $template->type );
         $this->assertSame( WP_TEMPLATE_PART_AREA_HEADER, $template->area );
-        */
     }