Changeset 51419 for trunk/tests/phpunit/tests/adminbar.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/adminbar.php (modified) (7 diffs)

trunk/tests/phpunit/tests/adminbar.php

@@ -401 +401 @@
                 $node         = $wp_admin_bar->get_node( 'archive' );
 
-                set_current_screen( 'front' );
-
                 $this->assertNull( $node );
         }
@@ -416 +414 @@
                 $node         = $wp_admin_bar->get_node( 'archive' );
 
-                set_current_screen( 'front' );
-
                 $this->assertNotNull( $node );
         }
@@ -429 +425 @@
                 $wp_admin_bar = $this->get_standard_admin_bar();
                 $node         = $wp_admin_bar->get_node( 'archive' );
-
-                set_current_screen( 'front' );
 
                 $this->assertNull( $node );
@@ -509 +503 @@
                 $node         = $wp_admin_bar->get_node( 'archive' );
 
-                set_current_screen( 'front' );
                 unregister_post_type( 'foo-non-public' );
 
@@ -533 +526 @@
                 $node         = $wp_admin_bar->get_node( 'archive' );
 
-                set_current_screen( 'front' );
                 unregister_post_type( 'foo-non-public' );
 
@@ -557 +549 @@
                 $node         = $wp_admin_bar->get_node( 'archive' );
 
-                set_current_screen( 'front' );
                 unregister_post_type( 'foo-non-public' );
 
@@ -680 +671 @@
                 $wp_customize->start_previewing_theme();
 
-                set_current_screen( 'front' );
                 $wp_admin_bar = $this->get_standard_admin_bar();
                 $node         = $wp_admin_bar->get_node( 'customize' );