Changeset 51248 for trunk/tests/phpunit/tests/rest-api/rest-widgets-controller.php

Timestamp:

06/28/2021 04:33:36 AM (5 years ago)

Author:

noisysocks

Message:

Widgets REST API: Fix non-multi widgets not appearing in wp_inactive_widgets

Registered widgets that do not extend WP_Widget should appear in the
wp_inactive_widgets sidebar by default. Having the widgets REST API call
retrieve_widgets() before serving any request ensures that this will happen.

This is a similar fix to [51235].

Fixes #53534.
Props zieladam, timothyblynjacobs.

File:

• trunk/tests/phpunit/tests/rest-api/rest-widgets-controller.php (modified) (3 diffs)

trunk/tests/phpunit/tests/rest-api/rest-widgets-controller.php

@@ -96 +96 @@
 
     public function setUp() {
-        global $wp_registered_widgets, $wp_registered_sidebars, $_wp_sidebars_widgets, $wp_widget_factory;
+        global $wp_widget_factory;
 
         parent::setUp();
@@ -102 +102 @@
         wp_set_current_user( self::$admin_id );
 
-        // Unregister all widgets and sidebars.
-        $wp_registered_widgets  = array();
-        $wp_registered_sidebars = array();
-        $_wp_sidebars_widgets   = array();
-        update_option( 'sidebars_widgets', array() );
-
         // Re-register core widgets.
-        $wp_widget_factory->_register_widgets();
+        wp_widgets_init();
 
         // Register a non-multi widget for testing.
@@ -148 +142 @@
             )
         );
+    }
+
+    public function clean_up_global_scope() {
+        global
+            $wp_widget_factory,
+            $wp_registered_sidebars,
+            $wp_registered_widgets,
+            $wp_registered_widget_controls,
+            $wp_registered_widget_updates,
+            $_wp_sidebars_widgets;
+
+        $wp_registered_sidebars        = array();
+        $wp_registered_widgets         = array();
+        $wp_registered_widget_controls = array();
+        $wp_registered_widget_updates  = array();
+        $wp_widget_factory->widgets    = array();
+        $_wp_sidebars_widgets          = array();
+
+        update_option( 'sidebars_widgets', array() );
+
+        parent::clean_up_global_scope();
     }