Changeset 40564 for trunk/tests/phpunit/tests/rest-api/rest-users-controller.php

Timestamp:

05/01/2017 08:34:10 PM (8 years ago)

Author:

johnbillion

Message:

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

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

File:

• trunk/tests/phpunit/tests/rest-api/rest-users-controller.php (modified) (11 diffs)

trunk/tests/phpunit/tests/rest-api/rest-users-controller.php

@@ -997 +997 @@
      */
     public function test_create_new_network_user_on_site_does_not_add_user_to_sub_site() {
-        $this->skipWithoutMultisite();
-
         $this->allow_user_to_manage_multisite();
 
@@ -1027 +1025 @@
      */
     public function test_create_new_network_user_on_sub_site_adds_user_to_site() {
-        $this->skipWithoutMultisite();
-
         $this->allow_user_to_manage_multisite();
 
@@ -1061 +1057 @@
      */
     public function test_create_existing_network_user_on_sub_site_has_error() {
-        $this->skipWithoutMultisite();
-
         $this->allow_user_to_manage_multisite();
 
@@ -1449 +1443 @@
      */
     public function test_update_user_role_invalid_privilege_deescalation() {
-        $this->skipWithMultisite();
-
         $user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
 
@@ -1480 +1472 @@
      */
     public function test_update_user_role_privilege_deescalation_multisite() {
-        $this->skipWithoutMultisite();
-
         $user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
 
@@ -2229 +2219 @@
      */
     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(
@@ -2249 +2237 @@
      */
     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(
@@ -2269 +2255 @@
      */
     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(
@@ -2291 +2275 @@
      */
     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(
@@ -2313 +2295 @@
      */
     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(
@@ -2335 +2315 @@
      */
     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(