Code is Poetry.

WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.



git-svn-id: https://develop.svn.wordpress.org/trunk@42343 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Gary Pendergast
2017-11-30 23:09:33 +00:00
parent ec6a089f98
commit 8f95800d52
1103 changed files with 105978 additions and 78184 deletions
+159 -103
View File
@@ -13,40 +13,56 @@ class Tests_User_CountUsers extends WP_UnitTestCase {
*/
public function test_count_users_is_accurate( $strategy ) {
// Setup users
$admin = self::factory()->user->create( array(
'role' => 'administrator',
) );
$editor = self::factory()->user->create( array(
'role' => 'editor',
) );
$author = self::factory()->user->create( array(
'role' => 'author',
) );
$contributor = self::factory()->user->create( array(
'role' => 'contributor',
) );
$subscriber = self::factory()->user->create( array(
'role' => 'subscriber',
) );
$none = self::factory()->user->create( array(
'role' => '',
) );
$nobody = self::factory()->user->create( array(
'role' => '',
) );
$admin = self::factory()->user->create(
array(
'role' => 'administrator',
)
);
$editor = self::factory()->user->create(
array(
'role' => 'editor',
)
);
$author = self::factory()->user->create(
array(
'role' => 'author',
)
);
$contributor = self::factory()->user->create(
array(
'role' => 'contributor',
)
);
$subscriber = self::factory()->user->create(
array(
'role' => 'subscriber',
)
);
$none = self::factory()->user->create(
array(
'role' => '',
)
);
$nobody = self::factory()->user->create(
array(
'role' => '',
)
);
// Test user counts
$count = count_users( $strategy );
$this->assertEquals( 8, $count['total_users'] );
$this->assertEquals( array(
'administrator' => 2,
'editor' => 1,
'author' => 1,
'contributor' => 1,
'subscriber' => 1,
'none' => 2,
), $count['avail_roles'] );
$this->assertEquals(
array(
'administrator' => 2,
'editor' => 1,
'author' => 1,
'contributor' => 1,
'subscriber' => 1,
'none' => 2,
), $count['avail_roles']
);
}
@@ -60,35 +76,53 @@ class Tests_User_CountUsers extends WP_UnitTestCase {
*/
public function test_count_users_multisite_is_accurate( $strategy ) {
// Setup users
$admin = self::factory()->user->create( array(
'role' => 'administrator',
) );
$editor = self::factory()->user->create( array(
'role' => 'editor',
) );
$author = self::factory()->user->create( array(
'role' => 'author',
) );
$contributor = self::factory()->user->create( array(
'role' => 'contributor',
) );
$subscriber = self::factory()->user->create( array(
'role' => 'subscriber',
) );
$none = self::factory()->user->create( array(
'role' => '',
) );
$nobody = self::factory()->user->create( array(
'role' => '',
) );
$admin = self::factory()->user->create(
array(
'role' => 'administrator',
)
);
$editor = self::factory()->user->create(
array(
'role' => 'editor',
)
);
$author = self::factory()->user->create(
array(
'role' => 'author',
)
);
$contributor = self::factory()->user->create(
array(
'role' => 'contributor',
)
);
$subscriber = self::factory()->user->create(
array(
'role' => 'subscriber',
)
);
$none = self::factory()->user->create(
array(
'role' => '',
)
);
$nobody = self::factory()->user->create(
array(
'role' => '',
)
);
// Setup blogs
$blog_1 = (int) self::factory()->blog->create( array(
'user_id' => $editor,
) );
$blog_2 = (int) self::factory()->blog->create( array(
'user_id' => $author,
) );
$blog_1 = (int) self::factory()->blog->create(
array(
'user_id' => $editor,
)
);
$blog_2 = (int) self::factory()->blog->create(
array(
'user_id' => $author,
)
);
// Add users to blogs
add_user_to_blog( $blog_1, $subscriber, 'editor' );
@@ -98,14 +132,16 @@ class Tests_User_CountUsers extends WP_UnitTestCase {
$count = count_users( $strategy );
$this->assertEquals( 8, $count['total_users'] );
$this->assertEquals( array(
'administrator' => 2,
'editor' => 1,
'author' => 1,
'contributor' => 1,
'subscriber' => 1,
'none' => 2,
), $count['avail_roles'] );
$this->assertEquals(
array(
'administrator' => 2,
'editor' => 1,
'author' => 1,
'contributor' => 1,
'subscriber' => 1,
'none' => 2,
), $count['avail_roles']
);
// Test users counts on blog 1
switch_to_blog( $blog_1 );
@@ -113,11 +149,13 @@ class Tests_User_CountUsers extends WP_UnitTestCase {
restore_current_blog();
$this->assertEquals( 2, $count['total_users'] );
$this->assertEquals( array(
'administrator' => 1,
'editor' => 1,
'none' => 0,
), $count['avail_roles'] );
$this->assertEquals(
array(
'administrator' => 1,
'editor' => 1,
'none' => 0,
), $count['avail_roles']
);
// Test users counts on blog 2
switch_to_blog( $blog_2 );
@@ -125,11 +163,13 @@ class Tests_User_CountUsers extends WP_UnitTestCase {
restore_current_blog();
$this->assertEquals( 2, $count['total_users'] );
$this->assertEquals( array(
'administrator' => 1,
'contributor' => 1,
'none' => 0,
), $count['avail_roles'] );
$this->assertEquals(
array(
'administrator' => 1,
'contributor' => 1,
'none' => 0,
), $count['avail_roles']
);
}
@@ -145,16 +185,20 @@ class Tests_User_CountUsers extends WP_UnitTestCase {
switch_to_blog( $site_id );
wp_roles()->add_role( 'tester', 'Tester', array( 'test' => true ) );
$user_id = self::factory()->user->create( array(
'role' => 'tester',
) );
$user_id = self::factory()->user->create(
array(
'role' => 'tester',
)
);
restore_current_blog();
$count = count_users( $strategy, $site_id );
$this->assertEqualSetsWithIndex( array(
'tester' => 1,
'none' => 0,
), $count['avail_roles'] );
$this->assertEqualSetsWithIndex(
array(
'tester' => 1,
'none' => 0,
), $count['avail_roles']
);
}
/**
@@ -165,30 +209,38 @@ class Tests_User_CountUsers extends WP_UnitTestCase {
public function test_count_users_is_accurate_with_multiple_roles( $strategy ) {
// Setup users
$admin = self::factory()->user->create( array(
'role' => 'administrator',
) );
$editor = self::factory()->user->create( array(
'role' => 'editor',
) );
$admin = self::factory()->user->create(
array(
'role' => 'administrator',
)
);
$editor = self::factory()->user->create(
array(
'role' => 'editor',
)
);
get_userdata( $editor )->add_role( 'author' );
$this->assertEquals( array(
'editor',
'author'
), get_userdata( $editor )->roles );
$this->assertEquals(
array(
'editor',
'author',
), get_userdata( $editor )->roles
);
// Test user counts
$count = count_users( $strategy );
$this->assertEquals( 3, $count['total_users'] );
$this->assertEquals( array(
'administrator' => 2,
'editor' => 1,
'author' => 1,
'none' => 0,
), $count['avail_roles'] );
$this->assertEquals(
array(
'administrator' => 2,
'editor' => 1,
'author' => 1,
'none' => 0,
), $count['avail_roles']
);
}
@@ -203,14 +255,18 @@ class Tests_User_CountUsers extends WP_UnitTestCase {
// Get a 'before' count for comparison.
$count = count_users( $strategy );
$u = self::factory()->user->create( array(
'role' => 'editor',
) );
$u = self::factory()->user->create(
array(
'role' => 'editor',
)
);
// Manually delete the user, but leave the capabilities usermeta.
$wpdb->delete( $wpdb->users, array(
'ID' => $u,
) );
$wpdb->delete(
$wpdb->users, array(
'ID' => $u,
)
);
$count2 = count_users( $strategy );