Upgrade start-server-and-test and return exitCode, fix failing tests. (…

…keystonejs#1652)
oguzhankarahan · Sep 16, 2019 · b73dd35 · b73dd35
1 parent 7689753
commit b73dd35
Show file tree

Hide file tree

Showing 12 changed files with 90 additions and 102 deletions.
diff --git a/.changeset/four-ads-collect/changes.json b/.changeset/four-ads-collect/changes.json
@@ -0,0 +1,9 @@
+{
+  "releases": [
+    { "name": "@keystone-alpha/cypress-project-access-control", "type": "patch" },
+    { "name": "@keystone-alpha/cypress-project-basic", "type": "patch" },
+    { "name": "@keystone-alpha/cypress-project-client-validation", "type": "patch" },
+    { "name": "@keystone-alpha/cypress-project-login", "type": "patch" }
+  ],
+  "dependents": []
+}
diff --git a/.changeset/four-ads-collect/changes.md b/.changeset/four-ads-collect/changes.md
@@ -0,0 +1 @@
+Fix flakey integration tests
diff --git a/package.json b/package.json
@@ -379,7 +379,7 @@
     "remark-cli": "^6.0.1",
     "remark-frontmatter": "^1.3.1",
     "remark-toc": "^5.1.1",
-    "start-server-and-test": "^1.7.13",
+    "start-server-and-test": "^1.10.2",
     "supertest-light": "^1.0.2",
     "terminal-link": "^1.3.0",
     "terminal-link-cli": "^2.0.0",

diff --git a/test-projects/access-control/cypress/integration/list/graphql.js b/test-projects/access-control/cypress/integration/list/graphql.js
@@ -68,7 +68,7 @@ describe('Access Control, List, GraphQL', () => {
           const name = getStaticListName(access);
 
           // The type is used in all the queries and mutations as a return type
-          if (access.create || access.read || access.update || access.delete) {
+          if (access.create || access.read || access.update || access.delete || access.auth) {
             expect(types, 'types').include(`${name}`);
             // Filter types are also available for update/delete/create (thanks
             // to nested mutations)

diff --git a/test-projects/access-control/cypress/integration/util.js b/test-projects/access-control/cypress/integration/util.js
@@ -7,7 +7,7 @@ function yesNo(truthy) {
 
 function getPrefix(access) {
   // prettier-ignore
-  let prefix = `${yesNo(access.create)}Create${yesNo(access.read)}Read${yesNo(access.update)}Update`;
+  let prefix = `${yesNo(access.create)}Create${yesNo(access.read)}Read${yesNo(access.update)}Update${yesNo(access.auth)}Auth`;
   if (Object.prototype.hasOwnProperty.call(access, 'delete')) {
     prefix = `${prefix}${yesNo(access.delete)}Delete`;
   }

diff --git a/test-projects/access-control/package.json b/test-projects/access-control/package.json
@@ -12,7 +12,7 @@
     "start": "node -r dotenv-safe/config server.js | sed -l -e 's/:\\s*undefined\\s*,/:null,/g' | tee out.log | pino-colada",
     "cypress:run:cmd": "node -r dotenv-safe/config `which cypress` run",
     "cypress:open:cmd": "node -r dotenv-safe/config `which cypress` open",
-    "prepare-test-server": "cross-env NODE_ENV=test DISABLE_LOGGING=true node -r dotenv-safe/config -e 'require(`execa`)(`start-server-and-test`, [`start`, `http-get://localhost:${process.env.PORT}/admin`, process.argv[1]], { stdio: `inherit` }).catch(error => { console.error(error.toString()); process.exit(error.code) })'",
+    "prepare-test-server": "cross-env NODE_ENV=test DISABLE_LOGGING=true node -r dotenv-safe/config -e 'require(`execa`)(`start-server-and-test`, [`start`, `http-get://localhost:${process.env.PORT}/admin`, process.argv[1]], { stdio: `inherit` }).catch(error => { console.error(error.toString()); process.exit(error.exitCode) })'",
     "cypress:run:ci": "touch .env && yarn prepare-test-server cypress:run:cmd",
     "cypress:run": "if [ -f .env ]; then yarn prepare-test-server cypress:run:cmd; else echo \"\nError: Must create a test-projects/access-control/.env file.\nSee test-projects/access-control/.env.example for values\n\"; exit 1; fi",
     "cypress:open": "if [ -f .env ]; then yarn prepare-test-server cypress:open:cmd; else echo \"\nError: Must create a test-projects/access-control/.env file.\nSee test-projects/access-control/.env.example for values\n\"; exit 1; fi"
@@ -35,6 +35,6 @@
     "mocha-junit-reporter": "^1.21.0",
     "mocha-multi-reporters": "^1.1.7",
     "pino-colada": "^1.4.4",
-    "start-server-and-test": "^1.7.13"
+    "start-server-and-test": "^1.10.2"
   }
-}
+}
diff --git a/test-projects/basic/cypress/integration/add-edit-delete-data.js b/test-projects/basic/cypress/integration/add-edit-delete-data.js
@@ -27,7 +27,7 @@ describe('Adding data', () => {
       cy.get('#list-page-create-button').click({ force: true });
 
       Object.keys(data).forEach(item => {
-        cy.get(`#${item}`).type(data[item]);
+        cy.get(`#${item}`).type(data[item], { force: true });
       });
 
       cy.get('#create-item-modal-submit-button').click({ force: true });

diff --git a/test-projects/basic/package.json b/test-projects/basic/package.json
@@ -13,7 +13,7 @@
     "start:debug": "node --inspect-brk -r dotenv-safe/config server.js | sed -l -e 's/:\\s*undefined\\s*,/:null,/g' | tee out.log | pino-colada",
     "cypress:run:cmd": "TZ=UTC node -r dotenv-safe/config `which cypress` run",
     "cypress:open:cmd": "TZ=UTC node -r dotenv-safe/config `which cypress` open",
-    "prepare-test-server": "cross-env NODE_ENV=test DISABLE_LOGGING=true node -r dotenv-safe/config -e 'require(`execa`)(`start-server-and-test`, [`start`, `http-get://localhost:${process.env.PORT}/admin`, process.argv[1]], { stdio: `inherit` }).catch(error => { console.error(error.toString()); process.exit(error.code) })'",
+    "prepare-test-server": "cross-env NODE_ENV=test DISABLE_LOGGING=true node -r dotenv-safe/config -e 'require(`execa`)(`start-server-and-test`, [`start`, `http-get://localhost:${process.env.PORT}/admin`, process.argv[1]], { stdio: `inherit` }).catch(error => { console.error(error.toString()); process.exit(error.exitCode) })'",
     "cypress:run:ci": "touch .env && yarn prepare-test-server cypress:run:cmd",
     "cypress:run": "if [ -f .env ]; then yarn prepare-test-server cypress:run:cmd; else echo \"\nError: Must create a test-projects/basic/.env file.\nSee test-projects/basic/.env.example for values\n\"; exit 1; fi",
     "cypress:open": "if [ -f .env ]; then yarn prepare-test-server cypress:open:cmd; else echo \"\nError: Must create a test-projects/basic/.env file.\nSee test-projects/basic/.env.example for values\n\"; exit 1; fi"
@@ -44,6 +44,6 @@
     "mocha-multi-reporters": "^1.1.7",
     "moment": "^2.24.0",
     "pino-colada": "^1.4.4",
-    "start-server-and-test": "^1.7.13"
+    "start-server-and-test": "^1.10.2"
   }
-}
+}
diff --git a/test-projects/client-validation/package.json b/test-projects/client-validation/package.json
@@ -12,7 +12,7 @@
     "start": "node -r dotenv-safe/config server.js | sed -l -e 's/:\\s*undefined\\s*,/:null,/g' | tee out.log | pino-colada",
     "cypress:run:cmd": "TZ=UTC node -r dotenv-safe/config `which cypress` run",
     "cypress:open:cmd": "TZ=UTC node -r dotenv-safe/config `which cypress` open",
-    "prepare-test-server": "cross-env NODE_ENV=test DISABLE_LOGGING=true node -r dotenv-safe/config -e 'require(`execa`)(`start-server-and-test`, [`start`, `http-get://localhost:${process.env.PORT}/admin`, process.argv[1]], { stdio: `inherit` }).catch(error => { console.error(error.toString()); process.exit(error.code) })'",
+    "prepare-test-server": "cross-env NODE_ENV=test DISABLE_LOGGING=true node -r dotenv-safe/config -e 'require(`execa`)(`start-server-and-test`, [`start`, `http-get://localhost:${process.env.PORT}/admin`, process.argv[1]], { stdio: `inherit` }).catch(error => { console.error(error.toString()); process.exit(error.exitCode) })'",
     "cypress:run:ci": "touch .env && yarn prepare-test-server cypress:run:cmd",
     "cypress:run": "if [ -f .env ]; then yarn prepare-test-server cypress:run:cmd; else echo \"\nError: Must create a test-projects/client-validation/.env file.\nSee test-projects/client-validation/.env.example for values\n\"; exit 1; fi",
     "cypress:open": "if [ -f .env ]; then yarn prepare-test-server cypress:open:cmd; else echo \"\nError: Must create a test-projects/client-validation/.env file.\nSee test-projects/client-validation/.env.example for values\n\"; exit 1; fi"
@@ -39,6 +39,6 @@
     "mocha-multi-reporters": "^1.1.7",
     "moment": "^2.24.0",
     "pino-colada": "^1.4.4",
-    "start-server-and-test": "^1.7.13"
+    "start-server-and-test": "^1.10.2"
   }
-}
+}
diff --git a/test-projects/login/index.js b/test-projects/login/index.js
@@ -14,11 +14,13 @@ const {
   byTracking,
 } = require('@keystone-alpha/list-plugins');
 
+const defaultAccess = ({ authentication: { item } }) => !!item;
+
 const keystone = new Keystone({
   name: 'Cypress Test Project For Login',
   adapter: new MongooseAdapter(),
   defaultAccess: {
-    list: ({ authentication: { item } }) => !!item,
+    list: defaultAccess,
   },
 });
 
@@ -37,6 +39,13 @@ keystone.createList('User', {
     isAdmin: { type: Checkbox },
   },
   labelResolver: item => `${item.name} <${item.email}>`,
+  access: {
+    create: defaultAccess,
+    read: defaultAccess,
+    update: defaultAccess,
+    delete: defaultAccess,
+    auth: true,
+  },
 });
 
 keystone.createList('Post', {

diff --git a/test-projects/login/package.json b/test-projects/login/package.json
@@ -12,7 +12,7 @@
     "start": "node -r dotenv-safe/config server.js | sed -l -e 's/:\\s*undefined\\s*,/:null,/g' | tee out.log | pino-colada",
     "cypress:run:cmd": "node -r dotenv-safe/config `which cypress` run",
     "cypress:open:cmd": "node -r dotenv-safe/config `which cypress` open",
-    "prepare-test-server": "cross-env NODE_ENV=test DISABLE_LOGGING=true node -r dotenv-safe/config -e 'require(`execa`)(`start-server-and-test`, [`start`, `http-get://localhost:${process.env.PORT}/admin`, process.argv[1]], { stdio: `inherit` }).catch(error => { console.error(error.toString()); process.exit(error.code) })'",
+    "prepare-test-server": "cross-env NODE_ENV=test DISABLE_LOGGING=true node -r dotenv-safe/config -e 'require(`execa`)(`start-server-and-test`, [`start`, `http-get://localhost:${process.env.PORT}/admin`, process.argv[1]], { stdio: `inherit` }).catch(error => { console.error(error.toString()); process.exit(error.exitCode) })'",
     "cypress:run:ci": "cross-env NODE_ENV=production touch .env && keystone build && yarn prepare-test-server cypress:run:cmd",
     "cypress:run": "if [ -f .env ]; then yarn prepare-test-server cypress:run:cmd; else echo \"\nError: Must create a test-projects/login/.env file.\nSee test-projects/login/.env.example for values\n\"; exit 1; fi",
     "cypress:open": "if [ -f .env ]; then yarn prepare-test-server cypress:open:cmd; else echo \"\nError: Must create a test-projects/login/.env file.\nSee test-projects/login/.env.example for values\n\"; exit 1; fi"
@@ -38,6 +38,6 @@
     "mocha-junit-reporter": "^1.21.0",
     "mocha-multi-reporters": "^1.1.7",
     "pino-colada": "^1.4.4",
-    "start-server-and-test": "^1.7.13"
+    "start-server-and-test": "^1.10.2"
   }
-}
+}