Changeset 35258

Timestamp:

10/18/2015 05:00:40 AM (6 years ago)

Author:

johnbillion

Message:

Preserve the public and private query var properties on the global WP instance when using WP_UnitTestCase::go_to(). These properties apply to the application state, not the current request.

See #34346

File:

• trunk/tests/phpunit/includes/testcase.php (modified) (3 diffs)

trunk/tests/phpunit/includes/testcase.php

@@ -127 +127 @@
 
     function tearDown() {
-        global $wpdb, $wp_query, $post;
+        global $wpdb, $wp_query, $wp, $post;
         $wpdb->query( 'ROLLBACK' );
         if ( is_multisite() ) {
@@ -135 +135 @@
         }
         $wp_query = new WP_Query();
+        $wp = new WP();
         $post = null;
         remove_theme_support( 'html5' );
@@ -420 +421 @@
         $GLOBALS['wp_the_query'] = new WP_Query();
         $GLOBALS['wp_query'] = $GLOBALS['wp_the_query'];
+        
+        $public_query_vars  = $GLOBALS['wp']->public_query_vars;
+        $private_query_vars = $GLOBALS['wp']->private_query_vars;
+
         $GLOBALS['wp'] = new WP();
+        $GLOBALS['wp']->public_query_vars  = $public_query_vars;
+        $GLOBALS['wp']->private_query_vars = $private_query_vars;
+
         _cleanup_query_vars();