Make cookie test less brittle

Alan-Cha · Alan-Cha · commit 8fee416cd5d6 · 2020-04-23T10:10:57.000-04:00
Signed-off-by: Alan Cha &lt;Alan.cha1@ibm.com&gt;
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ node_js:
   - "9"
   - "10"
   - "11"
+  - "12"
 
 os:
   - linux
diff --git a/packages/openapi-to-graphql/lib/preprocessor.js b/packages/openapi-to-graphql/lib/preprocessor.js
diff --git a/packages/openapi-to-graphql/lib/preprocessor.js.map b/packages/openapi-to-graphql/lib/preprocessor.js.map
diff --git a/packages/openapi-to-graphql/package.json b/packages/openapi-to-graphql/package.json
@@ -88,6 +88,7 @@
     "aedes": "^0.40.1",
     "aedes-persistence": "^7.2.1",
     "body-parser": "^1.18.3",
+    "cookie-parser": "^1.4.5",
     "express": "^4.16.4",
     "express-graphql": "^0.9.0",
     "glob": "^7.1.3",
diff --git a/packages/openapi-to-graphql/test/example_api.test.ts b/packages/openapi-to-graphql/test/example_api.test.ts
@@ -606,8 +606,7 @@ test('Get response with cookies', () => {
   return graphql(createdSchema, query).then(result => {
     expect(result).toEqual({
       data: {
-        cookie:
-          'Thanks for your cookie preferences: "cookie_type=chocolate chip; cookie_size=mega-sized; "'
+        cookie: `You ordered a mega-sized chocolate chip cookie!`
       }
     })
   })
diff --git a/packages/openapi-to-graphql/test/example_api_server.js b/packages/openapi-to-graphql/test/example_api_server.js
@@ -15,8 +15,11 @@ function startServer(PORT) {
   const app = express()
 
   const bodyParser = require('body-parser')
+  const cookieParser = require('cookie-parser')
+
   app.use(bodyParser.text())
   app.use(bodyParser.json())
+  app.use(cookieParser())
 
   const Users = {
     arlene: {
@@ -477,13 +480,15 @@ function startServer(PORT) {
   app.get('/api/cookie', (req, res) => {
     console.log(req.method, req.path, req.query, req.headers)
 
-    if ('cookie' in req.headers) {
+    if (req.cookies && req.cookies.cookie_type && req.cookies.cookie_size) {
       res
         .set('Content-Type', 'text/plain')
         .status(200)
-        .send(`Thanks for your cookie preferences: "${req.headers.cookie}"`)
+        .send(
+          `You ordered a ${req.cookies.cookie_size} ${req.cookies.cookie_type} cookie!`
+        )
     } else {
-      res.status(400).send('Need Cookie header parameter')
+      res.status(400).send('Need cookie header parameter')
     }
   })
 
diff --git a/packages/openapi-to-graphql/test/fixtures/example_oas7.json b/packages/openapi-to-graphql/test/fixtures/example_oas7.json
@@ -26,7 +26,7 @@
       "description": "The location of the local test server.",
       "variables": {
         "port": {
-          "default": "3008"
+          "default": "3007"
         },
         "basePath": {
           "default": "api"

-Original file line number
+Diff line change
   - "9"
   - "10"
   - "11"
 +  - "12"
 os:
   - linux