Improve tests for handling additionalProperties

Signed-off-by: Alan Cha <[email protected]>

Author: Alan-Cha

packages/openapi-to-graphql/test/example_api.test.ts

@@ -801,24 +801,37 @@ test('Request data is correctly de-sanitized to be sent', () => {
   })
 })
 
+// Testing additionalProperties field in schemas
 test('Fields with arbitrary JSON (e.g., maps) can be returned', () => {
   const query = `{
-    car (username: "arlene") {
-      color
-      model
+    cars {
       tags
     }
   }`
   return graphql(createdSchema, query, null, {}).then(result => {
     expect(result).toEqual({
       data: {
-        car: {
-          color: 'black',
-          model: 'BMW 7 series',
-          tags: {
-            impression: 'decadent'
+        "cars": [
+          {
+            "tags": null
+          },
+          {
+            "tags": {
+              "speed": "extreme"
+            }
+          },
+          {
+            "tags": {
+              "impression": "decadent",
+              "condition": "slightly beat-up"
+            }
+          },
+          {
+            "tags": {
+              "impression": "decadent"
+            }
           }
-        }
+        ]
       }
     })
   })
@@ -834,7 +847,7 @@ test('Capitalized enum values can be returned', () => {
     expect(result).toEqual({
       data: {
         car: {
-          kind: 'LIMOSINE'
+          kind: 'SEDAN'
         }
       }
     })

packages/openapi-to-graphql/test/example_api_server.js

@@ -93,6 +93,39 @@ function startServer(PORT) {
     }
   }
 
+  const Cars = {
+    arlene: {
+      model: 'Retro Rides',
+      color: 'yellow',
+      kind: 'SEDAN'
+    },
+    will: {
+      model: 'Speedzone Speedster',
+      color: 'red',
+      tags: {
+        speed: 'extreme'
+      },
+      kind: 'RACE_CAR'
+    },
+    johnny: {
+      model: 'Glossy German',
+      color: 'silver',
+      tags: {
+        impression: 'decadent',
+        condition: 'slightly beat-up'
+      },
+      kind: 'LIMOSINE'
+    },
+    heather: {
+      model: 'Glossy German',
+      color: 'black',
+      tags: {
+        impression: 'decadent'
+      },
+      kind: 'LIMOSINE'
+    }
+  }
+
   const Companies = {
     binsol: {
       id: 'binsol',
@@ -344,18 +377,8 @@ function startServer(PORT) {
 
   app.get('/api/users/:username/car', (req, res) => {
     console.log(req.method, req.path)
-    if (
-      typeof req.params.username === 'string' &&
-      req.params.username in Users
-    ) {
-      res.send({
-        model: 'BMW 7 series',
-        color: 'black',
-        tags: {
-          impression: 'decadent'
-        },
-        kind: 'LIMOSINE'
-      })
+    if (req.params.username in Users) {
+      res.send(Cars[req.params.username])
     } else {
       res.status(404).send({
         message: 'Wrong username.'
@@ -399,6 +422,11 @@ function startServer(PORT) {
     }
   })
 
+  app.get('/api/cars', (req, res) => {
+    console.log(req.method, req.path)
+    res.send(Array.from(Object.values(Cars)))
+  })
+
   app.get('/api/companies/:id', (req, res) => {
     console.log(req.method, req.path)
     res.send(Companies[req.params.id])

packages/openapi-to-graphql/test/fixtures/example_oas.json

@@ -199,6 +199,27 @@
         }
       }
     },
+    "/cars": {
+      "get": {
+        "operationId": "getAllCars",
+        "description": "Returns information about all employee cars",
+        "responses": {
+          "200": {
+            "description": "Everyone's cars",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/car"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/companies/{id}": {
       "get": {
         "operationId": "getCompanyById",
@@ -893,7 +914,7 @@
         ],
         "responses": {
           "200": {
-            "description": "A user represents a natural person.",
+            "description": "A trashcan",
             "content": {
               "application/json": {
                 "schema": {
@@ -911,7 +932,7 @@
         "description": "Returns the (contents of a) trashcan from a specific office",
         "responses": {
           "200": {
-            "description": "A user represents a natural person.",
+            "description": "Many trashcans",
             "content": {
               "application/json": {
                 "schema": {
@@ -1082,7 +1103,7 @@
           },
           "kind": {
             "type": "string",
-            "enum": ["SEDAN", "SUV", "MINIVAN", "LIMOSINE"]
+            "enum": ["SEDAN", "SUV", "MINIVAN", "LIMOSINE", "RACE_CAR"]
           }
         }
       },