Unit Tests: since [32953], we can just use self::delete_user() instead of using if logic for Multisite.

See #30017, #33968.


git-svn-id: https://develop.svn.wordpress.org/trunk@35224 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor
2015-10-16 19:51:32 +00:00
parent 0d4a7ee029
commit 84272ff8cd
11 changed files with 42 additions and 84 deletions

View File

@@ -29,11 +29,7 @@ class Tests_User extends WP_UnitTestCase {
public static function wpTearDownAfterClass() {
$ids = array( self::$test_id, self::$author_id );
foreach ( $ids as $id ) {
if ( is_multisite() ) {
wpmu_delete_user( $id );
} else {
wp_delete_user( $id );
}
self::delete_user( $id );
}
}
@@ -595,7 +591,7 @@ class Tests_User extends WP_UnitTestCase {
'ID' => $id2,
'user_email' => 'blackburn@battlefield4.com',
) );
if ( ! defined( 'WP_IMPORTING' ) ) {
$this->assertWPError( $return );
}
@@ -652,7 +648,7 @@ class Tests_User extends WP_UnitTestCase {
}
function _illegal_user_logins() {
return array( 'testuser' );
return array( 'testuser' );
}
/**