Merge branch 'master' into jamie

This commit is contained in:
Blake Erickson 2021-01-27 05:18:35 -07:00
commit 7f88c5d1f3

View File

@ -56,7 +56,7 @@ module Rswag
is_hash = value.is_a?(Hash) is_hash = value.is_a?(Hash)
if is_hash && value.dig(:parameters) if is_hash && value.dig(:parameters)
schema_param = value.dig(:parameters)&.find { |p| (p[:in] == :body || p[:in] == :formData) && p[:schema] } schema_param = value.dig(:parameters)&.find { |p| (p[:in] == :body || p[:in] == :formData) && p[:schema] }
mime_list = value.dig(:consumes) mime_list = value.dig(:consumes) || doc[:consumes]
if value && schema_param && mime_list if value && schema_param && mime_list
value[:requestBody] = { content: {} } unless value.dig(:requestBody, :content) value[:requestBody] = { content: {} } unless value.dig(:requestBody, :content)
value[:requestBody][:required] = true if schema_param[:required] value[:requestBody][:required] = true if schema_param[:required]