Changeset 34810 for trunk/tests/phpunit/tests/post.php

Timestamp:

10/03/2015 08:54:11 PM (9 years ago)

Author:

DrewAPicture

Message:

Tests: Permalink Structures Phase II: DRY up logic for setting permalink structures in test methods.

Renames reset_permalinks() to set_permalink_structure() (mimicking $wp_rewrite->set_permalink_structure()) and allows it to accept an optional permalink structure. In this way, we can double dip using it to both set and reset the permalink structure from anywhere.

Removes alot of duplicated code from tests.

See #33968.

File:

• trunk/tests/phpunit/tests/post.php (modified) (3 diffs)

trunk/tests/phpunit/tests/post.php

@@ -416 +416 @@
      */
     public function test_wp_insert_post_should_not_allow_a_bare_numeric_slug_that_might_conflict_with_a_date_archive_when_generating_from_an_empty_post_title() {
-        global $wp_rewrite;
-        $wp_rewrite->init();
-        $wp_rewrite->set_permalink_structure( '/%postname%/' );
-        $wp_rewrite->flush_rules();
+        $this->set_permalink_structure( '/%postname%/' );
 
         $p = wp_insert_post( array(
@@ -430 +427 @@
         $post = get_post( $p );
 
-        $this->reset_permalinks();
+        $this->set_permalink_structure();
 
         $this->assertEquals( "$p-2", $post->post_name );
@@ -506 +503 @@
         // might only fail if the post ID is greater than four characters
 
-        global $wp_rewrite;
-        $wp_rewrite->init();
-        $wp_rewrite->set_permalink_structure('/%year%/%monthnum%/%day%/%postname%/');
-        $wp_rewrite->flush_rules();
+        $this->set_permalink_structure('/%year%/%monthnum%/%day%/%postname%/');
 
         $post = array(