Changeset 47747

Timestamp:

05/02/2020 10:34:50 PM (5 years ago)

Author:

johnbillion

Message:

Menus: Allow empty taxonomy terms to be surfaced when searching for items.

This brings the behaviour inline with that of browsing terms or using the All Items tab, which correctly shows empty terms.

Props birgire, audrasjb

Fixes #45298

Location:

trunk

Files:

• src/wp-admin/includes/nav-menu.php (modified) (1 diff)
• src/wp-includes/class-wp-customize-nav-menus.php (modified) (1 diff)
• tests/phpunit/tests/customize/nav-menus.php (modified) (3 diffs)
• tests/phpunit/tests/menu/wpAjaxMenuQuickSearch.php (modified) (1 diff)

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

@@ -114 +114 @@
                     'name__like' => $query,
                     'number'     => 10,
+                    'hide_empty' => false,
                 )
             );

trunk/src/wp-includes/class-wp-customize-nav-menus.php

@@ -370 +370 @@
                 'name__like' => $args['s'],
                 'number'     => 20,
+                'hide_empty' => false,
                 'offset'     => 20 * ( $args['pagenum'] - 1 ),
             )

trunk/tests/phpunit/tests/customize/nav-menus.php

@@ -372 +372 @@
             )
         );
-        $this->assertEquals( 1, count( $results ) );
+        $this->assertCount( 2, $results ); // Category terms Cats Drool and Uncategorized.
         $count = $this->filter_count_customize_nav_menu_searched_items;
         add_filter( 'customize_nav_menu_searched_items', array( $this, 'filter_search' ), 10, 2 );
@@ -383 +383 @@
         $this->assertEquals( $count + 1, $this->filter_count_customize_nav_menu_searched_items );
         $this->assertInternalType( 'array', $results );
-        $this->assertEquals( 2, count( $results ) );
+        $this->assertCount( 3, $results );
         remove_filter( 'customize_nav_menu_searched_items', array( $this, 'filter_search' ), 10 );
 
@@ -397 +397 @@
         $this->assertEquals( 'home', $results[0]['id'] );
         $this->assertEquals( 'custom', $results[0]['type'] );
+    }
+
+    /*
+     * Tests that the search_available_items_query method should return term items
+     * not assigned to any posts.
+     *
+     * @ticket 45298
+     */
+    public function test_search_available_items_query_should_return_unassigned_term_items() {
+        $menus = new WP_Customize_Nav_Menus( $this->wp_customize );
+
+        register_taxonomy(
+            'wptests_tax',
+            'post',
+            array(
+                'labels' => array(
+                    'name' => 'Tests Taxonomy',
+                ),
+            )
+        );
+
+        $term_id = $this->factory->term->create(
+            array(
+                'taxonomy' => 'wptests_tax',
+                'name'     => 'foobar',
+            )
+        );
+
+        // Expected menu item array.
+        $expected = array(
+            'title'      => 'foobar',
+            'id'         => "term-{$term_id}",
+            'type'       => 'taxonomy',
+            'type_label' => 'Tests Taxonomy',
+            'object'     => 'wptests_tax',
+            'object_id'  => intval( $term_id ),
+            'url'        => get_term_link( intval( $term_id ), '' ),
+        );
+
+        $results = $menus->search_available_items_query(
+            array(
+                'pagenum' => 1,
+                's'       => 'foo',
+            )
+        );
+
+        $this->assertEqualSets( $expected, $results[0] );
     }
 

trunk/tests/phpunit/tests/menu/wpAjaxMenuQuickSearch.php

@@ -121 +121 @@
         $this->assertCount( 1, $results );
     }
+
+    /**
+     * Test that search displays terms that are not assigned to any posts.
+     *
+     * @ticket 45298
+     */
+    public function test_search_should_return_unassigned_term_items() {
+        register_taxonomy( 'wptests_tax', 'post' );
+
+        $this->factory->term->create(
+            array(
+                'taxonomy' => 'wptests_tax',
+                'name'     => 'foobar',
+            )
+        );
+
+        $request = array(
+            'type' => 'quick-search-taxonomy-wptests_tax',
+            'q'    => 'foobar',
+        );
+        $output  = get_echo( '_wp_ajax_menu_quick_search', array( $request ) );
+
+        $this->assertNotEmpty( $output );
+        $results = explode( "\n", trim( $output ) );
+        $this->assertCount( 1, $results );
+    }
 }