Changeset 40543 for trunk/tests/phpunit/tests/adminbar.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/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() {
-        if ( is_multisite() ) {
-            $this->markTestSkipped( 'Test does not run in multisite' );
-        }
+        $this->skipWithMultisite();
 
         $this->assertFalse( user_can( self::$no_role_id, 'read' ) );
@@ -105 +103 @@
      */
     public function test_admin_bar_contains_correct_links_for_users_with_role() {
-        if ( is_multisite() ) {
-            $this->markTestSkipped( 'Test does not run in multisite' );
-        }
+        $this->skipWithMultisite();
 
         $this->assertTrue( user_can( self::$editor_id, 'read' ) );
@@ -137 +133 @@
      */
     public function test_admin_bar_contains_correct_links_for_users_with_no_role_on_blog() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( 'Test only runs in multisite' );
-        }
+        $this->skipWithoutMultisite();
 
         $blog_id = self::factory()->blog->create( array(
@@ -188 +182 @@
      */
     public function test_admin_bar_contains_correct_links_for_users_with_no_role_on_network() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( 'Test only runs in multisite' );
-        }
+        $this->skipWithoutMultisite();
 
         $this->assertTrue( user_can( self::$admin_id, 'read' ) );
@@ -433 +425 @@
      */
     public function test_admin_bar_contains_correct_about_link_for_users_with_role() {
-        if ( is_multisite() ) {
-            $this->markTestSkipped( 'Test does not run in multisite' );
-        }
+        $this->skipWithMultisite();
 
         wp_set_current_user( self::$editor_id );
@@ -454 +444 @@
      */
     public function test_admin_bar_contains_correct_about_link_for_users_with_no_role() {
-        if ( is_multisite() ) {
-            $this->markTestSkipped( 'Test does not run in multisite' );
-        }
+        $this->skipWithMultisite();
 
         wp_set_current_user( self::$no_role_id );
@@ -477 +465 @@
      */
     public function test_admin_bar_contains_correct_about_link_for_users_with_no_role_in_multisite() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( 'Test only runs in multisite' );
-        }
+        $this->skipWithoutMultisite();
 
         // User is not a member of a site.
@@ -597 +583 @@
      */
     public function test_my_sites_network_menu_for_regular_user() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( 'Test only runs in multisite' );
-        }
+        $this->skipWithoutMultisite();
 
         wp_set_current_user( self::$editor_id );
@@ -616 +600 @@
      */
     public function test_my_sites_network_menu_for_super_admin() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( 'Test only runs in multisite' );
-        }
+        $this->skipWithoutMultisite();
 
         wp_set_current_user( self::$editor_id );
@@ -637 +619 @@
      */
     public function test_my_sites_network_menu_for_regular_user_with_network_caps() {
+        $this->skipWithoutMultisite();
+
         global $current_user;
-
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( 'Test only runs in multisite' );
-        }
 
         $network_user_caps = array( 'manage_network', 'manage_network_themes', 'manage_network_plugins' );