Skip to content

Set $GLOBALS['wp_sitemaps'] = null so that sitemaps will correctly be initialized before each test is run #502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Set $GLOBALS['wp_sitemaps'] = null so that sitemaps will correctly be initialized before each test is run #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bea802c
Set $GLOBALS['wp_sitemaps'] = null so that sitemaps will correctly be…
pbiron Aug 27, 2020
99c2da5
Update testPublicQueryVarsAreAsExpected() with the sitemap-related dy…
pbiron Aug 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions tests/phpunit/includes/abstract-testcase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ public function tearDown() {
$GLOBALS[ $global ] = null;
}

// Reset $wp_sitemap global so that sitemap-related dynamic $wp->public_query_vars are added when the next test runs.
$GLOBALS['wp_sitemaps'] = null;

$this->unregister_all_meta_keys();
remove_theme_support( 'html5' );
remove_filter( 'query', array( $this, '_create_temporary_tables' ) );
Expand Down
4 changes: 4 additions & 0 deletions tests/phpunit/tests/query/vars.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ class Tests_Query_Vars extends WP_UnitTestCase {

/**
* @ticket 35115
* @ticket 51154
*/
public function testPublicQueryVarsAreAsExpected() {
global $wp;
Expand Down Expand Up @@ -70,6 +71,9 @@ public function testPublicQueryVarsAreAsExpected() {
// Dynamically added public query vars:
'post_format',
'rest_route',
'sitemap',
'sitemap-subtype',
'sitemap-stylesheet',

),
$wp->public_query_vars,
Expand Down