Changeset 56422 for trunk/tests/phpunit/tests/editor/classic-to-block-menu-converter.php

Timestamp:

08/21/2023 05:49:09 PM (16 months ago)

Author:

hellofromTonya

Message:

Editor: Fix error handling of converting classic to block menus.

Fixes the error handling for when WP_Classic_To_Block_Menu_Converter::convert() returns an instance of WP_Error. WP_Navigation_Fallback::create_classic_menu_fallback() now checks for is_wp_error() and if true, returns the error. And the @return type is updated to string|WP_Error.

Also includes a fix in the return type in WP_Classic_To_Block_Menu_Converter::convert() to return an empty string instead of an array instead, i.e. when bailing out for no menu items returned by wp_get_nav_menu_items(). The return type is clearly documented as a string.

Follow-up to [56052].

Props dlh, get_dave, antonvlasenko, hellofromTonya.
Fixes #58823.

File:

• trunk/tests/phpunit/tests/editor/classic-to-block-menu-converter.php (modified) (2 diffs)

trunk/tests/phpunit/tests/editor/classic-to-block-menu-converter.php

@@ -206 +206 @@
      * @covers WP_Classic_To_Block_Menu_Converter::convert
      */
-    public function test_returns_empty_array_for_menus_with_no_items() {
+    public function test_returns_empty_string_for_menus_with_no_items() {
         $menu_id = wp_create_nav_menu( 'Empty Menu' );
 
@@ -213 +213 @@
         $blocks = WP_Classic_To_Block_Menu_Converter::convert( $classic_nav_menu );
 
-        $this->assertEmpty( $blocks, 'Result should be empty.' );
-
-        $this->assertIsArray( $blocks, 'Result should be empty array.' );
+        $this->assertSame( '', $blocks, 'Result should be empty string.' );
 
         wp_delete_nav_menu( $menu_id );