mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-01-17 21:08:44 +01:00
Code Issues Actions 99 Packages Projects Releases Wiki Activity

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

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

See #33968.


git-svn-id: https://develop.svn.wordpress.org/trunk@34807 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Drew Jaynes 2015-10-03 19:26:24 +00:00
parent 3b89b3ca28
commit 01f25fa247
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/phpunit/includes/testcase.php
View File

@ -16,8 +16,6 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
protected $db_version;
public static $default_permalink_structure;
/**
* @var WP_UnitTest_Factory
*/
@ -42,8 +40,6 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
$this->factory = new WP_UnitTest_Factory;
$this->clean_up_global_scope();
self::$default_permalink_structure = get_option( 'permalink_structure' );
/*
* When running core tests, ensure that post types and taxonomies
* are reset for each test. We skip this step for non-core tests,
@ -104,8 +100,6 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
remove_filter( 'wp_die_handler', array( $this, 'get_wp_die_handler' ) );
$this->_restore_hooks();
wp_set_current_user( 0 );
$this->reset_permalinks( $restore = true );
}
function clean_up_global_scope() {
@ -656,26 +650,15 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
/**
* 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();
}
}