Changeset 51419 for trunk/tests/phpunit/tests/url.php

Timestamp:

07/13/2021 04:13:01 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Tests: Reset $current_screen global between tests to avoid cross-test interdependencies.

This provides a consistent global starting state for tests that interact with admin screens.

Individual tests no longer need to invoke set_current_screen( 'front' ) (or an alternative implementation) as a reset.

Follow-up to [29251], [29860], [31046], [36721], [38678], [48908], [50433].

Props hellofromTonya, johnbillion.
Fixes #53431.

File:

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

trunk/tests/phpunit/tests/url.php

@@ -200 +200 @@
 
         function test_home_url_from_admin() {
-                $screen = get_current_screen();
-
                 // Pretend to be in the site admin.
                 set_current_screen( 'dashboard' );
@@ -244 +242 @@
 
                 update_option( 'home', set_url_scheme( $home, 'http' ) );
-
-                $GLOBALS['current_screen'] = $screen;
         }
 
         function test_network_home_url_from_admin() {
-                $screen = get_current_screen();
-
                 // Pretend to be in the site admin.
                 set_current_screen( 'dashboard' );
@@ -269 +263 @@
                 $_SERVER['HTTPS'] = 'on';
                 $this->assertSame( $home_https, network_home_url() );
-
-                $GLOBALS['current_screen'] = $screen;
         }