Changeset 63640

Timestamp:

09/16/2026 05:45:47 PM (24 hours ago)

Author:

lancewillett

Message:

Tests: Restore state after functions tests.

Reset forced admin SSL to its configured startup value after each test. Resynchronize timezone translations with the restored locale after each timezone-choice test, preventing function-static state from leaking between tests.

Developed in: ​https://github.com/WordPress/wordpress-develop/pull/13182

Props jonsurrell, mindctrl.
See #65893.

Location:

trunk/tests/phpunit/tests/functions

Files:

• forceSslAdmin.php (modified) (1 diff)
• wpTimezoneChoice.php (modified) (1 diff)

trunk/tests/phpunit/tests/functions/forceSslAdmin.php

@@ -15 +15 @@
                 // Reset the `$forced` static variable before each test.
                 force_ssl_admin( false );
+        }
+
+        public function tear_down() {
+                // Restore the boot-time value set by wp_ssl_constants().
+                force_ssl_admin( FORCE_SSL_ADMIN );
+
+                parent::tear_down();
         }
 

trunk/tests/phpunit/tests/functions/wpTimezoneChoice.php

@@ -11 +11 @@
 
         /**
-         * Restores the current locale after each test runs.
+         * Restores the current locale and the timezone translations after each test runs.
          */
         public function tear_down(): void {
                 restore_current_locale();
+                wp_timezone_choice( '', get_locale() );
+
                 parent::tear_down();
         }