Refactor: centralize add-on cleanup in test helper #3273
Merged
+124
−150
Conversation
This file contains 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
Move lingering addon cleanup logic from individual tests into the `with_server` method's ensure block, to centralize cleanup responsibility, and reduce duplication across the test suite.
How to use the Graphite Merge QueueAdd the label graphite-merge to this PR to add it to the merge queue. You must have a Graphite account in order to use the merge queue. Sign up using this link. An organization admin has enabled the Graphite Merge Queue in this repository. Please do not merge from GitHub as this will restart CI on PRs being processed by the merge queue. |
vinistock
reviewed
Mar 5, 2025
| @@ -43,6 +43,7 @@ def with_server(source = nil, uri = Kernel.URI("file:///fake.rb"), stub_no_typec | |||
| ensure | |||
| if load_addons | |||
| RubyLsp::Addon.addons.each(&:deactivate) | |||
| RubyLsp::Addon.addon_classes.clear | |||
There was a problem hiding this comment.
We can substitute all of these by RubyLsp::Addon.unload_addons, which has the full logic to do this.
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.
Motivation
Following up on #3271 (comment). The test helper should be handling all add-on cleanup.
Implementation
Moved lingering add-on cleanup logic from individual tests into the
with_servermethod's ensure block, to centralize cleanup responsibility and reduce duplication across the test suite.