Skip to content

Tests: Restore original theme after cross-origin isolation media tests #14816

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

Draft
shail-mehta wants to merge 2 commits into
base: trunk
Choose a base branch
from
Draft

Tests: Restore original theme after cross-origin isolation media tests #14816

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f199364
Tests: Restore original theme after cross-origin isolation media tests.
shail-mehta Oct 24, 2026
7dd97e0
Tests: Fix assignment alignment in cross-origin isolation tests.
shail-mehta Oct 24, 2026
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
10 changes: 10 additions & 0 deletions tests/phpunit/tests/media/wpCrossOriginIsolation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ class Tests_Media_wpCrossOriginIsolation extends WP_UnitTestCase {
*/
private ?string $original_pagenow;

/**
* Original stylesheet before the test switches themes.
*/
private string $original_stylesheet;

public function set_up() {
parent::set_up();
$this->original_user_agent = $_SERVER['HTTP_USER_AGENT'] ?? null;
Expand All @@ -48,6 +53,7 @@ public function set_up() {
$this->original_get_action = $_GET['action'] ?? null;
$this->original_get_p = $_GET['p'] ?? null;
$this->original_pagenow = $GLOBALS['pagenow'] ?? null;
$this->original_stylesheet = get_stylesheet();
}

public function tear_down() {
Expand Down Expand Up @@ -89,6 +95,10 @@ public function tear_down() {

$GLOBALS['current_screen'] = null;

if ( get_stylesheet() !== $this->original_stylesheet ) {
switch_theme( $this->original_stylesheet );
}

remove_all_filters( 'wp_client_side_media_processing_enabled' );
parent::tear_down();
}
Expand Down
Loading