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

Timestamp:

04/23/2017 09:57:31 PM (9 years ago)

Author:

johnbillion

Message:

Build/Test Tools: Introduce skipWithoutMultisite() and skipWithMultisite() methods into the test suite.

This brings much needed uniformity to test skipping when a test requires Multisite or when a test should be excluded from running when Multisite is enabled.

Used in conjunction with the @group ms-required and @group ms-excluded notation, this removes a significant number of skipped tests from the default test suite run.

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() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( 'Test requires multisite.' );
-        }
+        $this->skipWithoutMultisite();
 
         $this->allow_user_to_manage_multisite();
@@ -1029 +1027 @@
      */
     public function test_create_new_network_user_on_sub_site_adds_user_to_site() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( 'Test requires multisite.' );
-        }
+        $this->skipWithoutMultisite();
 
         $this->allow_user_to_manage_multisite();
@@ -1065 +1061 @@
      */
     public function test_create_existing_network_user_on_sub_site_has_error() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( 'Test requires multisite.' );
-        }
+        $this->skipWithoutMultisite();
 
         $this->allow_user_to_manage_multisite();
@@ -1455 +1449 @@
      */
     public function test_update_user_role_invalid_privilege_deescalation() {
-        if ( is_multisite() ) {
-            return $this->markTestSkipped( 'Test only intended for single site.' );
-        }
+        $this->skipWithMultisite();
 
         $user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
@@ -1488 +1480 @@
      */
     public function test_update_user_role_privilege_deescalation_multisite() {
-        if ( ! is_multisite() ) {
-            return $this->markTestSkipped( 'Test only intended for multisite.' );
-        }
+        $this->skipWithoutMultisite();
 
         $user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
@@ -2239 +2229 @@
      */
     public function test_get_item_from_different_site_as_site_administrator() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( 'Test only runs in multisite' );
-        }
+        $this->skipWithoutMultisite();
 
         switch_to_blog( self::$site );
@@ -2261 +2249 @@
      */
     public function test_get_item_from_different_site_as_network_administrator() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( 'Test only runs in multisite' );
-        }
+        $this->skipWithoutMultisite();
 
         switch_to_blog( self::$site );
@@ -2283 +2269 @@
      */
     public function test_update_item_from_different_site_as_site_administrator() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( 'Test only runs in multisite' );
-        }
+        $this->skipWithoutMultisite();
 
         switch_to_blog( self::$site );
@@ -2307 +2291 @@
      */
     public function test_update_item_from_different_site_as_network_administrator() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( 'Test only runs in multisite' );
-        }
+        $this->skipWithoutMultisite();
 
         switch_to_blog( self::$site );
@@ -2331 +2313 @@
      */
     public function test_delete_item_from_different_site_as_site_administrator() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( 'Test only runs in multisite' );
-        }
+        $this->skipWithoutMultisite();
 
         switch_to_blog( self::$site );
@@ -2355 +2335 @@
      */
     public function test_delete_item_from_different_site_as_network_administrator() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( 'Test only runs in multisite' );
-        }
+        $this->skipWithoutMultisite();
 
         switch_to_blog( self::$site );