diff --git a/globalSetup.ts b/globalSetup.ts index 94dec3ca77..4cb542a3c3 100644 --- a/globalSetup.ts +++ b/globalSetup.ts @@ -1,7 +1,7 @@ import { GenericContainer, Wait } from "testcontainers" export default async function setup() { - const container = await new GenericContainer("budibase/couchdb") + await new GenericContainer("budibase/couchdb") .withExposedPorts(5984) .withEnvironment({ COUCHDB_PASSWORD: "budibase", @@ -22,8 +22,4 @@ export default async function setup() { ).withStartupTimeout(20000) ) .start() - - // @ts-ignore - // eslint-disable-next-line no-undef - globalThis.__COUCHDB_CONTAINER_ID__ = container.getId() } diff --git a/globalTeardown.ts b/globalTeardown.ts deleted file mode 100644 index 4be959c1f9..0000000000 --- a/globalTeardown.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { getContainerRuntimeClient } from "testcontainers" - -export default async function teardown() { - const client = await getContainerRuntimeClient() - - // @ts-expect-error - // eslint-disable-next-line no-undef - const containerId = globalThis.__COUCHDB_CONTAINER_ID__ - const container = client.container.getById(containerId) - await client.container.stop(container) - await client.container.remove(container) -} diff --git a/packages/backend-core/jest.config.ts b/packages/backend-core/jest.config.ts index fd60caf551..c944b0d7e1 100644 --- a/packages/backend-core/jest.config.ts +++ b/packages/backend-core/jest.config.ts @@ -3,7 +3,6 @@ import { Config } from "@jest/types" const baseConfig: Config.InitialProjectOptions = { setupFiles: ["./tests/jestEnv.ts"], globalSetup: "./../../globalSetup.ts", - globalTeardown: "./../../globalTeardown.ts", setupFilesAfterEnv: ["./tests/jestSetup.ts"], transform: { "^.+\\.ts?$": "@swc/jest", diff --git a/packages/server/jest.config.ts b/packages/server/jest.config.ts index bad03f045c..85c75f9039 100644 --- a/packages/server/jest.config.ts +++ b/packages/server/jest.config.ts @@ -18,7 +18,6 @@ const baseConfig: Config.InitialProjectOptions = { ], setupFilesAfterEnv: ["./src/tests/jestSetup.ts"], globalSetup: "./../../globalSetup.ts", - globalTeardown: "./../../globalTeardown.ts", transform: { "^.+\\.ts?$": "@swc/jest", "^.+\\.js?$": "@swc/jest", diff --git a/packages/worker/jest.config.ts b/packages/worker/jest.config.ts index 9113df0664..f6ff7e7c95 100644 --- a/packages/worker/jest.config.ts +++ b/packages/worker/jest.config.ts @@ -3,7 +3,6 @@ import * as fs from "fs" const config: Config.InitialOptions = { globalSetup: "./../../globalSetup.ts", - globalTeardown: "./../../globalTeardown.ts", setupFiles: ["./src/tests/jestEnv.ts"], setupFilesAfterEnv: ["./src/tests/jestSetup.ts"], collectCoverageFrom: ["src/**/*.{js,ts}", "../backend-core/src/**/*.{js,ts}"],