Fixes #1129 - allOf fix for $$ref values #1130
Merged
Conversation
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
…. Added test for $$ref values, but left it as skipped because $$ref values aren't being attached during any test.
…al $$ref value, do not have one after the `allOf` plugin runs
… properties being in the result of `allOf`
…wagger-js into bug/1129-fix-allOf-ref-value
Contributor
|
@shockey this solves oh-so-many issues, would love to see it merged |
Contributor
|
Great fix - just saw this while following up on one of the linked issues! |
…nconti/swagger-js into owenconti-bug/1129-fix-allOf-ref-value
shockey
approved these changes
Sep 11, 2017
Contributor
|
Okay, now it's ready 😄 Thanks @owenconti! |
This was referenced Sep 12, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Fixes #1129
Should also fix the following swagger-ui issues:
swagger-api/swagger-ui#2946
swagger-api/swagger-ui#3490
swagger-api/swagger-ui#3342
swagger-api/swagger-ui#3127
swagger-api/swagger-ui#3093
and possibly others...
Added a patch at the end of the
allOfplugin to make sure the original values for the definition are merged back into the result of theallOf. This includes the$$refvalue. For definitions that did not originally include$$refvalues, we make sure the result ofallOfdoes not have a$$refvalue.I wrote a test for the new functionality, but during test runs (any test, not just mine), the
$$refvalue that is set during therefsplugin, is not available on thepatchobject inside theallOfplugin.Once we get that figured out, then we should be able to remove the
skipfrom my new test.Here's a screenshot showing the fix in action in the UI project:
Before:
After: