Changeset 59017

Timestamp:

09/12/2024 09:39:41 PM (2 months ago)

Author:

SergeyBiryukov

Message:

Tests: Restore the environment before performing assertions in some canonical tests.

This aims to avoid affecting other tests in case of failure.

Follow-up to [28704], [45133].

See #61608.

Location:

trunk/tests/phpunit/tests

Files:

• canonical.php (modified) (2 diffs)
• canonical/https.php (modified) (1 diff)

trunk/tests/phpunit/tests/canonical.php

@@ -431 +431 @@
         $this->go_to( get_permalink( $p ) );
 
-        $url = redirect_canonical( add_query_arg( '%D0%BA%D0%BE%D0%BA%D0%BE%D0%BA%D0%BE', 1, site_url( '/' ) ), false );
-        $this->assertNull( $url );
+        $redirect = redirect_canonical( add_query_arg( '%D0%BA%D0%BE%D0%BA%D0%BE%D0%BA%D0%BE', 1, site_url( '/' ) ), false );
 
         delete_option( 'page_on_front' );
+
+        $this->assertNull( $redirect );
     }
 
@@ -457 +458 @@
         );
 
-        $url = redirect_canonical( get_term_feed_link( self::$terms['/category/parent/'] ), false );
+        $redirect = redirect_canonical( get_term_feed_link( self::$terms['/category/parent/'] ), false );
+
         // Restore original global.
         $GLOBALS['wp_query'] = $global_query;
 
-        $this->assertNull( $url );
+        $this->assertNull( $redirect );
     }
 

trunk/tests/phpunit/tests/canonical/https.php

@@ -62 +62 @@
         $redirect = redirect_canonical( $this->https, false );
 
+        remove_filter( 'home_url', array( $this, 'set_https' ) );
+
         $this->assertNull( $redirect );
-
-        remove_filter( 'home_url', array( $this, 'set_https' ) );
     }
 }