Changeset 36741

Timestamp:

02/26/2016 08:28:07 PM (11 years ago)

Author:

boonebgorges

Message:

Tests: Don't modify global state before checking whether to skip get_locale() tests.

Introduced in [36740].

Props ocean90.
See #35965.

File:

• trunk/tests/phpunit/tests/l10n/getLocale.php (modified) (3 diffs)

trunk/tests/phpunit/tests/l10n/getLocale.php

@@ -19 +19 @@
 
         public function test_local_option_should_take_precedence_on_multisite() {
+                if ( ! is_multisite() ) {
+                        $this->markTestSkipped( __METHOD__ . ' requires Multisite' );
+                }
+
                 global $locale;
                 $old_locale = $locale;
                 $locale = null;
-
-                if ( ! is_multisite() ) {
-                        $this->markTestSkipped( __METHOD__ . ' requires Multisite' );
-                }
 
                 update_option( 'WPLANG', 'en_GB' );
@@ -37 +37 @@
 
         public function test_network_option_should_be_fallback_on_multisite() {
+                if ( ! is_multisite() ) {
+                        $this->markTestSkipped( __METHOD__ . ' requires Multisite' );
+                }
+
                 global $locale;
                 $old_locale = $locale;
                 $locale = null;
-
-                if ( ! is_multisite() ) {
-                        $this->markTestSkipped( __METHOD__ . ' requires Multisite' );
-                }
 
                 update_site_option( 'WPLANG', 'es_ES' );
@@ -54 +54 @@
 
         public function test_option_should_be_respected_on_nonmultisite() {
+                if ( is_multisite() ) {
+                        $this->markTestSkipped( __METHOD__ . ' does not apply to Multisite' );
+                }
+
                 global $locale;
                 $old_locale = $locale;
                 $locale = null;
-
-                if ( is_multisite() ) {
-                        $this->markTestSkipped( __METHOD__ . ' does not apply to Multisite' );
-                }
 
                 update_option( 'WPLANG', 'es_ES' );