From 6861a9aac0635134748afab4bf980d63d631b990 Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Sun, 4 Dec 2016 19:03:40 +0000 Subject: [PATCH] Build/Test Tools: Correctly set up the current screen during list table tests so that they don't fail when run individually. Props desrosj Fixes #38761 git-svn-id: https://develop.svn.wordpress.org/trunk@39481 602fd350-edb4-49c9-b593-d223f7449a82 --- tests/phpunit/tests/admin/includesListTable.php | 4 +--- tests/phpunit/tests/multisite/wpMSSitesListTable.php | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/phpunit/tests/admin/includesListTable.php b/tests/phpunit/tests/admin/includesListTable.php index 39a0b97288..b0be74f28c 100644 --- a/tests/phpunit/tests/admin/includesListTable.php +++ b/tests/phpunit/tests/admin/includesListTable.php @@ -16,9 +16,7 @@ class Tests_Admin_includesListTable extends WP_UnitTestCase { function setUp() { parent::setUp(); - set_current_screen( 'edit-page' ); - $GLOBALS['hook_suffix'] = ''; - $this->table = _get_list_table( 'WP_Posts_List_Table' ); + $this->table = _get_list_table( 'WP_Posts_List_Table', array( 'screen' => 'edit-page' ) ); } public static function wpSetUpBeforeClass( $factory ) { diff --git a/tests/phpunit/tests/multisite/wpMSSitesListTable.php b/tests/phpunit/tests/multisite/wpMSSitesListTable.php index de9deb49b4..b170cc956c 100644 --- a/tests/phpunit/tests/multisite/wpMSSitesListTable.php +++ b/tests/phpunit/tests/multisite/wpMSSitesListTable.php @@ -16,7 +16,7 @@ class Tests_WP_MS_Sites_List_Table extends WP_UnitTestCase { function setUp() { parent::setUp(); - $this->table = _get_list_table( 'WP_MS_Sites_List_Table' ); + $this->table = _get_list_table( 'WP_MS_Sites_List_Table', array( 'screen' => 'ms-sites' ) ); } public static function wpSetUpBeforeClass( $factory ) {