Changeset 64832

Timestamp:

10/27/2026 07:51:14 PM (33 hours ago)

Author:

lancewillett

Message:

Tests: Restore the active theme after comment tests.

Save the original stylesheet before switching themes in comment template, metadata cache, and comment list tests. Restore it during teardown.

Developed in: ​https://github.com/WordPress/wordpress-develop/pull/14687

Props devmuhib, huzaifaalmesbah.
See #65893.

Location:

trunk/tests/phpunit/tests/comment

Files:

• commentsTemplate.php (modified) (1 diff)
• metaCache.php (modified) (1 diff)
• wpListComments.php (modified) (1 diff)

trunk/tests/phpunit/tests/comment/commentsTemplate.php

@@ -11 +11 @@
 
         /**
+         * Original stylesheet.
+         *
+         * @var string
+         */
+        protected $original_stylesheet;
+
+        /**
          * Performs setup tasks for every test.
          */
         public function set_up() {
                 parent::set_up();
+                $this->original_stylesheet = get_stylesheet();
                 switch_theme( 'default' );
+        }
+
+        /**
+         * Cleans up after every test.
+         */
+        public function tear_down() {
+                if ( get_stylesheet() !== $this->original_stylesheet ) {
+                        switch_theme( $this->original_stylesheet );
+                }
+                parent::tear_down();
         }
 

trunk/tests/phpunit/tests/comment/metaCache.php

@@ -8 +8 @@
 
         /**
+         * Original stylesheet.
+         *
+         * @var string
+         */
+        protected $original_stylesheet;
+
+        /**
          * Performs setup tasks for every test.
          */
         public function set_up() {
                 parent::set_up();
+                $this->original_stylesheet = get_stylesheet();
                 switch_theme( 'default' );
+        }
+
+        /**
+         * Cleans up after every test.
+         */
+        public function tear_down() {
+                if ( get_stylesheet() !== $this->original_stylesheet ) {
+                        switch_theme( $this->original_stylesheet );
+                }
+                parent::tear_down();
         }
 

trunk/tests/phpunit/tests/comment/wpListComments.php

@@ -9 +9 @@
 
         /**
+         * Original stylesheet.
+         *
+         * @var string
+         */
+        protected $original_stylesheet;
+
+        /**
          * Performs setup tasks for every test.
          */
         public function set_up() {
                 parent::set_up();
+                $this->original_stylesheet = get_stylesheet();
                 switch_theme( 'default' );
+        }
+
+        /**
+         * Cleans up after every test.
+         */
+        public function tear_down() {
+                if ( get_stylesheet() !== $this->original_stylesheet ) {
+                        switch_theme( $this->original_stylesheet );
+                }
+                parent::tear_down();
         }