Changeset 28943

Timestamp:

07/01/2014 06:51:46 PM (12 years ago)

Author:

wonderboymusic

Message:

Avoid polluted $table_prefix and $_wp_switched_stack in multisite unit tests.
Add WP_TESTS_TABLE_PREFIX in bootstrap.php to ensure the original value for $table_prefix is always available.

Props jeremyfelt.
Fixes #28692.

Location:

trunk/tests/phpunit

Files:

• includes/bootstrap.php (modified) (1 diff)
• includes/testcase.php (modified) (1 diff)
• tests/ms.php (modified) (1 diff)

trunk/tests/phpunit/includes/bootstrap.php

@@ -24 +24 @@
 require_once $config_file_path;
 
+define( 'WP_TESTS_TABLE_PREFIX', $table_prefix );
 define( 'DIR_TESTDATA', dirname( __FILE__ ) . '/../data' );
 

trunk/tests/phpunit/includes/testcase.php

@@ -36 +36 @@
                 $this->expectedDeprecated();
                 $wpdb->query( 'ROLLBACK' );
+                if ( is_multisite() ) {
+                        while ( ms_is_switched() ) {
+                                restore_current_blog();
+                        }
+                }
                 $wp_query = new WP_Query();
                 $post = null;

trunk/tests/phpunit/tests/ms.php

@@ -1511 +1511 @@
          */
         function _setup_host_request( $domain, $path ) {
-                global $current_site, $current_blog, $wpdb, $table_prefix;
-
+                global $current_site, $current_blog, $table_prefix;
+
+                $table_prefix = WP_TESTS_TABLE_PREFIX;
                 $current_site = $current_blog = null;
                 $_SERVER['HTTP_HOST'] = $domain;