Changeset 40543 for trunk/tests/phpunit/tests/theme/WPTheme.php

Timestamp:

04/23/2017 09:57:31 PM (6 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/theme/WPTheme.php (modified) (4 diffs)

trunk/tests/phpunit/tests/theme/WPTheme.php

@@ -149 +149 @@
      */
     function test_wp_theme_network_enable_single_theme() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( 'This test requires multisite' );
-        }
+        $this->skipWithoutMultisite();
 
         $theme = 'testtheme-1';
@@ -170 +168 @@
      */
     function test_wp_theme_network_enable_multiple_themes() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( 'This test requires multisite' );
-        }
+        $this->skipWithoutMultisite();
 
         $themes = array( 'testtheme-2', 'testtheme-3' );
@@ -191 +187 @@
      */
     function test_network_disable_single_theme() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( 'This test requires multisite' );
-        }
+        $this->skipWithoutMultisite();
 
         $current_allowed_themes = get_site_option( 'allowedthemes' );
@@ -216 +210 @@
      */
     function test_network_disable_multiple_themes() {
-        if ( ! is_multisite() ) {
-            $this->markTestSkipped( 'This test requires multisite' );
-        }
+        $this->skipWithoutMultisite();
 
         $current_allowed_themes = get_site_option( 'allowedthemes' );