Changeset 28964

Timestamp:

07/03/2014 12:49:32 AM (12 years ago)

Author:

wonderboymusic

Message:

Make sure hundreds of canonical tests don't fail in multisite every other time they are run.

See #28706.

Location:

trunk/tests/phpunit/tests

Files:

• canonical.php (modified) (2 diffs)
• link.php (modified) (1 diff)

trunk/tests/phpunit/tests/canonical.php

@@ -20 +20 @@
 
         function setUp() {
+                global $wp_rewrite;
+
                 parent::setUp();
 
@@ -26 +28 @@
                 update_option( 'posts_per_page', 5 );
 
-                update_option( 'permalink_structure', $this->structure );
+                $wp_rewrite->init();
+                $wp_rewrite->set_permalink_structure( $this->structure );
+
                 create_initial_taxonomies();
-                $GLOBALS['wp_rewrite']->init();
-                flush_rewrite_rules();
+
+                $wp_rewrite->flush_rules();
 
                 $this->old_current_user = get_current_user_id();

trunk/tests/phpunit/tests/link.php

@@ -35 +35 @@
                 $post_id2 = $this->factory->post->create();
 
-                $wp_rewrite->permalink_structure = '';
+                $wp_rewrite->init();
                 $wp_rewrite->set_permalink_structure( '' );
+                $wp_rewrite->flush_rules();
 
                 // Basic case