Merge pull request #79 from cm-iwata/fix/curly-braces

WindomZ · Mar 10, 2022 · 860e4ea · 860e4ea
2 parents 11ed8ab + 8c08afa
commit 860e4ea
Show file tree

Hide file tree

Showing 4 changed files with 183 additions and 2 deletions.
diff --git a/test/in.json b/test/in.json
@@ -44,7 +44,10 @@
     "$ref#pets": "./paths/pets",
     "$ref#pets-id": "https://raw.githubusercontent.com/WindomZ/swagger-merger/pets-id",
     "$ref#no-ext": "./no_ext_json",
-    "$ref#wrong-ext": "./wrong_ext.xml"
+    "$ref#wrong-ext": "./wrong_ext.xml",
+    "/v2/pets/{id}": {
+      "$ref": "./simple_json#/paths/~1pets~1{id}"
+    }
   },
   "definitions": {
     "$ref#pets": "https://raw.githubusercontent.com/WindomZ/swagger-merger/pets.yaml",

diff --git a/test/in.yaml b/test/in.yaml
@@ -32,6 +32,8 @@ paths:
   $ref#pets-id: "https://raw.githubusercontent.com/WindomZ/swagger-merger/pets-id"
   $ref#no-ext: "./no_ext_yaml"
   $ref#wrong-ext: "./wrong_ext.xml"
+  /v2/pets/{id}:
+    $ref: ./simple_yaml#/paths/~1pets~1{id}
 definitions:
   $ref#pets: "https://raw.githubusercontent.com/WindomZ/swagger-merger/pets.yaml"
   $ref#error: "https://raw.githubusercontent.com/WindomZ/swagger-merger/master/example/petstore_simple/definitions/error.yaml"
diff --git a/test/out.json b/test/out.json
@@ -52,7 +52,110 @@
     "/pets/{id}": {
       "good": "bye"
     },
-    "$ref#wrong-ext": "./wrong_ext.xml"
+    "$ref#wrong-ext": "./wrong_ext.xml",
+    "/v2/pets/{id}": {
+      "get": {
+        "description": "Returns a user based on a single ID, if the user does not have access to the pet",
+        "operationId": "findPetById",
+        "produces": [
+          "application/json",
+          "application/xml",
+          "text/xml",
+          "text/html"
+        ],
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "ID of pet to fetch",
+            "required": true,
+            "type": "integer",
+            "format": "int64"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "pet response",
+            "schema": {
+              "type": "object",
+              "required": [
+                "id",
+                "name"
+              ],
+              "properties": {
+                "id": {
+                  "type": "integer",
+                  "format": "int64"
+                },
+                "name": {
+                  "type": "string"
+                },
+                "tag": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "default": {
+            "description": "unexpected error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      },
+      "delete": {
+        "description": "deletes a single pet based on the ID supplied",
+        "operationId": "deletePet",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "ID of pet to delete",
+            "required": true,
+            "type": "integer",
+            "format": "int64"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "pet deleted"
+          },
+          "default": {
+            "description": "unexpected error",
+            "schema": {
+              "type": "object",
+              "required": [
+                "code",
+                "message"
+              ],
+              "properties": {
+                "code": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
   },
   "definitions": {
     "$ref#pets": "https://raw.githubusercontent.com/WindomZ/swagger-merger/pets.yaml",

diff --git a/test/out.yaml b/test/out.yaml
@@ -41,6 +41,79 @@ paths:
   /pets/{id}:
     good: bye
   $ref#wrong-ext: ./wrong_ext.xml
+  /v2/pets/{id}:
+    get:
+      description: >-
+        Returns a user based on a single ID, if the user does not have access to
+        the pet
+      operationId: findPetById
+      produces:
+        - application/json
+        - application/xml
+        - text/xml
+        - text/html
+      parameters:
+        - name: id
+          in: path
+          description: ID of pet to fetch
+          required: true
+          type: integer
+          format: int64
+      responses:
+        '200':
+          description: pet response
+          schema:
+            type: object
+            required:
+              - id
+              - name
+            properties:
+              id:
+                type: integer
+                format: int64
+              name:
+                type: string
+              tag:
+                type: string
+        default:
+          description: unexpected error
+          schema:
+            type: object
+            required:
+              - code
+              - message
+            properties:
+              code:
+                type: integer
+                format: int32
+              message:
+                type: string
+    delete:
+      description: deletes a single pet based on the ID supplied
+      operationId: deletePet
+      parameters:
+        - name: id
+          in: path
+          description: ID of pet to delete
+          required: true
+          type: integer
+          format: int64
+      responses:
+        '204':
+          description: pet deleted
+        default:
+          description: unexpected error
+          schema:
+            type: object
+            required:
+              - code
+              - message
+            properties:
+              code:
+                type: integer
+                format: int32
+              message:
+                type: string
 definitions:
   $ref#pets: https://raw.githubusercontent.com/WindomZ/swagger-merger/pets.yaml
   errorModel: