Changeset 48914 for branches/5.5

Timestamp:

08/31/2020 05:51:23 PM (4 years ago)

Author:

desrosj

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.
Merges [48908] to the 5.5 branch.
Fixes #51154.

Location:

branches/5.5

Files:

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

branches/5.5/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();

branches/5.5/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',
 
             ),