Repository navigation
Tests: Restore original theme in WP_Block_Templates_UnitTestCase::tear_down() - #14813
Draft
shail-mehta wants to merge 1 commit into
Draft
shail-mehta wants to merge 1 commit into
shail-mehta wants to merge 1 commit into
Conversation
…r_down(). Save the active stylesheet before switching to the block-theme fixture and restore it after each test so theme state does not leak into later suites. Trac ticket: https://core.trac.wordpress.org/ticket/65893
There was a problem hiding this comment.
🟢 Approval recommended
The focused change preserves existing cleanup behavior and addresses theme leakage without any identified blocking issues.
No open issues 🎉
What changed in this PR
This PR improves block-template test isolation by restoring the incoming theme after each test, preventing theme changes from affecting later test suites.
Changes:
- Records the original stylesheet during
set_up(). - Restores it in
tear_down()when changed, before invoking parent cleanup.
| File | Description |
|---|---|
tests/phpunit/tests/block-templates/base.php |
Saves and restores the active stylesheet around each test. |
Review effort: Balanced
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Trac ticket: #65893
What
Restores the active theme stylesheet in
tear_down()withinWP_Block_Templates_UnitTestCaseintests/phpunit/tests/block-templates/base.php.Why
Classes extending
WP_Block_Templates_UnitTestCasecallswitch_theme( 'block-theme' )inset_up()and never restore the incoming stylesheet. That leaves later test suites in the same process onblock-theme.How
$this->original_stylesheet = get_stylesheet();duringset_up().switch_theme( $this->original_stylesheet );intear_down()when the stylesheet changed.Testing Instructions
npm run env:start && npm run env:install.npm run test:php -- --test-suffix .php tests/phpunit/tests/block-templates --order-by=random --random-order-seed=1npm run test:php -- --test-suffix .php tests/phpunit/tests/block-templates --order-by=random --random-order-seed=2npm run test:php -- --test-suffix .php tests/phpunit/tests/block-templatesOK (83 tests, 214 assertions).Use of AI Tools