Changeset 40543 for trunk/tests/phpunit/tests/link/getDashboardUrl.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/link/getDashboardUrl.php (modified) (2 diffs)

trunk/tests/phpunit/tests/link/getDashboardUrl.php

@@ -42 +42 @@
          */
         public function test_get_dashboard_url_for_network_administrator_with_no_sites() {
-                if ( ! is_multisite() ) {
-                        $this->markTestSkipped( 'Test only runs in multisite.' );
-                }
+                $this->skipWithoutMultisite();
 
                 grant_super_admin( self::$user_id );
@@ -63 +61 @@
          */
         public function test_get_dashboard_url_for_administrator_of_different_site() {
-                if ( ! is_multisite() ) {
-                        $this->markTestSkipped( 'Test only runs in multisite.' );
-                }
+                $this->skipWithoutMultisite();
 
                 $site_id = self::factory()->blog->create( array( 'user_id' => self::$user_id ) );