Changeset 48439

Timestamp:

07/11/2020 09:46:29 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Menus: Simplify the test for wp_update_nav_menu_item() with special characters in category name.

The menu-item-title value is saved as a post_title property, so the resulting property can be checked directly, without a callback.

Follow-up to [48416].

See #48011.

Location:

trunk

Files:

• src/wp-includes/nav-menu.php (modified) (1 diff)
• tests/phpunit/tests/post/nav-menu.php (modified) (5 diffs)

trunk/src/wp-includes/nav-menu.php

@@ -493 +493 @@
                 }
 
-                if ( wp_unslash( $args['menu-item-title'] ) == wp_specialchars_decode( $original_title ) ) {
+                if ( wp_unslash( $args['menu-item-title'] ) === wp_specialchars_decode( $original_title ) ) {
                         $args['menu-item-title'] = '';
                 }

trunk/tests/phpunit/tests/post/nav-menu.php

@@ -417 +417 @@
                 );
 
-                $post_inser2 = wp_update_nav_menu_item(
+                $post_insert2 = wp_update_nav_menu_item(
                         $this->menu_id,
                         0,
@@ -960 +960 @@
          * Tests `wp_update_nav_menu_item()` with special characters in a category name.
          *
-         * When inserting a category as a nav item, the `$args['menu-item-title']` should
-         * always be empty as it should get the title from the category object itself.
+         * When inserting a category as a nav item, the `post_title` property should
+         * be empty, as the item should get the title from the category object itself.
          *
          * @ticket 48011
          */
-        function test_wp_update_nav_menu_item_with_special_character_in_categories() {
-
+        function test_wp_update_nav_menu_item_with_special_characters_in_category_name() {
                 $category_name = 'Test Cat - \"Pre-Slashed\" Cat Name & >';
 
-                $cat = self::factory()->category->create_and_get(
+                $category = self::factory()->category->create_and_get(
                         array(
                                 'name' => $category_name,
@@ -975 +974 @@
                 );
 
-                add_action( 'wp_update_nav_menu_item', array( $this, 'callback_wp_update_nav_menu_item_48011' ), 10, 3 );
-
-                wp_update_nav_menu_item(
+                $category_item_id = wp_update_nav_menu_item(
                         $this->menu_id,
                         0,
@@ -983 +980 @@
                                 'menu-item-type'      => 'taxonomy',
                                 'menu-item-object'    => 'category',
-                                'menu-item-object-id' => $cat->term_id,
-                                'menu-item-status'    => 'publish',
-                                /**
+                                'menu-item-object-id' => $category->term_id,
+                                'menu-item-status'    => 'publish',
+                                /*
                                  * Interestingly enough, if we use `$cat->name` for the menu item title,
                                  * we won't be able to replicate the bug because it's in htmlentities form.
@@ -992 +989 @@
                         )
                 );
-        }
-
-        /**
-         * Callback for the `wp_update_nav_menu_item` action.
-         *
-         * @since 5.5.0
-         */
-        function callback_wp_update_nav_menu_item_48011( $menu_id, $menu_item_db_id, $args ) {
-                $this->assertEmpty( $args['menu-item-title'] );
+
+                $category_item = get_post( $category_item_id );
+                $this->assertEmpty( $category_item->post_title );
         }
 }