Changeset 40543 for trunk/tests/phpunit/tests/user/capabilities.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/user/capabilities.php (modified) (8 diffs)

trunk/tests/phpunit/tests/user/capabilities.php

@@ -616 +616 @@
      */
     function test_super_admin_caps() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( 'Test only runs in multisite' );
-        }
+        $this->skipWithoutMultisite();
+
         $caps = $this->getAllCapsAndRoles();
         $user = self::$super_admin;
@@ -1362 +1361 @@
      */
     function test_borked_current_user_can_for_blog() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( 'Test only runs in multisite' );
-        }
+        $this->skipWithoutMultisite();
 
         $orig_blog_id = get_current_blog_id();
@@ -1425 +1422 @@
      */
     function test_multisite_administrator_can_not_edit_users() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( 'Test only runs in multisite' );
-        }
+        $this->skipWithoutMultisite();
 
         $user = self::$users['administrator'];
@@ -1461 +1456 @@
      */
     public function test_only_super_admins_can_delete_users_on_multisite() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( 'Test only runs on multisite' );
-        }
+        $this->skipWithoutMultisite();
 
         $this->assertTrue( user_can( self::$super_admin->ID,             'delete_user', self::$users['subscriber']->ID ) );
@@ -1478 +1471 @@
      */
     public function test_only_admins_can_delete_users_on_single_site() {
-        if ( is_multisite() ) {
-            $this->markTestSkipped( 'Test does not run on multisite' );
-        }
+        $this->skipWithMultisite();
 
         $this->assertTrue( user_can( self::$users['administrator']->ID, 'delete_user', self::$users['subscriber']->ID ) );
@@ -1539 +1530 @@
      */
     function test_multisite_administrator_with_manage_network_users_can_edit_users() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( 'Test only runs in multisite' );
-        }
+        $this->skipWithoutMultisite();
 
         $user = self::$users['administrator'];
@@ -1560 +1549 @@
      */
     function test_multisite_administrator_with_manage_network_users_can_not_edit_super_admin() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( 'Test only runs in multisite' );
-        }
+        $this->skipWithoutMultisite();
 
         $user = self::$users['administrator'];
@@ -1784 +1771 @@
      */
     public function test_only_super_admins_can_remove_themselves_on_multisite() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( 'Test only runs in multisite.' );
-        }
+        $this->skipWithoutMultisite();
 
         $this->assertTrue( user_can( self::$super_admin->ID, 'remove_user', self::$super_admin->ID ) );