Changeset 38654

Timestamp:

09/26/2016 05:01:48 PM (8 years ago)

Author:

johnbillion

Message:

Built/Test Tools: Unify the way the permastructure is set when used in conjunction with re-registering the initial taxonomies. This ensure that rewrite rules for taxonomies are consistently available.

Fixes #35452

Location:

trunk/tests/phpunit

Files:

• includes/testcase-canonical.php (modified) (1 diff)
• tests/canonical/https.php (modified) (1 diff)
• tests/query.php (modified) (1 diff)
• tests/query/verboseRewriteRules.php (modified) (1 diff)
• tests/rewrite.php (modified) (4 diffs)

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

@@ -31 +31 @@
         update_option( 'posts_per_page', 5 );
 
-        global $wp_rewrite;
-        $wp_rewrite->init();
-        $wp_rewrite->set_permalink_structure( $this->structure );
-
+        $this->set_permalink_structure( $this->structure );
         create_initial_taxonomies();
-
-        $wp_rewrite->flush_rules();
     }
 

trunk/tests/phpunit/tests/canonical/https.php

@@ -8 +8 @@
 class Tests_Canonical_HTTPS extends WP_Canonical_UnitTestCase {
     function setUp() {
-        global $wp_rewrite;
-
         parent::setUp();
 
-        $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
+        $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
         create_initial_taxonomies();
-        $wp_rewrite->flush_rules();
-        $wp_rewrite->init();
 
         $this->http  = set_url_scheme( home_url( 'sample-page/' ), 'http' );

trunk/tests/phpunit/tests/query.php

@@ -6 +6 @@
         parent::setUp();
 
+        $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
         create_initial_taxonomies();
-        $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
     }
 

trunk/tests/phpunit/tests/query/verboseRewriteRules.php

@@ -11 +11 @@
         parent::setUp();
 
+        $this->set_permalink_structure( '/%category%/%year%/%postname%/' );
         create_initial_taxonomies();
-
-        $this->set_permalink_structure( '/%category%/%year%/%postname%/' );
     }
 }

trunk/tests/phpunit/tests/rewrite.php

@@ -12 +12 @@
         parent::setUp();
 
+        $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
         create_initial_taxonomies();
-
-        $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
 
         $this->home_url = get_option( 'home' );
@@ -349 +348 @@
 
         $this->assertEquals( $post_id, url_to_postid( get_permalink( $post_id ) ) );
-
-        $this->set_permalink_structure();
     }
 
@@ -386 +383 @@
         $this->assertTrue( is_single() );
         $this->assertFalse( is_404() );
-
-        $this->set_permalink_structure();
     }
 
@@ -394 +389 @@
      */
     public function test_flush_rules_does_not_delete_option() {
-        $this->set_permalink_structure();
+        $this->set_permalink_structure( '' );
 
         $rewrite_rules = get_option( 'rewrite_rules' );