1
0
Fork 0
mirror of synced 2024-08-02 20:01:43 +12:00

Merge pull request #10179 from Budibase/qa/rename-jobs

qa-core job tidy up
This commit is contained in:
Martin McKeaveney 2023-04-02 22:19:30 +01:00 committed by GitHub
commit f3bbd3aac1
8 changed files with 9 additions and 13 deletions

View file

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

1
qa-core/.gitignore vendored
View file

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

View file

@ -18,10 +18,9 @@
"docker:down": "docker-compose down", "docker:down": "docker-compose down",
"api:server:setup": "npm run docker:up && env-cmd ts-node ../packages/builder/ts/setup.ts", "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: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: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": { "jest": {
"preset": "ts-jest", "preset": "ts-jest",

View file

@ -17,7 +17,7 @@ class InternalAPIClient {
constructor(appId?: string) { constructor(appId?: string) {
if (!env.BUDIBASE_HOST) { 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.host = `${env.BUDIBASE_HOST}/api`
this.appId = appId this.appId = appId

View file

@ -16,7 +16,7 @@ class AccountsAPIClient {
constructor(appId?: string) { constructor(appId?: string) {
if (!env.BUDIBASE_ACCOUNTS_URL) { 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.host = `${env.BUDIBASE_ACCOUNTS_URL}/api`
this.appId = appId this.appId = appId

View file

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

View file

@ -16,7 +16,7 @@ class AccountsAPIClient {
constructor(appId?: string) { constructor(appId?: string) {
if (!env.BUDIBASE_ACCOUNTS_URL) { 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.host = `${env.BUDIBASE_ACCOUNTS_URL}/api`
this.appId = appId this.appId = appId

View file

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