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

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

@@ -616 +616 @@
      */
     function test_super_admin_caps() {
-        $this->skipWithoutMultisite();
-
         $caps = $this->getAllCapsAndRoles();
         $user = self::$super_admin;
@@ -1361 +1359 @@
      */
     function test_borked_current_user_can_for_blog() {
-        $this->skipWithoutMultisite();
-
         $orig_blog_id = get_current_blog_id();
         $blog_id = self::factory()->blog->create();
@@ -1422 +1418 @@
      */
     function test_multisite_administrator_can_not_edit_users() {
-        $this->skipWithoutMultisite();
-
         $user = self::$users['administrator'];
         $other_user = self::$users['subscriber'];
@@ -1456 +1450 @@
      */
     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 ) );
 
@@ -1471 +1463 @@
      */
     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 ) );
 
@@ -1530 +1520 @@
      */
     function test_multisite_administrator_with_manage_network_users_can_edit_users() {
-        $this->skipWithoutMultisite();
-
         $user = self::$users['administrator'];
         $user->add_cap( 'manage_network_users' );
@@ -1549 +1537 @@
      */
     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' );
@@ -1775 +1761 @@
      */
     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 ) );