Changeset 28966 for trunk/tests/phpunit/tests/query/taxQuery.php

Timestamp:

07/03/2014 01:42:57 AM (12 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/query/taxQuery.php (modified) (2 diffs)

trunk/tests/phpunit/tests/query/taxQuery.php

@@ -23 +23 @@
 
         function setUp() {
+                global $wp_rewrite;
                 parent::setUp();
 
                 set_current_screen( 'front' );
 
-                update_option( 'permalink_structure', '/%year%/%monthnum%/%day%/%postname%/' );
-
                 $GLOBALS['wp_the_query'] = new WP_Query();
                 $GLOBALS['wp_query'] = $GLOBALS['wp_the_query'];
+
+                $wp_rewrite->init();
+                $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
 
                 create_initial_taxonomies();
                 register_taxonomy( 'testtax', 'post', array( 'public' => true ) );
 
-                $GLOBALS['wp_rewrite']->init();
-                flush_rewrite_rules();
+                $wp_rewrite->flush_rules();
 
                 $this->tag_id = $this->factory->tag->create( array( 'slug' => 'tag-slug' ) );
@@ -57 +58 @@
 
         function tearDown() {
+                global $wp_rewrite;
                 parent::tearDown();
 
                 _unregister_taxonomy( 'testtax' );
+
+                $wp_rewrite->init();
 
                 remove_action( 'pre_get_posts', array( $this, 'pre_get_posts_tax_category_tax_query' ) );