Changeset 34807

Timestamp:

10/03/2015 07:26:24 PM (9 years ago)

Author:

DrewAPicture

Message:

Tests: Last try: It's redundant to reset permalinks on tearDown() if we're already doing it on every setUp().

Removes the restoration logic, which leveraged a static property initialized with get_option().

See #33968.

File:

• trunk/tests/phpunit/includes/testcase.php (modified) (4 diffs)

trunk/tests/phpunit/includes/testcase.php

@@ -16 +16 @@
 
     protected $db_version;
-
-    public static $default_permalink_structure;
 
     /**
@@ -42 +40 @@
         $this->factory = new WP_UnitTest_Factory;
         $this->clean_up_global_scope();
-
-        self::$default_permalink_structure = get_option( 'permalink_structure' );
 
         /*
@@ -105 +101 @@
         $this->_restore_hooks();
         wp_set_current_user( 0 );
-
-        $this->reset_permalinks( $restore = true );
     }
 
@@ -657 +651 @@
      * Utility method that resets permalinks and flushes rewrites.
      *
-     * Collects the current permalink structure and stores it in a class property for use
-     * by sub-classes.
-     *
      * @since 4.4.0
      *
      * @global WP_Rewrite $wp_rewrite
-     *
-     * @param bool $restore_default Optional. Whether to restore the default permalink structure.
-     *                              Default false.
-     */
-    public function reset_permalinks( $restore_default = false ) {
+     */
+    public function reset_permalinks() {
         global $wp_rewrite;
 
-        if ( ! $restore_default ) {
-            $wp_rewrite->init();
-            $wp_rewrite->set_permalink_structure( '' );
-        } else {
-            $wp_rewrite->set_permalink_structure( self::$default_permalink_structure );
-        }
-
+        $wp_rewrite->init();
+        $wp_rewrite->set_permalink_structure( '' );
         $wp_rewrite->flush_rules();
     }