Changeset 34810 for trunk/tests/phpunit/includes/testcase.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/includes/testcase.php (modified) (2 diffs)

trunk/tests/phpunit/includes/testcase.php

@@ -51 +51 @@
             $this->reset_taxonomies();
             $this->reset_post_statuses();
-            $this->reset_permalinks();
+            $this->set_permalink_structure();
         }
 
@@ -654 +654 @@
      *
      * @global WP_Rewrite $wp_rewrite
-     */
-    public function reset_permalinks() {
+     *
+     * @param string $structure Optional. Permalink structure to set. Default empty.
+     */
+    public function set_permalink_structure( $structure = '' ) {
         global $wp_rewrite;
 
         $wp_rewrite->init();
-        $wp_rewrite->set_permalink_structure( '' );
+        $wp_rewrite->set_permalink_structure( $structure );
         $wp_rewrite->flush_rules();
     }