Fixes automocks when using resolvers #6036
Merged
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
arcanis
force-pushed
the
mock-with-resolver
branch
from
1d32fac
to
8c35eb6
Compare
Codecov Report
@@ Coverage Diff @@
## master #6036 +/- ##
==========================================
- Coverage 64.3% 64.28% -0.02%
==========================================
Files 217 217
Lines 8317 8314 -3
Branches 3 3
==========================================
- Hits 5348 5345 -3
Misses 2968 2968
Partials 1 1
Continue to review full report at Codecov.
|
|
This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Summary
#4174 introduced a few lines of code that broke automocking when using custom resolvers (reported as #4985). This new diff reverts the part of the code responsible for the breakage.
I'm not entirely sure what was the purpose of the previous code - if I understand correctly it was ensuring that resolvers were correctly called when calling
require()from within a mock, but I added an integration test and it seems to work fine even with the code removed.Maybe @midzelis can shed some light on this?
Test plan
I've added a test to make sure that automocking would continue working, removed a unit test that was testing the behavior of
getMockModule(since it was testing the behavior causing the bug), and added a new test to make sure thatrequire()calls work with manual mocking + custom resolvers.