Changeset 54187

Timestamp:

09/16/2022 03:10:58 PM (2 years ago)

Author:

SergeyBiryukov

Message:

Tests: Update the test for respecting the post type in get_block_templates().

• Use assertSameSets() to avoid a failure when array items are returned in different order (​example).
• Move the test to a more appropriate place now that the function has its own test class.
• Rename the test method to match the function name.

Follow-up to [52062], [53927], [54184].

See #55881.

Location:

trunk/tests/phpunit/tests

Files:

• block-template-utils.php (modified) (4 diffs)
• blocks/getBlockTemplates.php (modified) (4 diffs)

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

@@ -13 +13 @@
 class Tests_Block_Template_Utils extends WP_UnitTestCase {
     private static $post;
-    private static $custom_single_post_template_post;
     private static $template_part_post;
     private static $test_theme = 'block-theme';
@@ -52 +51 @@
         wp_set_post_terms( self::$post->ID, self::$test_theme, 'wp_theme' );
 
-        // Set up template post.
-        $args                                   = array(
-            'post_type'    => 'wp_template',
-            'post_name'    => 'custom-single-post-template',
-            'post_title'   => 'Custom Single Post template (modified)',
-            'post_content' => 'Content',
-            'post_excerpt' => 'Description of custom single post template',
-            'tax_input'    => array(
-                'wp_theme' => array(
-                    self::$test_theme,
-                ),
-            ),
-        );
-        self::$custom_single_post_template_post = self::factory()->post->create_and_get( $args );
-        wp_set_post_terms( self::$custom_single_post_template_post->ID, self::$test_theme, 'wp_theme' );
-
         // Set up template part post.
         $template_part_args       = array(
@@ -96 +79 @@
     public static function wpTearDownAfterClass() {
         wp_delete_post( self::$post->ID );
-        wp_delete_post( self::$custom_single_post_template_post->ID );
     }
 
@@ -338 +320 @@
         );
         */
-    }
-
-    /**
-     * @dataProvider data_get_block_template_should_respect_posttypes_property
-     * @ticket 55881
-     * @covers ::get_block_templates
-     *
-     * @param string $post_type Post type for query.
-     * @param array  $expected  Expected template IDs.
-     */
-    public function test_get_block_template_should_respect_posttypes_property( $post_type, $expected ) {
-        $templates = get_block_templates( array( 'post_type' => $post_type ) );
-
-        $this->assertSame(
-            $expected,
-            $this->get_template_ids( $templates )
-        );
-    }
-
-    /**
-     * Data provider.
-     *
-     * @return array
-     */
-    public function data_get_block_template_should_respect_posttypes_property() {
-        return array(
-            'post' => array(
-                'post_type' => 'post',
-                'expected'  => array(
-                    'block-theme//my_template',
-                    'block-theme//custom-single-post-template',
-                ),
-            ),
-            'page' => array(
-                'post_type' => 'page',
-                'expected'  => array(
-                    'block-theme//my_template',
-                    'block-theme//page-home',
-                ),
-            ),
-        );
-    }
-
-    /**
-     * Gets the template IDs from the given array.
-     *
-     * @param object[] $templates Array of template objects to parse.
-     * @return string[] The template IDs.
-     */
-    private function get_template_ids( $templates ) {
-        return array_map(
-            static function( $template ) {
-                return $template->id;
-            },
-            $templates
-        );
     }
 

trunk/tests/phpunit/tests/blocks/getBlockTemplates.php

@@ -13 +13 @@
      */
     private static $template;
+
+    /**
+     * @var WP_Post
+     */
+    private static $custom_single_post_template;
 
     /**
@@ -40 +45 @@
         wp_set_post_terms( static::$template->ID, static::TEST_THEME, 'wp_theme' );
 
+        static::$custom_single_post_template = self::factory()->post->create_and_get(
+            array(
+                'post_type'    => 'wp_template',
+                'post_name'    => 'custom-single-post-template',
+                'post_title'   => 'Custom Single Post template (modified)',
+                'post_content' => 'Content',
+                'post_excerpt' => 'Description of custom single post template',
+                'tax_input'    => array(
+                    'wp_theme' => array(
+                        static::TEST_THEME,
+                    ),
+                ),
+            )
+        );
+
+        wp_set_post_terms( static::$custom_single_post_template->ID, static::TEST_THEME, 'wp_theme' );
+
         /*
          * This template part has to have the same ID ("block-theme/small-header") as the template part
@@ -65 +87 @@
     public static function tear_down_after_class() {
         wp_delete_post( static::$template->ID );
+        wp_delete_post( static::$custom_single_post_template->ID );
         wp_delete_post( static::$template_part->ID );
 
@@ -114 +137 @@
         );
     }
+
+    /**
+     * @dataProvider data_get_block_templates_should_respect_posttypes_property
+     * @ticket 55881
+     *
+     * @param string $post_type Post type for query.
+     * @param array  $expected  Expected template IDs.
+     */
+    public function test_get_block_templates_should_respect_posttypes_property( $post_type, $expected ) {
+        $templates = get_block_templates( array( 'post_type' => $post_type ) );
+
+        $this->assertSameSets(
+            $expected,
+            $this->get_template_ids( $templates )
+        );
+    }
+
+    /**
+     * Data provider.
+     *
+     * @return array
+     */
+    public function data_get_block_templates_should_respect_posttypes_property() {
+        return array(
+            'post' => array(
+                'post_type' => 'post',
+                'expected'  => array(
+                    'block-theme//custom-single-post-template',
+                ),
+            ),
+            'page' => array(
+                'post_type' => 'page',
+                'expected'  => array(
+                    'block-theme//page-home',
+                ),
+            ),
+        );
+    }
+
+    /**
+     * Gets the template IDs from the given array.
+     *
+     * @param object[] $templates Array of template objects to parse.
+     * @return string[] The template IDs.
+     */
+    private function get_template_ids( $templates ) {
+        return array_map(
+            static function( $template ) {
+                return $template->id;
+            },
+            $templates
+        );
+    }
 }