From 265c22f6d3b271ac5bb5fd017cbda5c73c5f1766 Mon Sep 17 00:00:00 2001 From: adrinr Date: Wed, 1 Feb 2023 11:49:25 +0000 Subject: [PATCH] Remove redundant env from jestTestcontainersConfigGenerator --- jestTestcontainersConfigGenerator.js | 2 +- packages/backend-core/jest-testcontainers-config.js | 4 ++-- packages/server/jest-testcontainers-config.js | 4 ++-- packages/worker/jest-testcontainers-config.js | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jestTestcontainersConfigGenerator.js b/jestTestcontainersConfigGenerator.js index ba91090a91..4b94cf5016 100644 --- a/jestTestcontainersConfigGenerator.js +++ b/jestTestcontainersConfigGenerator.js @@ -1,4 +1,4 @@ -module.exports = dependenciesEnv => { +module.exports = () => { return { dockerCompose: { composeFilePath: "../../hosting", diff --git a/packages/backend-core/jest-testcontainers-config.js b/packages/backend-core/jest-testcontainers-config.js index 8a19389492..8ac0f0cd9d 100644 --- a/packages/backend-core/jest-testcontainers-config.js +++ b/packages/backend-core/jest-testcontainers-config.js @@ -1,8 +1,8 @@ const { join } = require("path") -const { parsed: env } = require("dotenv").config({ +require("dotenv").config({ path: join(__dirname, "..", "..", "hosting", ".env"), }) const jestTestcontainersConfigGenerator = require("../../jestTestcontainersConfigGenerator") -module.exports = jestTestcontainersConfigGenerator(env) +module.exports = jestTestcontainersConfigGenerator() diff --git a/packages/server/jest-testcontainers-config.js b/packages/server/jest-testcontainers-config.js index 8a19389492..8ac0f0cd9d 100644 --- a/packages/server/jest-testcontainers-config.js +++ b/packages/server/jest-testcontainers-config.js @@ -1,8 +1,8 @@ const { join } = require("path") -const { parsed: env } = require("dotenv").config({ +require("dotenv").config({ path: join(__dirname, "..", "..", "hosting", ".env"), }) const jestTestcontainersConfigGenerator = require("../../jestTestcontainersConfigGenerator") -module.exports = jestTestcontainersConfigGenerator(env) +module.exports = jestTestcontainersConfigGenerator() diff --git a/packages/worker/jest-testcontainers-config.js b/packages/worker/jest-testcontainers-config.js index 8a19389492..8ac0f0cd9d 100644 --- a/packages/worker/jest-testcontainers-config.js +++ b/packages/worker/jest-testcontainers-config.js @@ -1,8 +1,8 @@ const { join } = require("path") -const { parsed: env } = require("dotenv").config({ +require("dotenv").config({ path: join(__dirname, "..", "..", "hosting", ".env"), }) const jestTestcontainersConfigGenerator = require("../../jestTestcontainersConfigGenerator") -module.exports = jestTestcontainersConfigGenerator(env) +module.exports = jestTestcontainersConfigGenerator()