tidy up

.github/workflows/budibase_ci.yml

@@ -54,11 +54,11 @@ jobs:
         verbose: true 
 
     # TODO: parallelise this
-    # - name: Cypress run
-    #   uses: cypress-io/github-action@v2
-    #   with:
-    #     install: false
-    #     command: yarn test:e2e:ci
+    - name: Cypress run
+      uses: cypress-io/github-action@v2
+      with:
+        install: false
+        command: yarn test:e2e:ci
 
     - name: QA Core Integration Tests
       run: | 

.gitignore

@@ -63,6 +63,7 @@ typings/
 
 # dotenv environment variables file
 .env
+!qa-core/.env
 !hosting/.env
 hosting/.generated-nginx.dev.conf
 hosting/proxy/.generated-nginx.prod.conf

packages/builder/cypress/setup.js

@@ -22,12 +22,6 @@ process.env.COUCH_DB_PASSWORD = "budibase"
 process.env.INTERNAL_API_KEY = "budibase"
 process.env.ALLOW_DEV_AUTOMATIONS = 1
 
-// TODO: inject at the qa-core level
-process.env.BB_ADMIN_USER_EMAIL = "qa@budibase.com"
-process.env.BB_ADMIN_USER_PASSWORD = "budibase"
-process.env.ENCRYPTED_TEST_PUBLIC_API_KEY =
-  "a65722f06bee5caeadc5d7ca2f543a43-d610e627344210c643bb726f"
-
 // Stop info logs polluting test outputs
 process.env.LOG_LEVEL = "error"
 

qa-core/package.json

@@ -12,8 +12,8 @@
     "test": "jest --runInBand",
     "test:watch": "jest --watch",
     "test:debug": "DEBUG=1 jest",
-    "api:server:setup": "ts-node ../packages/builder/cypress/ts/setup.ts",
-    "api:server:setup:ci": "node ../packages/builder/cypress/setup.js",
+    "api:server:setup": "env-cmd ts-node ../packages/builder/cypress/ts/setup.ts",
+    "api:server:setup:ci": "env-cmd node ../packages/builder/cypress/setup.js",
     "api:test:ci": "start-server-and-test api:server:setup:ci http://localhost:4100/builder test",
     "api:test": "start-server-and-test api:server:setup http://localhost:4100/builder test"
   },
@@ -36,6 +36,7 @@
     "@types/jest": "29.0.0",
     "@types/node-fetch": "2.6.2",
     "chance": "1.1.8",
+    "env-cmd": "^10.1.0",
     "jest": "28.0.2",
     "prettier": "2.7.1",
     "start-server-and-test": "1.14.0",

qa-core/src/config/public-api/TestConfiguration/PublicAPIClient.ts

@@ -38,8 +38,6 @@ class PublicAPIClient {
           Accept: "application/json",
           ...options.headers,
         },
-        // TODO: See if this is necessary
-        credentials: "include",
       }
 
       // @ts-ignore

qa-core/yarn.lock

@@ -1054,6 +1054,11 @@ combined-stream@^1.0.8:
   dependencies:
     delayed-stream "~1.0.0"
 
+commander@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
+  integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -1071,7 +1076,7 @@ create-require@^1.1.0:
   resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
   integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
 
-cross-spawn@^7.0.3:
+cross-spawn@^7.0.0, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -1149,6 +1154,14 @@ emoji-regex@^8.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
+env-cmd@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/env-cmd/-/env-cmd-10.1.0.tgz#c7f5d3b550c9519f137fdac4dd8fb6866a8c8c4b"
+  integrity sha512-mMdWTT9XKN7yNth/6N6g2GuKuJTsKMDHlQFUDacb/heQRRWOTIZ42t1rMHnQu4jYxU1ajdTeJM+9eEETlqToMA==
+  dependencies:
+    commander "^4.0.0"
+    cross-spawn "^7.0.0"
+
 error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"