Repository navigation
Tests: Restore original theme after template path allowed tests - #14829
Draft
shail-mehta wants to merge 2 commits into
Draft
shail-mehta wants to merge 2 commits into
shail-mehta wants to merge 2 commits into
Conversation
Save and restore the active stylesheet around Tests_Theme_wpIsTemplatePathAllowed so switch_theme() calls do not leak into later suites.
There was a problem hiding this comment.
🟢 Approval recommended
The focused cleanup follows established theme-test patterns and has no identified blocking issues.
No open issues 🎉
What changed in this PR
This PR improves theme-test isolation by restoring the stylesheet active before each test, preventing theme changes from affecting later tests in the same process.
Changes:
- Captures the original stylesheet during
set_up(). - Restores it during
tear_down()only if it changed, preserving parent lifecycle calls. - Adds the Trac ticket annotation for #65893.
| File | Description |
|---|---|
tests/phpunit/tests/theme/wpIsTemplatePathAllowed.php |
Adds stylesheet capture and restoration to isolate theme-switching tests. |
Review effort: Balanced
shail-mehta
changed the title
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()withinTests_Theme_wpIsTemplatePathAllowedintests/phpunit/tests/theme/wpIsTemplatePathAllowed.php.Why
Several tests call
switch_theme()(for example todefaultor child themes) without restoring the incoming stylesheet, leaving later test suites in the same process on that 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 -- --filter Tests_Theme_wpIsTemplatePathAllowed --order-by=random --random-order-seed=1npm run test:php -- --filter Tests_Theme_wpIsTemplatePathAllowed --order-by=random --random-order-seed=2npm run test:php -- --filter Tests_Theme_wpIsTemplatePathAllowedOK.Use of AI Tools