ditkrg/rswag
4
0
Fork 0
mirror of https://github.com/ditkrg/rswag.git synced 2026-01-23 06:16:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix mistake in assigning header nodes for type

Browse Source
This commit is contained in:
Greg Myers 2020-03-22 23:45:47 +00:00
parent eb58fe687a
commit e9aebe6221
3 changed files with 20 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,7 +128,7 @@ module Rswag
def upgrade_request_type!(metadata)
operation_nodes = metadata[:operation][:parameters] || []
path_nodes = metadata[:path_item][:parameters] || []
header_node = metadata[:response][:headers] ||= {}
header_node = metadata[:response][:headers] || {}
(operation_nodes + path_nodes + [header_node]).each do |node|
if node && node[:type] && node[:schema].nil?

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

@ -78,11 +78,7 @@ module Rswag
let(:document) { nil }
it 'converts query and path params, type: to schema: { type: }' do
expect(swagger_doc).to match(
openapi: '3.0.1',
servers: {
urls: ['http://api.example.com/foo', 'https://api.example.com/foo']
},
expect(swagger_doc.slice(:paths)).to match(
paths: {
'/blogs' => {
parameters: [{ schema: { type: :string } }],
@ -100,6 +96,14 @@ module Rswag
}
)
end
it 'converts basePath, schemas and host to urls' do
expect(swagger_doc.slice(:servers)).to match(
servers: {
urls: ['http://api.example.com/foo', 'https://api.example.com/foo']
}
)
end
end
end

42
test-app/swagger/v1/swagger.json
View File

@ -21,14 +21,10 @@
],
"responses": {
"204": {
"description": "Valid credentials",
"headers": {
}
"description": "Valid credentials"
},
"401": {
"description": "Invalid credentials",
"headers": {
}
"description": "Invalid credentials"
}
}
}
@ -49,14 +45,10 @@
],
"responses": {
"204": {
"description": "Valid credentials",
"headers": {
}
"description": "Valid credentials"
},
"401": {
"description": "Invalid credentials",
"headers": {
}
"description": "Invalid credentials"
}
}
}
@ -80,14 +72,10 @@
],
"responses": {
"204": {
"description": "Valid credentials",
"headers": {
}
"description": "Valid credentials"
},
"401": {
"description": "Invalid credentials",
"headers": {
}
"description": "Invalid credentials"
}
}
}
@ -117,16 +105,12 @@
],
"responses": {
"201": {
"description": "blog created",
"headers": {
}
"description": "blog created"
},
"422": {
"description": "invalid request",
"schema": {
"$ref": "#/definitions/errors_object"
},
"headers": {
}
}
}
@ -152,9 +136,7 @@
],
"responses": {
"406": {
"description": "unsupported accept header",
"headers": {
}
"description": "unsupported accept header"
}
}
}
@ -207,9 +189,7 @@
}
},
"404": {
"description": "blog not found",
"headers": {
}
"description": "blog not found"
}
}
}
@ -247,9 +227,7 @@
],
"responses": {
"200": {
"description": "blog updated",
"headers": {
}
"description": "blog updated"
}
}
}