ditkrg/rswag
5
0
Fork 0
mirror of https://github.com/ditkrg/rswag.git synced 2026-01-25 07:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'psmandzich/master' into jamie

Browse Source
This commit is contained in:
Jamie Macey
2020-10-17 13:21:28 -07:00
parent 7e2c52b242 347f9da32e
commit b3fa5ba54e
3 changed files with 62 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rswag-specs/lib/rswag/specs/swagger_formatter.rb
View File

@@ -129,9 +129,10 @@ module Rswag
end
def upgrade_content!(mime_list, target_node)
target_node[:content] ||= {}
schema = target_node[:schema]
return if mime_list.empty? || schema.nil?
target_node[:content] ||= {}
target_node.merge!(content: {})
mime_list.each do |mime_type|
# TODO upgrade to have content-type specific schema

50
rswag-specs/spec/rswag/specs/swagger_formatter_spec.rb
View File

@@ -127,6 +127,56 @@ module Rswag
)
end
context 'with empty content' do
let(:swagger_doc) do
{
openapi: '3.0.1',
basePath: '/foo',
schemes: ['http', 'https'],
host: 'api.example.com',
components: {
securitySchemes: {
myClientCredentials: {
type: :oauth2,
flow: :application,
token_url: :somewhere
},
myAuthorizationCode: {
type: :oauth2,
flow: :accessCode,
token_url: :somewhere
},
myImplicit: {
type: :oauth2,
flow: :implicit,
token_url: :somewhere
}
}
}
}
end
it 'converts query and path params, type: to schema: { type: }' do
expect(swagger_doc.slice(:paths)).to match(
paths: {
'/blogs' => {
parameters: [{ schema: { type: :string } }],
post: {
parameters: [{ schema: { type: :string } }],
summary: 'Creates a blog',
responses: {
'201' => {
description: 'blog created',
headers: { schema: { type: :string } }
}
}
}
}
}
)
end
end
it 'converts basePath, schemas and host to urls' do
expect(swagger_doc.slice(:servers)).to match(
servers: {