MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move more stuff to .env.test

This commit is contained in:
Adria Navarro 2023-01-23 18:02:28 +00:00
parent e9cd0984d9
commit 359e2d1d1f
4 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/server/.env.test
View File

@ -1,3 +1,7 @@
JWT_SECRET=testsecret JWT_SECRET=testsecret
COUCH_DB_PASSWORD=test_couchdb_user COUCHDB_USER=test_couchdb_user
COUCH_DB_USER=test_couchdb_password COUCH_DB_USER=test_couchdb_user
COUCHDB_PASSWORD=test_couchdb_password
COUCH_DB_PASSWORD=test_couchdb_password
MINIO_ACCESS_KEY=budibase
MINIO_SECRET_KEY=budibase

11
packages/server/src/environment.ts
View File

@ -21,21 +21,12 @@ function isCypress() {
} }
let LOADED = false let LOADED = false
if (!LOADED) { if (!LOADED && isDev() && !isTest()) {
if (isDev() && !isTest()) {
require("dotenv").config({ require("dotenv").config({
path: join(__dirname, "..", ".env"), path: join(__dirname, "..", ".env"),
}) })
LOADED = true LOADED = true
} }
// TODO: remove when all tests (cypress, e2e, unit, etc) use docker for testing dependencies
else if (isJest()) {
require("dotenv").config({
path: join(__dirname, "..", ".env.test"),
})
LOADED = true
}
}
function parseIntSafe(number?: string) { function parseIntSafe(number?: string) {
if (number) { if (number) {

4
packages/server/src/tests/jestEnv.ts
View File

@ -1,10 +1,8 @@
import env from "../environment" import env from "../environment"
import { env as coreEnv } from "@budibase/backend-core"
import { tmpdir } from "os" import { tmpdir } from "os"
env._set("SELF_HOSTED", "1") env._set("SELF_HOSTED", "1")
env._set("NODE_ENV", "jest") env._set("NODE_ENV", "jest")
env._set("JWT_SECRET", "test-jwtsecret")
env._set("CLIENT_ID", "test-client-id") env._set("CLIENT_ID", "test-client-id")
// @ts-ignore // @ts-ignore
env._set("BUDIBASE_DIR", tmpdir("budibase-unittests")) env._set("BUDIBASE_DIR", tmpdir("budibase-unittests"))
@ -13,5 +11,3 @@ env._set("PORT", 0)
env._set("MINIO_URL", "http://localhost") env._set("MINIO_URL", "http://localhost")
env._set("MINIO_ACCESS_KEY", "test") env._set("MINIO_ACCESS_KEY", "test")
env._set("MINIO_SECRET_KEY", "test") env._set("MINIO_SECRET_KEY", "test")
coreEnv._set("COUCH_DB_USER", "budibase")
coreEnv._set("COUCH_DB_PASSWORD", "budibase")

11
packages/server/src/tests/jestSetup.ts
View File

@ -23,13 +23,18 @@ function overrideConfigValue(key: string, value: string) {
coreEnv._set(key, value) coreEnv._set(key, value)
} }
overrideConfigValue("COUCH_DB_PORT", global.__TESTCONTAINERS_DEVENV_PORT_5984__) const globalSafe = global as any
overrideConfigValue(
"COUCH_DB_PORT",
globalSafe.__TESTCONTAINERS_DEVENV_PORT_5984__
)
overrideConfigValue( overrideConfigValue(
"COUCH_DB_URL", "COUCH_DB_URL",
`http://${global.__TESTCONTAINERS_DEVENV_IP__}:${global.__TESTCONTAINERS_DEVENV_PORT_5984__}` `http://${globalSafe.__TESTCONTAINERS_DEVENV_IP__}:${globalSafe.__TESTCONTAINERS_DEVENV_PORT_5984__}`
) )
overrideConfigValue( overrideConfigValue(
"MINIO_URL", "MINIO_URL",
`http://${global.__TESTCONTAINERS_DEVENV_IP__}:${global.__TESTCONTAINERS_DEVENV_PORT_9000__}` `http://${globalSafe.__TESTCONTAINERS_DEVENV_IP__}:${globalSafe.__TESTCONTAINERS_DEVENV_PORT_9000__}`
) )