qa-core job tidy up

qa-core/.env

@@ -4,6 +4,3 @@ COUCH_DB_URL=http://budibase:budibase@localhost:4567
 COUCH_DB_USER=budibase
 COUCH_DB_PASSWORD=budibase
 JWT_SECRET=test
-BUDIBASE_SERVER_URL=http://localhost:4100
-BUDIBASE_HOST= budirelease.live
-BUDIBASE_ACCOUNTS_URL=https://account.budirelease.live

qa-core/.gitignore

@@ -3,3 +3,4 @@ node_modules/
 watchtower-hook.json
 dist/
 .testReport.json
+testResults.json

qa-core/package.json

@@ -18,10 +18,9 @@
     "docker:down": "docker-compose down",
     "api:server:setup": "npm run docker:up && env-cmd ts-node ../packages/builder/ts/setup.ts",
     "api:server:setup:ci": "env-cmd node ../packages/builder/setup.js",
+    "api:test": "jest --runInBand --json --outputFile=testResults.json",
     "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",
+    "api:test:local": "start-server-and-test api:server:setup http://localhost:4100/builder test"
-    "api:test:local": "env-cmd jest --runInBand --testPathIgnorePatterns=\\\"\\/dataSources\\/\\\"",
-    "api:test:nightly": "env-cmd jest --runInBand --json --outputFile=testResults.json"
   },
   "jest": {
     "preset": "ts-jest",

qa-core/src/config/internal-api/TestConfiguration/InternalAPIClient.ts

@@ -17,7 +17,7 @@ class InternalAPIClient {
 
   constructor(appId?: string) {
     if (!env.BUDIBASE_HOST) {
-      throw new Error("Must set BUDIBASE_SERVER_URL env var")
+      throw new Error("Must set BUDIBASE_HOST env var")
     }
     this.host = `${env.BUDIBASE_HOST}/api`
     this.appId = appId

qa-core/src/config/internal-api/TestConfiguration/accountsAPIClient.ts

@@ -16,7 +16,7 @@ class AccountsAPIClient {
 
   constructor(appId?: string) {
     if (!env.BUDIBASE_ACCOUNTS_URL) {
-      throw new Error("Must set BUDIBASE_SERVER_URL env var")
+      throw new Error("Must set BUDIBASE_ACCOUNTS_URL env var")
     }
     this.host = `${env.BUDIBASE_ACCOUNTS_URL}/api`
     this.appId = appId

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

@@ -19,7 +19,7 @@ class PublicAPIClient {
   constructor(appId?: string) {
     if (!env.BUDIBASE_HOST) {
       throw new Error(
-        "Must set BUDIBASE_PUBLIC_API_KEY and BUDIBASE_SERVER_URL env vars"
+        "Must set BUDIBASE_HOST env var"
       )
     }
     this.host = `${env.BUDIBASE_HOST}/api/public/v1`

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

@@ -16,7 +16,7 @@ class AccountsAPIClient {
 
   constructor(appId?: string) {
     if (!env.BUDIBASE_ACCOUNTS_URL) {
-      throw new Error("Must set BUDIBASE_SERVER_URL env var")
+      throw new Error("Must set BUDIBASE_ACCOUNTS_URL env var")
     }
     this.host = `${env.BUDIBASE_ACCOUNTS_URL}/api`
     this.appId = appId

qa-core/src/environment.ts

@@ -1,5 +1,4 @@
 const env = {
-  BUDIBASE_SERVER_URL: process.env.BUDIBASE_SERVER_URL,
   BUDIBASE_ACCOUNT_URL: process.env.BUDIBASE_ACCOUNT_URL,
   BUDIBASE_PUBLIC_API_KEY: process.env.BUDIBASE_PUBLIC_API_KEY,
   BUDIBASE_ACCOUNTS_URL: process.env.BUDIBASE_ACCOUNTS_URL,