Changeset 48908 for trunk

Timestamp:

08/31/2020 03:57:50 AM (6 years ago)

Author:

SergeyBiryukov

Message:

Tests: Reset the $wp_sitemap global after each test, so that sitemaps are re-initialized when the next test runs.

This ensures consistent results in query var tests, regardless of whether they are run in isolation or as part of a larger group of tests.

Props pbiron, peterwilsoncc.
Fixes #51154.

Location:

trunk/tests/phpunit

Files:

• includes/abstract-testcase.php (modified) (1 diff)
• tests/query/vars.php (modified) (2 diffs)

trunk/tests/phpunit/includes/abstract-testcase.php

@@ -161 +161 @@
                         $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();

trunk/tests/phpunit/tests/query/vars.php

@@ -10 +10 @@
         /**
          * @ticket 35115
+         * @ticket 51154
          */
         public function testPublicQueryVarsAreAsExpected() {
@@ -71 +72 @@
                                 'post_format',
                                 'rest_route',
+                                'sitemap',
+                                'sitemap-subtype',
+                                'sitemap-stylesheet',
 
                         ),