Changeset 53371

Timestamp:

05/09/2022 05:56:36 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Tests: Move get_inline_data() tests to a more appropriate place.

Since this is an admin template function and the tests check for specific output with certain taxonomy parameters, placing the tests along with other tests for the functions in the same file should make them easier to find and extend than when placed between general taxonomy registration tests.

Follow-up to [52841], [53368].

See #55652.

Location:

trunk/tests/phpunit/tests

Files:

• admin/includesTemplate.php (modified) (1 diff)
• taxonomy.php (modified) (2 diffs)

trunk/tests/phpunit/tests/admin/includesTemplate.php

@@ -42 +42 @@
                         array( 1 ),
                 );
+        }
+
+        /**
+         * @ticket 49701
+         *
+         * @covers ::get_inline_data
+         */
+        public function test_get_inline_data_contains_term_if_show_ui_is_false_but_show_on_quick_edit_is_true_for_hierarchical_taxonomy() {
+                // Create a post with a term from a hierarchical taxonomy.
+                register_taxonomy(
+                        'wptests_tax_1',
+                        'post',
+                        array(
+                                'show_ui'            => false,
+                                'show_in_quick_edit' => true,
+                                'hierarchical'       => true,
+                        )
+                );
+                $term = wp_insert_term( 'Test', 'wptests_tax_1' );
+                $post = self::factory()->post->create_and_get();
+                wp_set_object_terms( $post->ID, $term['term_id'], 'wptests_tax_1' );
+
+                // Test that get_inline_data() has `post_category` div containing the assigned term.
+                wp_set_current_user( self::factory()->user->create( array( 'role' => 'editor' ) ) );
+                get_inline_data( $post );
+                $this->expectOutputRegex( '/<div class="post_category" id="wptests_tax_1_' . $post->ID . '">' . $term['term_id'] . '<\/div>/' );
+        }
+
+        /**
+         * @ticket 49701
+         *
+         * @covers ::get_inline_data
+         */
+        public function test_get_inline_data_contains_term_if_show_ui_is_false_but_show_on_quick_edit_is_true_for_nonhierarchical_taxonomy() {
+                // Create a post with a term from a non-hierarchical taxonomy.
+                register_taxonomy(
+                        'wptests_tax_1',
+                        'post',
+                        array(
+                                'show_ui'            => false,
+                                'show_in_quick_edit' => true,
+                                'hierarchical'       => false,
+                        )
+                );
+                $term = wp_insert_term( 'Test', 'wptests_tax_1' );
+                $post = self::factory()->post->create_and_get();
+                wp_set_object_terms( $post->ID, $term['term_id'], 'wptests_tax_1' );
+
+                // Test that get_inline_data() has `tags_input` div containing the assigned term.
+                wp_set_current_user( self::factory()->user->create( array( 'role' => 'editor' ) ) );
+                get_inline_data( $post );
+                $this->expectOutputRegex( '/<div class="tags_input" id="wptests_tax_1_' . $post->ID . '">Test<\/div>/' );
         }
 

trunk/tests/phpunit/tests/taxonomy.php

@@ -222 +222 @@
         }
 
-
         /**
          * @ticket 53212
@@ -237 +236 @@
 
                 $this->assertSame( 3, $action->get_call_count() );
-        }
-
-        /**
-         * @ticket 49701
-         *
-         * @covers ::get_inline_data
-         */
-        public function test_get_inline_data_contains_term_if_show_ui_false_but_show_on_quick_edit_true_for_hierarchical_taxonomy() {
-                // Create a post with a term from a hierarchical taxonomy.
-                register_taxonomy(
-                        'wptests_tax_1',
-                        'post',
-                        array(
-                                'show_ui'            => false,
-                                'show_in_quick_edit' => true,
-                                'hierarchical'       => true,
-                        )
-                );
-                $term = wp_insert_term( 'Test', 'wptests_tax_1' );
-                $post = self::factory()->post->create_and_get();
-                wp_set_object_terms( $post->ID, $term['term_id'], 'wptests_tax_1' );
-
-                // Test get_inline_data() has post_category div containing assigned term.
-                wp_set_current_user( self::factory()->user->create( array( 'role' => 'editor' ) ) );
-                get_inline_data( $post );
-                $this->expectOutputRegex( '/<div class="post_category" id="wptests_tax_1_' . $post->ID . '">' . $term['term_id'] . '<\/div>/' );
-        }
-
-        /**
-         * @ticket 49701
-         *
-         * @covers ::get_inline_data
-         */
-        public function test_get_inline_data_contains_term_if_show_ui_false_but_show_on_quick_edit_true_for_nonhierarchical_taxonomy() {
-                // Create a post with a term from a hierarchical taxonomy.
-                register_taxonomy(
-                        'wptests_tax_1',
-                        'post',
-                        array(
-                                'show_ui'            => false,
-                                'show_in_quick_edit' => true,
-                                'hierarchical'       => false,
-                        )
-                );
-                $term = wp_insert_term( 'Test', 'wptests_tax_1' );
-                $post = self::factory()->post->create_and_get();
-                wp_set_object_terms( $post->ID, $term['term_id'], 'wptests_tax_1' );
-
-                // Test get_inline_data() has tags_input div containing assigned term.
-                wp_set_current_user( self::factory()->user->create( array( 'role' => 'editor' ) ) );
-                get_inline_data( $post );
-                $this->expectOutputRegex( '/<div class="tags_input" id="wptests_tax_1_' . $post->ID . '">Test<\/div>/' );
         }