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

rswag-specs/lib/rswag/specs/swagger_formatter.rb

@@ -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

rswag-specs/spec/rswag/specs/swagger_formatter_spec.rb

@@ -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: {

test-app/swagger/v1/swagger.json

@@ -21,14 +21,10 @@
         ],
         "responses": {
           "204": {
-            "description": "Valid credentials",
+            "description": "Valid credentials"
-            "content": {
-            }
           },
           "401": {
-            "description": "Invalid credentials",
+            "description": "Invalid credentials"
-            "content": {
-            }
           }
         }
       }
@@ -49,14 +45,10 @@
         ],
         "responses": {
           "204": {
-            "description": "Valid credentials",
+            "description": "Valid credentials"
-            "content": {
-            }
           },
           "401": {
-            "description": "Invalid credentials",
+            "description": "Invalid credentials"
-            "content": {
-            }
           }
         }
       }
@@ -80,14 +72,10 @@
         ],
         "responses": {
           "204": {
-            "description": "Valid credentials",
+            "description": "Valid credentials"
-            "content": {
-            }
           },
           "401": {
-            "description": "Invalid credentials",
+            "description": "Invalid credentials"
-            "content": {
-            }
           }
         }
       }
@@ -105,9 +93,7 @@
         ],
         "responses": {
           "201": {
-            "description": "blog created",
+            "description": "blog created"
-            "content": {
-            }
           },
           "422": {
             "description": "invalid request",
@@ -148,9 +134,7 @@
         ],
         "responses": {
           "406": {
-            "description": "unsupported accept header",
+            "description": "unsupported accept header"
-            "content": {
-            }
           }
         }
       }
@@ -237,12 +221,6 @@
             },
             "content": {
               "application/json": {
-                "example": {
-                  "id": 1,
-                  "title": "Hello world!",
-                  "content": "Hello world and hello universe. Thank you all very much!!!",
-                  "thumbnail": "thumbnail.png"
-                },
                 "schema": {
                   "$ref": "#/definitions/blog"
                 }
@@ -250,9 +228,7 @@
             }
           },
           "404": {
-            "description": "blog not found",
+            "description": "blog not found"
-            "content": {
-            }
           }
         }
       }
@@ -280,9 +256,7 @@
         ],
         "responses": {
           "200": {
-            "description": "blog updated",
+            "description": "blog updated"
-            "content": {
-            }
           }
         },
         "requestBody": {