sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix db_version juggling during non-multisite tests.

Browse Source 
Continuing with the "code is poetry" theme after [34719], we need to continue
to update the option in the database on non-multisite in this
`wp_insert_term()` test.

See #31130.

git-svn-id: https://develop.svn.wordpress.org/trunk@34720 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Boone Gorges 2015-09-30 13:27:09 +00:00
parent 13e28a6d34
commit 9dd6f369cf
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,8 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
protected static $hooks_saved = array(); protected static $hooks_saved = array();
protected static $ignore_files; protected static $ignore_files;
protected $db_version;
/** /**
* @var WP_UnitTest_Factory * @var WP_UnitTest_Factory
*/ */
@ -64,8 +66,8 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
* *
* See #31130. * See #31130.
*/ */
if ( is_multisite() ) {
$this->db_version = get_option( 'db_version' ); $this->db_version = get_option( 'db_version' );
if ( is_multisite() ) {
add_filter( 'pre_option_db_version', array( $this, 'db_version' ) ); add_filter( 'pre_option_db_version', array( $this, 'db_version' ) );
} }
} }

11
tests/phpunit/tests/term/wpInsertTerm.php
View File

@ -469,8 +469,14 @@ class Tests_Term_WpInsertTerm extends WP_UnitTestCase {
*/ */
public function test_wp_insert_term_duplicate_slug_different_taxonomy_before_410_schema_change() { public function test_wp_insert_term_duplicate_slug_different_taxonomy_before_410_schema_change() {
// See #31130.
$old_db_version = 30055;
if ( is_multisite() ) {
$_db_version = $this->db_version; $_db_version = $this->db_version;
$this->db_version = 30055; $this->db_version = $old_db_version;
} else {
update_option( 'db_version', $old_db_version );
}
register_taxonomy( 'wptests_tax', 'post' ); register_taxonomy( 'wptests_tax', 'post' );
register_taxonomy( 'wptests_tax_2', 'post' ); register_taxonomy( 'wptests_tax_2', 'post' );
@ -497,7 +503,10 @@ class Tests_Term_WpInsertTerm extends WP_UnitTestCase {
$this->assertSame( 'foo-2', $new_term->slug ); $this->assertSame( 'foo-2', $new_term->slug );
$this->assertNotEquals( $new_term->term_id, $term->term_id ); $this->assertNotEquals( $new_term->term_id, $term->term_id );
if ( is_multisite() ) {
$this->db_version = $_db_version; $this->db_version = $_db_version;
}
_unregister_taxonomy( 'wptests_tax', 'post' ); _unregister_taxonomy( 'wptests_tax', 'post' );
} }