vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-05-22 04:04:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Build/Test Tools: Automatically skip tests in the ms-required and ms-excluded groups.

Browse Source 
This removes the need to manually call `$this->skipWithMultisite()` and `$this->skipWithoutMultisite()` from within the test when the test only runs without Multisite or only runs on Multisite, respectively.

Props jdgrimes for the suggestion.

Fixes #40531


git-svn-id: https://develop.svn.wordpress.org/trunk@40564 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
John Blackbourn
2017-05-01 20:34:10 +00:00
parent f72ce6dc6e
commit c759785cea
20 changed files with 11 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/phpunit/tests/user/capabilities.php
View File

@@ -615,8 +615,6 @@ class Tests_User_Capabilities extends WP_UnitTestCase {
* @group ms-required
*/
function test_super_admin_caps() {
$this->skipWithoutMultisite();
$caps = $this->getAllCapsAndRoles();
$user = self::$super_admin;
@@ -1360,8 +1358,6 @@ class Tests_User_Capabilities extends WP_UnitTestCase {
* @group ms-required
*/
function test_borked_current_user_can_for_blog() {
$this->skipWithoutMultisite();
$orig_blog_id = get_current_blog_id();
$blog_id = self::factory()->blog->create();
@@ -1421,8 +1417,6 @@ class Tests_User_Capabilities extends WP_UnitTestCase {
* @group ms-required
*/
function test_multisite_administrator_can_not_edit_users() {
$this->skipWithoutMultisite();
$user = self::$users['administrator'];
$other_user = self::$users['subscriber'];
@@ -1455,8 +1449,6 @@ class Tests_User_Capabilities extends WP_UnitTestCase {
* @group ms-required
*/
public function test_only_super_admins_can_delete_users_on_multisite() {
$this->skipWithoutMultisite();
$this->assertTrue( user_can( self::$super_admin->ID, 'delete_user', self::$users['subscriber']->ID ) );
$this->assertFalse( user_can( self::$users['administrator']->ID, 'delete_user', self::$users['subscriber']->ID ) );
@@ -1470,8 +1462,6 @@ class Tests_User_Capabilities extends WP_UnitTestCase {
* @group ms-excluded
*/
public function test_only_admins_can_delete_users_on_single_site() {
$this->skipWithMultisite();
$this->assertTrue( user_can( self::$users['administrator']->ID, 'delete_user', self::$users['subscriber']->ID ) );
$this->assertFalse( user_can( self::$users['editor']->ID, 'delete_user', self::$users['subscriber']->ID ) );
@@ -1529,8 +1519,6 @@ class Tests_User_Capabilities extends WP_UnitTestCase {
* @group ms-required
*/
function test_multisite_administrator_with_manage_network_users_can_edit_users() {
$this->skipWithoutMultisite();
$user = self::$users['administrator'];
$user->add_cap( 'manage_network_users' );
$other_user = self::$users['subscriber'];
@@ -1548,8 +1536,6 @@ class Tests_User_Capabilities extends WP_UnitTestCase {
* @group ms-required
*/
function test_multisite_administrator_with_manage_network_users_can_not_edit_super_admin() {
$this->skipWithoutMultisite();
$user = self::$users['administrator'];
$user->add_cap( 'manage_network_users' );
@@ -1774,8 +1760,6 @@ class Tests_User_Capabilities extends WP_UnitTestCase {
* @group ms-required
*/
public function test_only_super_admins_can_remove_themselves_on_multisite() {
$this->skipWithoutMultisite();
$this->assertTrue( user_can( self::$super_admin->ID, 'remove_user', self::$super_admin->ID ) );
$this->assertFalse( user_can( self::$users['administrator']->ID, 'remove_user', self::$users['administrator']->ID ) );