Changeset 51419 for trunk/tests/phpunit/tests/admin/includesScreen.php

Timestamp:

07/13/2021 04:13:01 PM (3 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/admin/includesScreen.php (modified) (6 diffs)

trunk/tests/phpunit/tests/admin/includesScreen.php

@@ -156 +156 @@
     );
 
-    function setUp() {
-        parent::setUp();
-        set_current_screen( 'front' );
-    }
-
     function tearDown() {
         unset( $GLOBALS['wp_taxonomies']['old-or-new'] );
-        unset( $GLOBALS['screen'] );
-        unset( $GLOBALS['current_screen'] );
         parent::tearDown();
     }
@@ -312 +305 @@
         );
 
+        set_current_screen( 'edit.php' );
         $screen = get_current_screen();
         $screen->add_help_tab( $tab_args );
@@ -373 +367 @@
         );
 
+        set_current_screen( 'edit.php' );
         $screen = get_current_screen();
 
@@ -441 +436 @@
         );
 
+        set_current_screen( 'edit.php' );
         $screen = get_current_screen();
 
@@ -457 +453 @@
 
     function test_in_admin() {
-        $screen = get_current_screen();
-
         set_current_screen( 'edit.php' );
         $this->assertTrue( get_current_screen()->in_admin() );
@@ -482 +476 @@
         $this->assertFalse( get_current_screen()->in_admin( 'network' ) );
         $this->assertFalse( get_current_screen()->in_admin( 'user' ) );
-
-        $GLOBALS['current_screen'] = $screen;
     }