diff --git a/test/fixtures/json/wrongfile.json b/test/fixtures/json/wrongfile.json deleted file mode 100644 index b4b62ea8e..000000000 --- a/test/fixtures/json/wrongfile.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - 'test': 1 -} diff --git a/test/fixtures/json/wrongfile.yaml b/test/fixtures/json/wrongfile.yaml deleted file mode 100644 index 820d2ec13..000000000 --- a/test/fixtures/json/wrongfile.yaml +++ /dev/null @@ -1 +0,0 @@ -test: hi diff --git a/test/fixtures/json/swagger.json b/test/fixtures/swagger.json similarity index 100% rename from test/fixtures/json/swagger.json rename to test/fixtures/swagger.json diff --git a/test/fixtures/yaml/NotTheFile.yaml b/test/fixtures/yaml/NotTheFile.yaml deleted file mode 100644 index d951fcf3b..000000000 --- a/test/fixtures/yaml/NotTheFile.yaml +++ /dev/null @@ -1 +0,0 @@ -hi: 1 diff --git a/test/fixtures/yaml/PetStore.yaml b/test/fixtures/yaml/PetStore.yaml deleted file mode 100644 index 3088e2b92..000000000 --- a/test/fixtures/yaml/PetStore.yaml +++ /dev/null @@ -1,345 +0,0 @@ -swagger: "2.0" -info: - version: 1.0.0 - title: Swagger petstore - description: A sample API that demonstrates Swagger-Express-Middleware features - -consumes: - - application/json -produces: - - application/json - -definitions: - pet: - required: - - name - - type - properties: - name: - type: string - minLength: 4 - pattern: "^[a-zA-Z0-9- ]+$" - age: - type: integer - dob: - type: string - format: 'date' - type: - type: string - enum: [cat, dog, bird] - address: - $ref: "#/definitions/address" - vet: - $ref: "#/definitions/veterinarian" - tags: - type: array - uniqueItems: true - items: - type: string - minLength: 1 - - veterinarian: - required: - - name - properties: - name: - type: string - minLength: 1 - address: - $ref: "#/definitions/address" - - address: - properties: - street: - type: string - minLength: 1 - city: - type: string - minLength: 1 - state: - type: string - minLength: 2 - maxLength: 2 - pattern: "^[A-Z]+$" - zipcode: - type: integer - minimum: 10000 - maximum: 99999 - -parameters: - petName: - name: petName - in: path - description: Name of the pet - required: true - type: string - -paths: - /pets: - get: - description: Returns all pets, optionally filtered by one or more criteria - operationId: findPets - parameters: &petFilters - - name: tags - in: query - description: Filters pets by one or more tags - required: false - type: array - items: - type: string - uniqueItems: true - collectionFormat: csv - - name: type - in: query - description: Filters pets by type (dog, cat, or bird) - required: false - type: string - enum: [cat, dog, bird] - - name: age - in: query - description: Filters pets by age - required: false - type: integer - - name: dob - in: query - description: Filters pets by date of birth - required: false - type: string - format: date - - name: address.city - in: query - description: Filters pets by city - required: false - type: string - - name: address.state - in: query - description: Filters pets by state - required: false - type: string - - name: address.zipcode - in: query - description: Filters pets by zip code - required: false - type: integer - - name: vet.name - in: query - description: Filters pets by veterinarian name - required: false - type: string - - name: vet.address.city - in: query - description: Filters pets by veterinarian city - required: false - type: string - - name: vet.address.state - in: query - description: Filters pets by veterinarian state - required: false - type: string - - name: vet.address.zipcode - in: query - description: Filters pets by veterinarian zip code - required: false - type: integer - responses: - default: - description: Returns the matching pets - schema: - type: array - items: - $ref: "#/definitions/pet" - headers: - last-modified: - type: string - description: The date/time that a pet was last modified - - delete: - description: Deletes all pets, optionally filtered by one or more criteria - operationId: deletePets - parameters: *petFilters - responses: - default: - description: Returns the pets that were deleted - schema: - type: array - items: - $ref: "#/definitions/pet" - - post: - description: Creates a new pet in the store - operationId: addPet - parameters: - - name: pet - in: body - description: The pet to add to the store - required: true - schema: - $ref: "#/definitions/pet" - responses: - 201: - description: Returns the newly-added pet - schema: - $ref: "#/definitions/pet" - headers: - Location: - type: string - description: The URL of the newly-added pet - - /pets/{petName}: - parameters: - - $ref: "#/parameters/petName" - - get: - description: Returns a pet by name - operationId: findPetByName - responses: - default: - description: Returns the pet data - schema: - $ref: "#/definitions/pet" - headers: - last-modified: - type: string - description: The date/time that the pet was last modified - - delete: - description: Deletes a single pet based on the name supplied - operationId: deletePet - responses: - default: - description: Returns the pet that was deleted - schema: - $ref: "#/definitions/pet" - - patch: - description: Updates a pet by name - parameters: - - name: pet - in: body - description: The updated pet info - required: true - schema: - $ref: "#/definitions/pet" - responses: - default: - description: Returns the updated pet data - schema: - $ref: "#/definitions/pet" - - /pets/{petName}/photos: - parameters: - - $ref: "#/parameters/petName" - - post: - description: Upload a new pet photo - operationId: addPetPhoto - consumes: - - multipart/form-data - parameters: - - name: id - in: formData - description: The photo ID (generated automatically) - type: integer - format: int32 - minimum: 1 - - name: label - in: formData - description: A label for the photo - required: true - type: string - minLength: 1 - - name: description - in: formData - description: An optional description of the photo - type: string - - name: photo - in: formData - description: The pet photo - required: true - type: file - minLength: 1 - maxLength: 5000000 # ~5MB - responses: - default: - description: Returns the photo information - schema: - properties: - id: - type: integer - format: int32 - description: The auto-generated photo ID - label: - type: string - description: - type: string - photo: - type: object - description: Information about the photo (size, file name, etc.) - headers: - Location: - type: string - description: The URL of the newly-added photo - - get: - description: Get a list of the photos for a pet - responses: - 200: - description: Returns the list of photos - schema: - type: array - items: - properties: - id: - type: integer - format: int32 - description: The auto-generated photo ID - label: - type: string - description: - type: string - photo: - type: object - description: Information about the photo (size, file name, etc.) - - /pets/{petName}/photos/{id}: - parameters: - - $ref: "#/parameters/petName" - - name: id - in: path - description: The ID of the photo - required: true - type: integer - format: int32 - - get: - description: Gets a pet photo - operationId: getPetPhoto - produces: - - image/jpeg - - image/gif - - image/png - - image/bmp - responses: - default: - description: Returns the pet photo - schema: - type: file - - delete: - description: Deletes a pet photo - operationId: deletePetPhoto - responses: - default: - description: The photo was deleted successfully - - /: - get: - produces: - - text/html - responses: - default: - description: The Swagger Pet Store homepage :) - schema: - type: file - default: - $ref: "index.html" diff --git a/test/fixtures/yaml/index.html b/test/fixtures/yaml/index.html deleted file mode 100644 index 2894bd45c..000000000 --- a/test/fixtures/yaml/index.html +++ /dev/null @@ -1,200 +0,0 @@ - - - - - - Swagger Pet Store - - - - - - - -
-
-

Swagger Pet Store

- -

- This sample API is powered by the Swagger Express Middleware mock - in an otherwise empty Express application. There's no extra configuration, custom code, or third-party-middleware. -

-

- Read the Walkthroughs -

-
- -
-
- Add/Edit a Pet - -

- Use a tool like Postman or curl - to perform more advanced operations. See the full Swagger API - for all the operations available. And be sure to try - a few - queries. -

- -
-
- -
-
-

- - -   - - - -   - - - - - All Pets - - -

-
-
- -
-
- Add Photos - -

- You can also delete or view individual photos by their ID. - See the full Swagger API for all the operations available. -

- -
-
- -
-
-
- -
-
-
- -
-
-

- - -   - - - - - Fido's Photos - - -

-
-
-
- - - - - - - - diff --git a/test/fixtures/yaml/notthefile.json b/test/fixtures/yaml/notthefile.json deleted file mode 100644 index 0967ef424..000000000 --- a/test/fixtures/yaml/notthefile.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/test/swagger.test.js b/test/swagger.test.js index 671219e24..846e3ea6c 100644 --- a/test/swagger.test.js +++ b/test/swagger.test.js @@ -17,7 +17,7 @@ describe('swagger action', () => { swagger.run( config, - { args: ['swagger', './test/fixtures/json/swagger.json'], opts: { token: apiKey } }, + { args: ['swagger', './test/fixtures/swagger.json'], opts: { token: apiKey } }, err => { if (err) return done(err); mock.done(); @@ -37,7 +37,7 @@ describe('swagger action', () => { swagger.run( config, { - args: ['swagger', './test/fixtures/json/swagger.json'], + args: ['swagger', './test/fixtures/swagger.json'], opts: { token: `${apiKey}-${id}` }, }, err => {