fix: env variable config overrides

iamkenos · Jun 25, 2024 · 5666f73 · 5666f73
1 parent 4acf61a
commit 5666f73
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 20 deletions.
diff --git a/demo/test/.env b/demo/test/.env
diff --git a/demo/test/cucumber.js b/demo/test/cucumber.js
@@ -1,2 +1,9 @@
 const { configure } = require('../../build/config');
-exports.default = configure();
+exports.default = configure({
+  baseURL: 'http://localhost:8080/',
+  browser: 'chromium',
+  timeout: 8000,
+  parallel: 10,
+  headless: true,
+  logLevel: 'info'
+});
diff --git a/src/config/index.ts b/src/config/index.ts
@@ -17,17 +17,17 @@ export function configure(overrides?: Partial<Config>) {
   dotenv.config({ path: process.env.NODE_ENV ? path.join(baseDir, `.env.${process.env.NODE_ENV}`) : path.join(baseDir, ".env") });
 
   // custom options defaults
-  const baseURL = process.env.BASE_URL || overrides?.baseURL || "";
-  const browser = process.env.BROWSER || overrides?.browser || "chromium";
-  const debug = process.env.DEBUG === "true" || overrides?.debug || false;
-  const downloadsDir = path.join(baseDir, process.env.DOWNLOADS_DIR || overrides?.downloadsDir || "downloads/");
-  const headless = process.env.HEADLESS === "true" || overrides?.headless || false;
-  const locale = process.env.LOCALE || overrides?.locale || undefined;
-  const logLevel = process.env.LOG_LEVEL || overrides?.logLevel || "info";
+  const baseURL = process.env.BASE_URL ? process.env.BASE_URL : overrides?.baseURL || "";
+  const browser = process.env.BROWSER ? process.env.BROWSER : overrides?.browser || "chromium";
+  const debug = process.env.DEBUG ? process.env.DEBUG === "true" : overrides?.debug || false;
+  const downloadsDir = path.join(baseDir, process.env.DOWNLOADS_DIR ? process.env.DOWNLOADS_DIR : overrides?.downloadsDir || "downloads/");
+  const headless = process.env.HEADLESS ? process.env.HEADLESS === "true" : overrides?.headless || false;
+  const locale = process.env.LOCALE ? process.env.LOCALE : overrides?.locale || undefined;
+  const logLevel = process.env.LOG_LEVEL ? process.env.LOG_LEVEL : overrides?.logLevel || "info";
   const pages = (overrides?.pages || ["fixtures/pages/**/*.page{,.*}.ts"]).map(i => path.join(baseDir, i));
-  const resultsDir = path.join(baseDir, process.env.RESULTS_DIR || overrides?.resultsDir || "results/");
-  const snapshotsDir = path.join(baseDir, process.env.SNAPSHOTS_DIR || overrides?.snapshotsDir || "snapshots/");
-  const timeout = +process.env.TIMEOUT || overrides?.timeout || 30000;
+  const resultsDir = path.join(baseDir, process.env.RESULTS_DIR ? process.env.RESULTS_DIR : overrides?.resultsDir || "results/");
+  const snapshotsDir = path.join(baseDir, process.env.SNAPSHOTS_DIR ? process.env.SNAPSHOTS_DIR : overrides?.snapshotsDir || "snapshots/");
+  const timeout = +process.env.TIMEOUT ? +process.env.TIMEOUT : overrides?.timeout || 30000;
   const browserOptions = { headless, ...overrides?.browserOptions };
   const contextOptions = { baseURL, ignoreHTTPSErrors: false, viewport: { width: 1675, height: 1020 }, ...overrides?.contextOptions };
   const snapshots = {
@@ -57,12 +57,12 @@ export function configure(overrides?: Partial<Config>) {
     ...overrides,
     format: ["summary", `"json":"${resultsDir}report.json"`, `"file://${path.join(__dirname, "../core/utils/reporter.js")}":"${resultsDir}allure/report.json"`, ...overrides?.format || [] ],
     formatOptions: { snippetInterface: "async-await", printAttachments: false },
-    parallel: debug ? 0 : +process.env.PARALLEL || overrides?.parallel || 0,
+    parallel: debug ? 0 : overrides?.parallel || +process.env.PARALLEL || 0,
     paths: process.env.PATHS ? [process.env.PATHS].filter(Boolean) : (overrides?.paths || ["features/"]).map(i => path.join(baseDir, i)),
     require: [path.join(__dirname, "../core/gherkin/*.def.js")].concat((overrides?.require || ["fixtures/**/*.def.ts"]).map(i => path.join(baseDir, i))),
     requireModule: ["ts-node/register/transpile-only", "tsconfig-paths/register"],
     strict: false,
-    tags: process.env.TAGS || overrides?.tags,
+    tags: overrides?.tags || process.env.TAGS,
     worldParameters: overrides?.worldParameters || {}
   };
 

diff --git a/src/config/types.ts b/src/config/types.ts
@@ -8,7 +8,7 @@ export interface Config extends Omit<IConfiguration, "publish" | "publishQuiet">
   /** Custom: The base directory where most config paths will be resolved from */
   baseDir: string;
   baseURL: string;
-  browser: string;
+  browser: "chromium" | "firefox" | "webkit" ;
   browserOptions: Omit<LaunchOptions, "headless">;
   contextOptions: Omit<BrowserContextOptions, "baseURL">;
   /** Custom: Whether to run in debug mode or not */