vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-05-19 18:54:26 +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

22
tests/phpunit/tests/rest-api/rest-users-controller.php
View File

@@ -996,8 +996,6 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
* @group ms-required
*/
public function test_create_new_network_user_on_site_does_not_add_user_to_sub_site() {
$this->skipWithoutMultisite();
$this->allow_user_to_manage_multisite();
$params = array(
@@ -1026,8 +1024,6 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
* @group ms-required
*/
public function test_create_new_network_user_on_sub_site_adds_user_to_site() {
$this->skipWithoutMultisite();
$this->allow_user_to_manage_multisite();
$params = array(
@@ -1060,8 +1056,6 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
* @group ms-required
*/
public function test_create_existing_network_user_on_sub_site_has_error() {
$this->skipWithoutMultisite();
$this->allow_user_to_manage_multisite();
$params = array(
@@ -1448,8 +1442,6 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
* @group ms-excluded
*/
public function test_update_user_role_invalid_privilege_deescalation() {
$this->skipWithMultisite();
$user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
wp_set_current_user( $user_id );
@@ -1479,8 +1471,6 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
* @group ms-required
*/
public function test_update_user_role_privilege_deescalation_multisite() {
$this->skipWithoutMultisite();
$user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
wp_set_current_user( $user_id );
@@ -2228,8 +2218,6 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
* @group ms-required
*/
public function test_get_item_from_different_site_as_site_administrator() {
$this->skipWithoutMultisite();
switch_to_blog( self::$site );
$user_id = $this->factory->user->create( array(
'role' => 'author',
@@ -2248,8 +2236,6 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
* @group ms-required
*/
public function test_get_item_from_different_site_as_network_administrator() {
$this->skipWithoutMultisite();
switch_to_blog( self::$site );
$user_id = $this->factory->user->create( array(
'role' => 'author',
@@ -2268,8 +2254,6 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
* @group ms-required
*/
public function test_update_item_from_different_site_as_site_administrator() {
$this->skipWithoutMultisite();
switch_to_blog( self::$site );
$user_id = $this->factory->user->create( array(
'role' => 'author',
@@ -2290,8 +2274,6 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
* @group ms-required
*/
public function test_update_item_from_different_site_as_network_administrator() {
$this->skipWithoutMultisite();
switch_to_blog( self::$site );
$user_id = $this->factory->user->create( array(
'role' => 'author',
@@ -2312,8 +2294,6 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
* @group ms-required
*/
public function test_delete_item_from_different_site_as_site_administrator() {
$this->skipWithoutMultisite();
switch_to_blog( self::$site );
$user_id = $this->factory->user->create( array(
'role' => 'author',
@@ -2334,8 +2314,6 @@ class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
* @group ms-required
*/
public function test_delete_item_from_different_site_as_network_administrator() {
$this->skipWithoutMultisite();
switch_to_blog( self::$site );
$user_id = $this->factory->user->create( array(
'role' => 'author',