-
Notifications
You must be signed in to change notification settings - Fork 476
Mark required elements inside group in mutually exclusive set as optional #207
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
dblock
merged 1 commit into
ruby-grape:master
from
mintuhouse:feature_mutually_exclusive
Feb 9, 2015
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
require 'spec_helper' | ||
|
||
describe 'Mutually exclusive group params' do | ||
def app | ||
Class.new(Grape::API) do | ||
format :json | ||
|
||
params do | ||
requires :required_group, type: Hash do | ||
group :param_group_1, type: Hash do | ||
requires :param_1, type: String | ||
end | ||
optional :param_group_2, type: Array do | ||
requires :param_2, type: String | ||
end | ||
mutually_exclusive :param_group_1, :param_group_2 | ||
end | ||
end | ||
post '/groups' do | ||
{} | ||
end | ||
|
||
add_swagger_documentation | ||
end | ||
end | ||
|
||
it 'marks the nested required params in a group as optional if the group is in a mutually_exclusive set' do | ||
get '/swagger_doc/groups' | ||
|
||
body = JSON.parse last_response.body | ||
parameters = body['apis'].first['operations'].first['parameters'] | ||
expect(parameters).to eq [ | ||
{ 'paramType' => 'form', 'name' => 'required_group[param_group_1][param_1]', 'description' => nil, 'type' => 'string', 'required' => false, 'allowMultiple' => false }, | ||
{ 'paramType' => 'form', 'name' => 'required_group[param_group_2][param_2]', 'description' => nil, 'type' => 'string', 'required' => false, 'allowMultiple' => false }] | ||
end | ||
end |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You should be able to combine
each
andreject
, there's a bunch of duplicate processing here, notablyis_nested_param
.