Simplify fixture resolver #38569
Merged
Simplify fixture resolver #38569
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
This test was attempting to test how cache keys work by modifying the templates and seeing when that cache was fresh. This doesn't actually work for real Resolvers, only FixtureResolver, and isn't desirable. We absolutely want to share templates if they resolve to the same file. Instead, this simplifies the test to only check that we get the correct template for the locale we request.
Previously FixtureResolver had a copy-pasted version of the filtering already done by OptimizedFileSystemResolver. This PR replaces this by extracting the two places actual filesystem operations into separate methods and overriding those. It would be nice to not rely on overriding methods at all, and to extract the actual filtering into a separate, reusable class, but I don't want to do that until some other changes are made to the filtering. This should also make FixtureResolver much more accurate to OptimizedFileSystemResolver, by also creating and caching the UnboundTemplate classes, which de-duplicate templates.
jhawthorn
force-pushed
the
simplify_fixture_resolver
branch
from
02b8093
to
c3c1c32
Compare
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.
Previously FixtureResolver had a copy-pasted version of the filtering already done by OptimizedFileSystemResolver. This PR replaces this by extracting the two places actual filesystem operations into separate methods and overriding those.
It would be nice to not rely on overriding methods at all, and to extract the actual filtering into a separate, reusable class, but I don't want to do that until some other changes are made to the
filtering.
This should also make FixtureResolver much more accurate to OptimizedFileSystemResolver, by also creating and caching the UnboundTemplate classes, which de-duplicate templates.
Because it's now more accurate, this also needed to fix a bad test which it broke 馃槄.