Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 22 additions & 10 deletions lib/rspec/openapi/schema_merger.rb
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,28 @@ def merge_schema!(base, spec)
end

def merge_arrays(base, key, value)
case key
when 'parameters'
base[key] = value | base[key]
base[key].uniq! { |param| param.slice('name', 'in') }
when 'required'
# Preserve properties that appears in all test cases
base[key] = value & base[key]
else
# last one wins
base[key] = value
base[key] = case key
when 'parameters'
merge_parameters(base, key, value)
when 'required'
# Preserve properties that appears in all test cases
value & base[key]
else
# last one wins
value
end
end

def merge_parameters(base, key, value)
all_parameters = value | base[key]

unique_base_parameters = base[key].index_by { |parameter| [parameter['name'], parameter['in']] }
all_parameters = all_parameters.map do |parameter|
base_parameter = unique_base_parameters[[parameter['name'], parameter['in']]] || {}
base_parameter ? base_parameter.merge(parameter) : parameter
end

all_parameters.uniq! { |param| param.slice('name', 'in') }
base[key] = all_parameters
end
end
1 change: 1 addition & 0 deletions spec/rails/doc/openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@
"name": "filter[name]",
"in": "query",
"required": false,
"description": "Filter by name",
"schema": {
"type": "object",
"properties": {
Expand Down
1 change: 1 addition & 0 deletions spec/rails/doc/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ paths:
- name: filter[name]
in: query
required: false
description: Filter by name
schema:
type: object
properties:
Expand Down