plum-e2e 2.5.6 → 2.5.8

package/backend/config/scripts/run-tests.js

@@ -69,18 +69,13 @@ try {
 
 		// hooks.ts calls dotenv.config() with no path, which defaults to process.cwd().
 		// When running from a temp dir there is no .env there, so vars like BASE_URL
-		// would be undefined. Pre-load BACKEND_DIR's .env so they are already in
-		// process.env before dotenv.config() runs (dotenv never overwrites existing vars).
-		const backendEnvPath = path.resolve(__dirname, '..', '..', '.env');
-		if (fs.existsSync(backendEnvPath)) {
-			for (const line of fs.readFileSync(backendEnvPath, 'utf8').split(/\r?\n/)) {
-				const m = line.match(/^([A-Za-z_]\w*)\s*=\s*(.*?)(\s*#.*)?$/);
-				if (m) {
-					const key = m[1];
-					const val = m[2].trim().replace(/^(['"])(.*)\1$/, '$2');
-					if (!(key in process.env)) process.env[key] = val;
-				}
-			}
+		// would be undefined. A dispatched node job already has these injected into
+		// process.env by node.routes.js from the primary's payload; this is just a
+		// fallback for local/standalone runs, so it never overwrites what's already set.
+		const { loadTestEnv } = require('../../lib/testEnv');
+		const backendEnv = loadTestEnv(path.resolve(__dirname, '..', '..'));
+		for (const [key, val] of Object.entries(backendEnv)) {
+			if (!(key in process.env)) process.env[key] = val;
 		}
 
 		fs.writeFileSync(

package/backend/lib/testEnv.js

@@ -0,0 +1,38 @@
+/*
+ * This file is part of Plum.
+ *
+ * Plum is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Plum is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Plum. If not, see https://www.gnu.org/licenses/.
+ */
+
+const fs = require('fs');
+const path = require('path');
+
+/**
+ * Parses a dir's `.env` into a plain object. Used to hand a remote runner node
+ * the same BASE_URL/IS_HEADLESS/custom test vars the primary has, so nodes stay
+ * stateless runners instead of needing their own local `.env`.
+ */
+function loadTestEnv(dir) {
+	const out = {};
+	try {
+		const txt = fs.readFileSync(path.join(dir, '.env'), 'utf8');
+		for (const line of txt.split(/\r?\n/)) {
+			const m = line.match(/^([A-Za-z_]\w*)\s*=\s*(.*?)(\s*#.*)?$/);
+			if (m) out[m[1]] = m[2].trim().replace(/^(['"])(.*)\1$/, '$2');
+		}
+	} catch {}
+	return out;
+}
+
+module.exports = { loadTestEnv };

package/backend/routes/node.routes.js

@@ -47,7 +47,7 @@ router.post('/shutdown', authGuard, (req, res) => {
 
 // Start a remote test job
 router.post('/execute', authGuard, (req, res) => {
-	const { tags, browser = 'chromium', workers = 1, tests = null } = req.body;
+	const { tags, browser = 'chromium', workers = 1, tests = null, env: userEnv = {} } = req.body;
 	const jobId = crypto.randomUUID();
 
 	// path.resolve ensures absolute even if TMPDIR env var is set to a relative path
@@ -84,6 +84,11 @@ router.post('/execute', authGuard, (req, res) => {
 
 	const env = {
 		...process.env,
+		// User/test vars (BASE_URL, IS_HEADLESS, custom secrets) forwarded from the
+		// primary's own .env — nodes are stateless runners and shouldn't need their
+		// own copy. Spread before the job-control vars below so a stray same-named
+		// var in the user's .env can never override how this job actually runs.
+		...userEnv,
 		TAG: tags || '',
 		TRIGGER: TRIGGER_REMOTE,
 		BROWSER: browser,

package/backend/services/runnerService.js

@@ -18,6 +18,7 @@
 const fs = require('fs');
 const path = require('path');
 const prisma = require('./prisma');
+const { loadTestEnv } = require('../lib/testEnv');
 
 // ---------------------------------------------------------------------------
 // Runner CRUD
@@ -170,7 +171,13 @@ async function dispatchAndPoll(
 				'Content-Type': 'application/json',
 				Authorization: `Bearer ${runner.token}`
 			},
-			body: JSON.stringify({ tags, browser, workers, tests: collectTestFiles() }),
+			body: JSON.stringify({
+				tags,
+				browser,
+				workers,
+				tests: collectTestFiles(),
+				env: loadTestEnv(process.cwd())
+			}),
 			signal: AbortSignal.timeout(10000)
 		});
 		if (!res.ok) throw new Error(`HTTP ${res.status}`);

package/frontend/src/lib/components/layout/RunnerPanel.svelte

@@ -123,7 +123,9 @@
 			runnerConfig.update((c) => {
 				if (!v && c.selectedRunners.includes(BUILTIN_RUNNER_ID)) {
 					const others = c.selectedRunners.filter((r) => r !== BUILTIN_RUNNER_ID);
-					return { ...c, selectedRunners: others.length > 0 ? others : c.selectedRunners };
+					const fallback =
+						others.length > 0 ? others : availableRunners[0] ? [availableRunners[0].id] : [];
+					return { ...c, selectedRunners: fallback };
 				}
 				return c;
 			});
@@ -601,7 +603,7 @@
 						</button>
 						{#if runnersOpen}
 							<div class="dropdown-menu runners-menu" transition:fly={{ y: 6, duration: 130 }}>
-								{#if $builtInEnabled}
+								{#if $builtInEnabled || isRunnerSelected(BUILTIN_RUNNER_ID)}
 									<label class="runner-option">
 										<input
 											type="checkbox"

package/frontend/src/lib/utils/format.js

@@ -73,13 +73,24 @@ export function keywordClass(kw) {
 	return 'kw-and';
 }
 
+// Matches both verbose tags (@test-login-1, @suite-login) and the TC-/TS-
+// displayId convention (@TC-001, @TS-001) used by default throughout the rest
+// of the app (test case/suite prefixes, configurable in Settings).
+function isSuiteTag(tag) {
+	return /suite/i.test(tag) || /^@ts-?\d+/i.test(tag);
+}
+
+function isTestCaseTag(tag) {
+	return /^@test[\w-]*/i.test(tag) || /^@tc-?\d+/i.test(tag);
+}
+
 export function scenarioTestTag(scenario) {
-	return scenario.tags?.find((tag) => /^@test[\w-]*/i.test(tag)) ?? null;
+	return scenario.tags?.find(isTestCaseTag) ?? null;
 }
 
 export function featureSuiteTag(feature) {
 	for (const scenario of feature.scenarios ?? []) {
-		const suiteTag = scenario.tags?.find((tag) => /suite/i.test(tag));
+		const suiteTag = scenario.tags?.find(isSuiteTag);
 		if (suiteTag) return suiteTag;
 	}
 	return null;
@@ -88,7 +99,7 @@ export function featureSuiteTag(feature) {
 export function visibleTags(scenario) {
 	const testTag = scenarioTestTag(scenario);
 	if (testTag) return [testTag];
-	return (scenario.tags ?? []).filter((tag) => !/suite/i.test(tag));
+	return (scenario.tags ?? []).filter((tag) => !isSuiteTag(tag));
 }
 
 const STATUS_RANK = { failed: 3, pending: 2, skipped: 1, passed: 0 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "plum-e2e",
-	"version": "2.5.6",
+	"version": "2.5.8",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/silverlunah/plum.git"