Changeset 28966 for trunk/tests/phpunit/tests/rewrite.php

Timestamp:

07/03/2014 01:42:57 AM (11 years ago)

Author:

wonderboymusic

Message:

Setup rewrite changes in tests in a predictable fashion. Don't mix method calls with wrapper function calls.

See #28706.

File:

• trunk/tests/phpunit/tests/rewrite.php (modified) (2 diffs)

trunk/tests/phpunit/tests/rewrite.php

@@ -9 +9 @@
 
     function setUp() {
+        global $wp_rewrite;
         parent::setUp();
 
         // Need rewrite rules in place to use url_to_postid
-        global $wp_rewrite;
-        update_option( 'permalink_structure', '/%year%/%monthnum%/%day%/%postname%/' );
+        $wp_rewrite->init();
+        $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
+
         create_initial_taxonomies();
-        $GLOBALS['wp_rewrite']->init();
-        flush_rewrite_rules();
+
+        $wp_rewrite->flush_rules();
     }
 
     function tearDown() {
+        global $wp_rewrite;
         parent::tearDown();
-        $GLOBALS['wp_rewrite']->init();
+        $wp_rewrite->init();
     }
 
@@ -35 +38 @@
     function test_url_to_postid_custom_post_type() {
         delete_option( 'rewrite_rules' );
-        
+
         $post_type = rand_str( 12 );
         register_post_type( $post_type, array( 'public' => true ) );
-        
+
         $id = $this->factory->post->create( array( 'post_type' => $post_type ) );
-        $this->assertEquals( $id, url_to_postid( get_permalink( $id ) ) );      
-        
-        _unregister_post_type( $post_type );        
+        $this->assertEquals( $id, url_to_postid( get_permalink( $id ) ) );
+
+        _unregister_post_type( $post_type );
     }
-    
+
     function test_url_to_postid_hierarchical() {