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

trunk/tests/phpunit/tests/adminbar.php

@@ -76 +76 @@
      */
     public function test_admin_bar_contains_correct_links_for_users_with_no_role() {
-        $this->skipWithMultisite();
-
         $this->assertFalse( user_can( self::$no_role_id, 'read' ) );
 
@@ -103 +101 @@
      */
     public function test_admin_bar_contains_correct_links_for_users_with_role() {
-        $this->skipWithMultisite();
-
         $this->assertTrue( user_can( self::$editor_id, 'read' ) );
 
@@ -133 +129 @@
      */
     public function test_admin_bar_contains_correct_links_for_users_with_no_role_on_blog() {
-        $this->skipWithoutMultisite();
-
         $blog_id = self::factory()->blog->create( array(
             'user_id' => self::$admin_id,
@@ -182 +176 @@
      */
     public function test_admin_bar_contains_correct_links_for_users_with_no_role_on_network() {
-        $this->skipWithoutMultisite();
-
         $this->assertTrue( user_can( self::$admin_id, 'read' ) );
         $this->assertFalse( user_can( self::$no_role_id, 'read' ) );
@@ -425 +417 @@
      */
     public function test_admin_bar_contains_correct_about_link_for_users_with_role() {
-        $this->skipWithMultisite();
-
         wp_set_current_user( self::$editor_id );
 
@@ -444 +434 @@
      */
     public function test_admin_bar_contains_correct_about_link_for_users_with_no_role() {
-        $this->skipWithMultisite();
-
         wp_set_current_user( self::$no_role_id );
 
@@ -465 +453 @@
      */
     public function test_admin_bar_contains_correct_about_link_for_users_with_no_role_in_multisite() {
-        $this->skipWithoutMultisite();
-
         // User is not a member of a site.
         remove_user_from_blog( self::$no_role_id, get_current_blog_id() );
@@ -583 +569 @@
      */
     public function test_my_sites_network_menu_for_regular_user() {
-        $this->skipWithoutMultisite();
-
         wp_set_current_user( self::$editor_id );
 
@@ -600 +584 @@
      */
     public function test_my_sites_network_menu_for_super_admin() {
-        $this->skipWithoutMultisite();
-
         wp_set_current_user( self::$editor_id );
 
@@ -619 +601 @@
      */
     public function test_my_sites_network_menu_for_regular_user_with_network_caps() {
-        $this->skipWithoutMultisite();
-
         global $current_user;