Changeset 63435

Timestamp:

09/02/2026 02:58:58 PM (41 hours ago)

Author:

lancewillett

Message:

Build/Test Tools: Remove implicit dependencies on leaked state.

Several PHPUnit tests rely on state left by earlier tests or leak state into later tests.

Improve setup and teardown for font-face, REST block type, sitemap, and media widget tests so they can run independently and in random order.

Developed in: ​https://github.com/WordPress/wordpress-develop/pull/13091

Props mdawaffe, jonsurrell, sergeybiryukov, mindctrl.
See #65893.

Location:

trunk/tests/phpunit/tests

Files:

• fonts/font-face/base.php (modified) (1 diff)
• fonts/font-face/wpPrintFontFacesFromStyleVariations.php (modified) (1 diff)
• rest-api/rest-block-type-controller.php (modified) (3 diffs)
• sitemaps/sitemaps.php (modified) (2 diffs)
• widgets/wpWidgetMediaAudio.php (modified) (1 diff)
• widgets/wpWidgetMediaVideo.php (modified) (1 diff)

trunk/tests/phpunit/tests/fonts/font-face/base.php

@@ -70 +70 @@
                 // Reset static flags.
                 self::$requires_switch_theme_fixtures = false;
+                self::$theme_root                     = null;
 
                 parent::tear_down_after_class();

trunk/tests/phpunit/tests/fonts/font-face/wpPrintFontFacesFromStyleVariations.php

@@ -17 +17 @@
 
         public static function set_up_before_class() {
+                self::$requires_switch_theme_fixtures = true;
+
                 parent::set_up_before_class();
-                self::$requires_switch_theme_fixtures = true;
         }
 

trunk/tests/phpunit/tests/rest-api/rest-block-type-controller.php

@@ -33 +33 @@
 
         /**
+         * Pre-existing block types registered before the current test.
+         *
+         * @var string[] $registered_block_types
+         */
+        private $registered_block_types = array();
+
+        /**
+         * Pre-existing block styles registered before the current test, grouped by block type name.
+         *
+         * @var array[] $registered_block_styles
+         */
+        private $registered_block_styles = array();
+
+        /**
          * Create fake data before our tests run.
          *
@@ -50 +64 @@
                         )
                 );
-
-                $name     = 'fake/test';
-                $settings = array(
-                        'icon' => 'text',
-                );
-
-                register_block_type( $name, $settings );
         }
 
@@ -62 +69 @@
                 self::delete_user( self::$admin_id );
                 self::delete_user( self::$subscriber_id );
-                unregister_block_type( 'fake/test' );
-                unregister_block_type( 'fake/invalid' );
-                unregister_block_type( 'fake/false' );
+        }
+
+        /**
+         * Sets up each test method.
+         *
+         * Records the registered block types and block styles so that anything
+         * registered by a test can be unregistered again in tear_down(), and
+         * registers a block type used by many tests in this class.
+         */
+        public function set_up() {
+                parent::set_up();
+
+                $this->registered_block_types  = array_keys( WP_Block_Type_Registry::get_instance()->get_all_registered() );
+                $this->registered_block_styles = WP_Block_Styles_Registry::get_instance()->get_all_registered();
+
+                register_block_type(
+                        'fake/test',
+                        array(
+                                'icon' => 'text',
+                        )
+                );
+        }
+
+        /**
+         * Tears down each test method.
+         *
+         * Unregisters any block types and block styles registered while the test ran.
+         */
+        public function tear_down() {
+                foreach ( WP_Block_Styles_Registry::get_instance()->get_all_registered() as $block_name => $block_styles ) {
+                        foreach ( array_keys( $block_styles ) as $block_style_name ) {
+                                if ( ! isset( $this->registered_block_styles[ $block_name ][ $block_style_name ] ) ) {
+                                        unregister_block_style( $block_name, $block_style_name );
+                                }
+                        }
+                }
+
+                foreach ( array_keys( WP_Block_Type_Registry::get_instance()->get_all_registered() ) as $block_name ) {
+                        if ( ! in_array( $block_name, $this->registered_block_types, true ) ) {
+                                unregister_block_type( $block_name );
+                        }
+                }
+
+                parent::tear_down();
         }
 

trunk/tests/phpunit/tests/sitemaps/sitemaps.php

@@ -465 +465 @@
         /**
          * @ticket 50643
-         * @runInSeparateProcess
-         * @preserveGlobalState disabled
          */
         public function test_disable_sitemap_should_return_404() {
                 add_filter( 'wp_sitemaps_enabled', '__return_false' );
 
+                // Instantiate the server before navigating: registering the sitemap
+                // rewrite tags is what adds `sitemap` to `$wp->public_query_vars`.
+                $sitemaps = wp_sitemaps_get_server();
+
                 $this->go_to( home_url( '/?sitemap=index' ) );
 
-                wp_sitemaps_get_server()->render_sitemaps();
+                $sitemaps->render_sitemaps();
 
                 remove_filter( 'wp_sitemaps_enabled', '__return_false' );
@@ -482 +484 @@
         /**
          * @ticket 50643
-         * @runInSeparateProcess
-         * @preserveGlobalState disabled
          */
         public function test_empty_url_list_should_return_404() {

trunk/tests/phpunit/tests/widgets/wpWidgetMediaAudio.php

@@ -317 +317 @@
          */
         public function test_render_control_template_scripts() {
+                // Provides wp_underscore_audio_template(), normally loaded by wp_enqueue_media().
+                require_once ABSPATH . WPINC . '/media-template.php';
+
                 $widget = new WP_Widget_Media_Audio();
 

trunk/tests/phpunit/tests/widgets/wpWidgetMediaVideo.php

@@ -345 +345 @@
          */
         public function test_render_control_template_scripts() {
+                // Provides wp_underscore_video_template(), normally loaded by wp_enqueue_media().
+                require_once ABSPATH . WPINC . '/media-template.php';
+
                 $widget = new WP_Widget_Media_Video();