Changeset 56212 for trunk/tests/phpunit/includes/abstract-testcase.php

Timestamp:

07/11/2023 01:31:03 PM (3 years ago)

Author:

joemcgill

Message:

Build/Test Tools: Reset main query object after each test.

This resets the main query variable, $wp_the_query during the WP_UnitTestCase_Base::tear_down method that runs after each PHPUnit test. This ensures any changes to the main query object is reset after each test to avoid cross contamination between tests, similar to how other globals are reset.

Props flixos90, spacedmonkey, joemcgill.
Fixes #58776.

File:

• trunk/tests/phpunit/includes/abstract-testcase.php (modified) (2 diffs)

trunk/tests/phpunit/includes/abstract-testcase.php

@@ -143 +143 @@
          */
         public function tear_down() {
-                global $wpdb, $wp_query, $wp;
+                global $wpdb, $wp_the_query, $wp_query, $wp;
                 $wpdb->query( 'ROLLBACK' );
                 if ( is_multisite() ) {
@@ -150 +150 @@
                         }
                 }
-                $wp_query = new WP_Query();
-                $wp       = new WP();
+
+                // Reset query, main query, and WP globals similar to wp-settings.php.
+                $wp_the_query = new WP_Query();
+                $wp_query     = $wp_the_query;
+                $wp           = new WP();
 
                 // Reset globals related to the post loop and `setup_postdata()`.