Changeset 37222

Timestamp:

04/16/2016 07:21:49 PM (9 years ago)

Author:

jeremyfelt

Message:

Tests: Run network option tests as single and multisite

The _network_option() functions are available to all and
internally use _option() functions as a fallback. We should
be testing for that scenario as well.

Fixes #36552.

File:

• trunk/tests/phpunit/tests/option/networkOption.php (modified) (5 diffs)

trunk/tests/phpunit/tests/option/networkOption.php

@@ -1 +1 @@
 <?php
 
-if ( is_multisite() ) :
-
 /**
- * Tests specific to network options in Multisite.
+ * Tests specific to managing network options in multisite.
+ *
+ * Some tests will run in single site as the `_network_option()` functions
+ * are available and internally use `_option()` functions as fallbacks.
  *
  * @group option
@@ -12 +13 @@
 class Tests_Option_NetworkOption extends WP_UnitTestCase {
     function test_add_network_option_not_available_on_other_network() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( 'Test requires multisite' );
+        }
+
         $id = self::factory()->network->create();
         $option = rand_str();
@@ -21 +26 @@
 
     function test_add_network_option_available_on_same_network() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( 'Test requires multisite' );
+        }
+
         $id = self::factory()->network->create();
         $option = rand_str();
@@ -30 +39 @@
 
     function test_delete_network_option_on_only_one_network() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( 'Test requires multisite' );
+        }
+
         $id = self::factory()->network->create();
         $option = rand_str();
@@ -84 +97 @@
     }
 }
-
-endif;