@rstest/browser 0.11.4 → 0.11.5

package/dist/index.js

@@ -3549,6 +3549,30 @@ const createBrowserRuntime = async ({ context, projectEntries: initialProjectEnt
             return false;
         }
     };
+    const serveContainerRoute = async (req, res, next)=>{
+        if (!req.url) return void next();
+        const url = new URL(req.url, 'http://localhost');
+        if ('/' === url.pathname) {
+            if (await respondWithDevServerHtml(url, res)) return;
+            const html = injectedContainerHtml || containerHtmlTemplate?.replace(OPTIONS_PLACEHOLDER, 'null');
+            if (html) {
+                res.setHeader('Content-Type', 'text/html');
+                res.end(html);
+                return;
+            }
+            res.statusCode = 502;
+            res.end('Container UI is not available.');
+            return;
+        }
+        if (url.pathname.startsWith('/container-static/')) {
+            if (await proxyDevServerAsset(req, res)) return;
+            if (serveContainer) return void serveContainer(req, res, next);
+            res.statusCode = 502;
+            res.end('Container assets are not available.');
+            return;
+        }
+        next();
+    };
     const buildProjectServer = async (project, isContainerServer)=>{
         const manifestPath = join(tempDir, toSafeVarName(project.environmentName), VIRTUAL_MANIFEST_FILENAME);
         const entry = getProjectEntry(project);
@@ -3585,7 +3609,10 @@ const createBrowserRuntime = async ({ context, projectEntries: initialProjectEnt
                 server: {
                     printUrls: false,
                     port: project.normalizedConfig.browser.port ?? (isContainerServer ? 4000 : 0),
-                    strictPort: project.normalizedConfig.browser.strictPort
+                    strictPort: project.normalizedConfig.browser.strictPort,
+                    setup: isContainerServer ? ({ server })=>{
+                        server.middlewares.use(serveContainerRoute);
+                    } : void 0
                 },
                 dev: createBrowserRsbuildDevConfig(enableHmr),
                 environments: {
@@ -3800,27 +3827,6 @@ const createBrowserRuntime = async ({ context, projectEntries: initialProjectEnt
                 }
                 return;
             }
-            if (isContainerServer) {
-                if ('/' === url.pathname) {
-                    if (await respondWithDevServerHtml(url, res)) return;
-                    const html = injectedContainerHtml || containerHtmlTemplate?.replace(OPTIONS_PLACEHOLDER, 'null');
-                    if (html) {
-                        res.setHeader('Content-Type', 'text/html');
-                        res.end(html);
-                        return;
-                    }
-                    res.statusCode = 502;
-                    res.end('Container UI is not available.');
-                    return;
-                }
-                if (url.pathname.startsWith('/container-static/')) {
-                    if (await proxyDevServerAsset(req, res)) return;
-                    if (serveContainer) return void serveContainer(req, res, next);
-                    res.statusCode = 502;
-                    res.end('Container assets are not available.');
-                    return;
-                }
-            }
             if ('/runner.html' === url.pathname) {
                 res.setHeader('Content-Type', 'text/html');
                 res.end(htmlTemplate);
@@ -3906,10 +3912,11 @@ async function resolveProjectEntries(context, shardedEntries, browserProjects) {
     return collectProjectEntries(context, browserProjects);
 }
 const runBrowserController = async (context, options)=>{
-    const { allowEmptyWatchRun = false, allowEmptyRun = false, filesOnly = false, onTraceEvents, env } = options ?? {};
+    const { allowEmptyRun = false, filesOnly = false, onTraceEvents, env } = options ?? {};
     const buildStart = Date.now();
     const isWatchMode = 'watch' === context.command;
     const phaseTrackers = onTraceEvents ? new Map() : void 0;
+    const trackerKey = (project, testPath)=>`${project}\u0000${testPath}`;
     const browserProjects = options?.projects ?? getBrowserProjects(context);
     const useHeadlessDirect = browserProjects.every((project)=>project.normalizedConfig.browser.headless);
     const browserSourceMapCache = new Map();
@@ -3989,27 +3996,15 @@ const runBrowserController = async (context, options)=>{
     };
     const coverageConfig = browserProjects.find((project)=>project.normalizedConfig.coverage?.enabled)?.normalizedConfig.coverage;
     const coverageProvider = coverageConfig?.enabled ? await createCoverageProvider(coverageConfig, context.rootPath) : null;
-    const notifyTestRunEnd = async ({ duration, unhandledErrors, filterRerunTestPaths })=>{
+    const notifyTestRunEnd = async ({ duration, coverage })=>{
         if (!isWatchMode) return;
-        let mergedCoverage;
-        if (coverageProvider) {
-            const coverageMap = coverageProvider.createCoverageMap();
-            let hasCoverage = false;
-            for (const result of context.reporterResults.results)if (result.coverage) {
-                coverageMap.merge(result.coverage);
-                hasCoverage = true;
-            }
-            if (hasCoverage) mergedCoverage = coverageMap.toJSON();
-        }
         for (const reporter of context.reporters)await reporter.onTestRunEnd?.({
             results: context.reporterResults.results,
-            coverage: mergedCoverage,
+            coverage,
             testResults: context.reporterResults.testResults,
             duration,
             snapshotSummary: context.snapshotManager.summary,
-            getSourcemap: getBrowserSourcemap,
-            unhandledErrors,
-            filterRerunTestPaths
+            getSourcemap: getBrowserSourcemap
         });
     };
     const containerDevServerEnv = process.env.RSTEST_CONTAINER_DEV_SERVER;
@@ -4032,7 +4027,6 @@ const runBrowserController = async (context, options)=>{
     }
     let projectEntries = await resolveProjectEntries(context, options?.shardedEntries, browserProjects);
     let totalTests = projectEntries.reduce((total, item)=>total + item.testFiles.length, 0);
-    const shouldKeepWatchingWithEmptySet = isWatchMode && allowEmptyWatchRun;
     const shouldInitializeEmptyBrowserHooks = 0 === totalTests && hasUserRstestConfigPlugins(browserProjects);
     const createEmptyRunResult = ()=>{
         const elapsed = Math.max(0, Date.now() - buildStart);
@@ -4052,7 +4046,7 @@ const runBrowserController = async (context, options)=>{
     const reportEmptyTestSet = ()=>{
         const code = context.normalizedConfig.passWithNoTests ? 0 : 1;
         if (isWatchMode || !allowEmptyRun) {
-            const message = shouldKeepWatchingWithEmptySet ? 'No test files found.' : getNoTestFilesMessage({
+            const message = getNoTestFilesMessage({
                 context,
                 code,
                 defaultMessage: `No test files found, exiting with code ${code}.`
@@ -4062,11 +4056,11 @@ const runBrowserController = async (context, options)=>{
             if (context.relatedFilters?.length) logger.log(color.gray('related: '), context.relatedFilters.join(color.gray(', ')));
             else if (context.fileFilters?.length) logger.log(color.gray('filter: '), context.fileFilters.join(color.gray(', ')));
         }
-        if (isWatchMode && 0 !== code && !shouldKeepWatchingWithEmptySet && !allowEmptyRun) ensureProcessExitCode(code);
-        return !shouldKeepWatchingWithEmptySet;
+        if (isWatchMode && 0 !== code && !allowEmptyRun) ensureProcessExitCode(code);
     };
     if (0 === totalTests && !shouldInitializeEmptyBrowserHooks) {
-        if (reportEmptyTestSet()) return allowEmptyRun ? createEmptyRunResult() : void 0;
+        reportEmptyTestSet();
+        return allowEmptyRun ? createEmptyRunResult() : void 0;
     }
     if (!filesOnly) await notifyTestRunStart();
     const enableCliShortcuts = isWatchMode && isTTY('stdin');
@@ -4131,13 +4125,12 @@ const runBrowserController = async (context, options)=>{
     } : void 0;
     const finalizeWatchRerun = async ({ rerunTestPaths, testTime, unhandledErrors })=>{
         const rerunPathSet = new Set(rerunTestPaths);
-        let sessionCoverage;
-        const coverageMap = buildBrowserCoverageMap(context.reporterResults.results, coverageProvider, {
-            keepResultCoverage: true
-        });
-        if (coverageMap && coverageMap.files().length > 0) sessionCoverage = coverageMap.toJSON();
+        const rerunResults = context.reporterResults.results.filter((result)=>rerunPathSet.has(result.testPath));
+        let rerunCoverage;
+        const coverageMap = buildBrowserCoverageMap(rerunResults, coverageProvider);
+        if (coverageMap && coverageMap.files().length > 0) rerunCoverage = coverageMap.toJSON();
         const outcome = {
-            results: context.reporterResults.results.filter((result)=>rerunPathSet.has(result.testPath)),
+            results: rerunResults,
             testResults: context.reporterResults.testResults.filter((result)=>rerunPathSet.has(result.testPath)),
             errors: unhandledErrors ?? [],
             testPaths: rerunTestPaths,
@@ -4145,8 +4138,8 @@ const runBrowserController = async (context, options)=>{
                 buildTime: drainPendingBuildTime(watchState),
                 testTime
             },
-            coverage: sessionCoverage ? {
-                map: sessionCoverage
+            coverage: rerunCoverage ? {
+                map: rerunCoverage
             } : void 0,
             resolveSourcemap: resolveBrowserSourcemap
         };
@@ -4176,7 +4169,8 @@ const runBrowserController = async (context, options)=>{
         resolveSourcemap: resolveBrowserSourcemap,
         close: ()=>destroyBrowserRuntime(runtime)
     };
-    if (0 === totalTests && reportEmptyTestSet()) {
+    if (0 === totalTests) {
+        reportEmptyTestSet();
         await destroyBrowserRuntime(runtime);
         return allowEmptyRun ? createEmptyRunResult() : void 0;
     }
@@ -4260,19 +4254,17 @@ const runBrowserController = async (context, options)=>{
             project.name,
             createRunnerEventSink(context, project.normalizedConfig)
         ]));
-    const firstBrowserSink = runnerSinks.get(browserProjects[0].name);
-    const projectNameByTestPath = new Map();
-    const sinkForProjectName = (projectName)=>runnerSinks.get(projectName) ?? firstBrowserSink;
-    const sinkForTestPath = (testPath)=>{
-        const projectName = projectNameByTestPath.get(testPath);
-        return projectName ? sinkForProjectName(projectName) : firstBrowserSink;
+    const sinkForProjectName = (projectName)=>{
+        const sink = runnerSinks.get(projectName);
+        if (!sink) throw new Error(`No runner event sink for project "${projectName}"`);
+        return sink;
     };
     const silentConsoleController = createSilentConsoleController({
         runtimeConfig: {
             silent: context.normalizedConfig.silent,
             disableConsoleIntercept: context.normalizedConfig.disableConsoleIntercept
         },
-        emitInterceptedLog: (log)=>sinkForTestPath(log.testPath).onConsoleLog(log),
+        emitInterceptedLog: (log)=>sinkForProjectName(log.project).onConsoleLog(log),
         writeOriginalLog: ()=>{}
     });
     const snapshotRpcMethods = {
@@ -4300,7 +4292,6 @@ const runBrowserController = async (context, options)=>{
         }
     };
     const handleTestFileStart = async (payload)=>{
-        projectNameByTestPath.set(payload.testPath, payload.projectName);
         if (phaseTrackers) {
             const tracker = new PhaseTracker({
                 trace: {
@@ -4310,25 +4301,26 @@ const runBrowserController = async (context, options)=>{
                 pid: nextBrowserFilePid++
             });
             tracker.transition('prepare');
-            phaseTrackers.set(payload.testPath, tracker);
+            phaseTrackers.set(trackerKey(payload.projectName, payload.testPath), tracker);
         }
         await sinkForProjectName(payload.projectName).onTestFileStart({
             testId: getFileTaskId(payload.testPath),
             testPath: payload.testPath,
+            project: payload.projectName,
             tests: []
         });
     };
     const handleTestFileReady = async (payload)=>{
-        phaseTrackers?.get(payload.testPath)?.transition('tests');
-        await sinkForTestPath(payload.testPath).onTestFileReady(payload);
+        phaseTrackers?.get(trackerKey(payload.project, payload.testPath))?.transition('tests');
+        await sinkForProjectName(payload.project).onTestFileReady(payload);
     };
     const handleTestSuiteStart = async (payload)=>{
-        phaseTrackers?.get(payload.testPath)?.recordSuiteStart(payload);
-        await sinkForTestPath(payload.testPath).onTestSuiteStart(payload);
+        phaseTrackers?.get(trackerKey(payload.project, payload.testPath))?.recordSuiteStart(payload);
+        await sinkForProjectName(payload.project).onTestSuiteStart(payload);
     };
     const handleTestSuiteResult = async (payload)=>{
-        phaseTrackers?.get(payload.testPath)?.recordSuiteResult(payload);
-        await sinkForTestPath(payload.testPath).onTestSuiteResult(payload);
+        phaseTrackers?.get(trackerKey(payload.project, payload.testPath))?.recordSuiteResult(payload);
+        await sinkForProjectName(payload.project).onTestSuiteResult(payload);
         if ('passed-only' === context.normalizedConfig.silent) silentConsoleController.flushBufferedLogsForTask({
             taskId: payload.testId,
             status: payload.status,
@@ -4338,13 +4330,13 @@ const runBrowserController = async (context, options)=>{
         });
     };
     const handleTestCaseStart = async (payload)=>{
-        phaseTrackers?.get(payload.testPath)?.recordCaseStart(payload);
-        sinkForTestPath(payload.testPath).onTestCaseStart(payload);
+        phaseTrackers?.get(trackerKey(payload.project, payload.testPath))?.recordCaseStart(payload);
+        sinkForProjectName(payload.project).onTestCaseStart(payload);
     };
     const handleTestCaseResult = async (payload)=>{
         caseResults.push(payload);
-        phaseTrackers?.get(payload.testPath)?.recordCaseResult(payload);
-        await sinkForTestPath(payload.testPath).onTestCaseResult(payload);
+        phaseTrackers?.get(trackerKey(payload.project, payload.testPath))?.recordCaseResult(payload);
+        await sinkForProjectName(payload.project).onTestCaseResult(payload);
         if ('passed-only' === context.normalizedConfig.silent) silentConsoleController.flushBufferedLogsForTask({
             taskId: payload.testId,
             status: payload.status,
@@ -4359,12 +4351,13 @@ const runBrowserController = async (context, options)=>{
             payload
         ], payload.results);
         if (phaseTrackers) {
-            const tracker = phaseTrackers.get(payload.testPath);
+            const key = trackerKey(payload.project, payload.testPath);
+            const tracker = phaseTrackers.get(key);
             if (tracker) {
                 tracker.end();
                 const events = tracker.getTraceEvents();
                 if (events) onTraceEvents?.(events);
-                phaseTrackers.delete(payload.testPath);
+                phaseTrackers.delete(key);
             }
         }
         if ('passed-only' === context.normalizedConfig.silent) silentConsoleController.flushBufferedLogsForTask({
@@ -4374,7 +4367,7 @@ const runBrowserController = async (context, options)=>{
             taskType: 'file',
             testPath: payload.testPath
         });
-        await sinkForTestPath(payload.testPath).onTestFileResult(payload);
+        await sinkForProjectName(payload.project).onTestFileResult(payload);
         if (isWatchMode && 'fail' === payload.status) ensureProcessExitCode(1);
     };
     const handleLog = async (payload)=>{
@@ -4386,6 +4379,7 @@ const runBrowserController = async (context, options)=>{
             taskParentNames: payload.taskParentNames,
             taskType: payload.taskType,
             testPath: payload.testPath,
+            project: payload.projectName,
             type: payload.type,
             trace: payload.trace
         };
@@ -4686,54 +4680,6 @@ const runBrowserController = async (context, options)=>{
             }
         });
         awaitHeadlessRerunIdle = ()=>latestRerunScheduler.whenIdle();
-        if (0 === allTestFiles.length) {
-            const duration = {
-                totalTime: buildTime,
-                buildTime,
-                testTime: 0
-            };
-            const result = {
-                results: reporterResults,
-                testResults: caseResults,
-                duration,
-                hasFailure: false,
-                getSourcemap: getBrowserSourcemap,
-                resolveSourcemap: resolveBrowserSourcemap,
-                close: isWatchMode ? void 0 : async ()=>{
-                    sessionRegistry.clear();
-                    await destroyBrowserRuntime(runtime);
-                },
-                watch: watchHandles
-            };
-            if (isWatchMode) await notifyTestRunEnd({
-                duration
-            });
-            if (isWatchMode) {
-                triggerRerun = async ()=>{
-                    const newProjectEntries = await collectProjectEntries(context);
-                    const rerunPlan = planWatchRerun({
-                        projectEntries: newProjectEntries,
-                        previousTestFiles: watchState.lastTestFiles,
-                        affectedTestFiles: drainPendingAffectedTestFiles(watchState)
-                    });
-                    if (rerunPlan.filesChanged) {
-                        watchState.lastTestFiles = rerunPlan.currentTestFiles;
-                        if (0 === rerunPlan.currentTestFiles.length) {
-                            logger.log(color.cyan('No browser test files remain after update.\n'));
-                            logWatchReadyMessage(context, enableCliShortcuts);
-                            return;
-                        }
-                        logger.log(color.cyan(`Test file set changed, re-running ${rerunPlan.currentTestFiles.length} file(s)...\n`));
-                        await latestRerunScheduler.enqueueLatest(rerunPlan.currentTestFiles);
-                        return;
-                    }
-                    logWatchReadyMessage(context, enableCliShortcuts);
-                };
-                watchState.hooksEnabled = true;
-                logWatchReadyMessage(context, enableCliShortcuts);
-            }
-            return result;
-        }
         const testStart = Date.now();
         await runFilesWithPool(allTestFiles);
         const testTime = Date.now() - testStart;
@@ -4779,6 +4725,7 @@ const runBrowserController = async (context, options)=>{
         context.updateReporterResultState(reporterResults, caseResults);
         const isFailure = reporterResults.some((result)=>'fail' === result.status);
         if (isWatchMode && isFailure) ensureProcessExitCode(1);
+        const cycleCoverageMap = isWatchMode && coverageProvider ? buildBrowserCoverageMap(reporterResults, coverageProvider) : void 0;
         const result = {
             results: reporterResults,
             testResults: caseResults,
@@ -4787,11 +4734,13 @@ const runBrowserController = async (context, options)=>{
             getSourcemap: getBrowserSourcemap,
             resolveSourcemap: resolveBrowserSourcemap,
             close: closeHeadlessRuntime,
+            coverage: cycleCoverageMap,
             watch: watchHandles
         };
         if (isWatchMode) try {
             await notifyTestRunEnd({
-                duration
+                duration,
+                coverage: cycleCoverageMap?.files().length ? cycleCoverageMap.toJSON() : void 0
             });
         } finally{
             await closeHeadlessRuntime?.();
@@ -5084,6 +5033,7 @@ const runBrowserController = async (context, options)=>{
     context.updateReporterResultState(reporterResults, caseResults);
     const isFailure = reporterResults.some((result)=>'fail' === result.status);
     if (isWatchMode && isFailure) ensureProcessExitCode(1);
+    const cycleCoverageMap = isWatchMode && coverageProvider ? buildBrowserCoverageMap(reporterResults, coverageProvider) : void 0;
     const result = {
         results: reporterResults,
         testResults: caseResults,
@@ -5092,11 +5042,13 @@ const runBrowserController = async (context, options)=>{
         getSourcemap: getBrowserSourcemap,
         resolveSourcemap: resolveBrowserSourcemap,
         close: closeContainerRuntime,
+        coverage: cycleCoverageMap,
         watch: watchHandles
     };
     if (isWatchMode) try {
         await notifyTestRunEnd({
-            duration
+            duration,
+            coverage: cycleCoverageMap?.files().length ? cycleCoverageMap.toJSON() : void 0
         });
     } finally{
         await closeContainerRuntime?.();

package/dist/protocol.d.ts

@@ -45,6 +45,11 @@ export type BrowserProjectRuntime = {
  */ export type BrowserLogPayload = {
     level: 'log' | 'warn' | 'error' | 'info' | 'debug';
     content: string;
+    /**
+   * Owning project, resolved by the client from its manifest. The host must
+   * not re-derive it from `testPath` — concurrent projects can run the same
+   * file, so a path-keyed lookup can attribute the log to the wrong project.
+   */ projectName: string;
     taskId?: string;
     taskName?: string;
     taskParentNames?: string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rstest/browser",
-  "version": "0.11.4",
+  "version": "0.11.5",
   "description": "Browser mode support for Rstest testing framework.",
   "keywords": [
     "rstest",
@@ -55,14 +55,14 @@
     "@vitest/snapshot": "^4.1.10",
     "birpc": "^4.0.0",
     "picomatch": "^4.0.5",
-    "playwright": "^1.61.1",
+    "playwright": "^1.62.0",
     "@rstest/browser-ui": "0.0.0",
-    "@rstest/core": "0.11.4",
+    "@rstest/core": "0.11.5",
     "@rstest/tsconfig": "0.0.1"
   },
   "peerDependencies": {
     "playwright": "^1.49.1",
-    "@rstest/core": "^0.11.4"
+    "@rstest/core": "^0.11.5"
   },
   "peerDependenciesMeta": {
     "playwright": {

package/src/client/entry.ts

@@ -142,6 +142,7 @@ const getFileTaskId = (testPath: string): string => {
  * Returns a restore function to revert console to original.
  */
 const interceptConsole = (
+  projectName: string,
   getCurrentTask: () => CurrentTaskInfo | undefined,
   printConsoleTrace: boolean,
 ): (() => void) => {
@@ -176,6 +177,7 @@ const interceptConsole = (
         payload: {
           level,
           content,
+          projectName,
           taskId: currentTask?.taskId,
           taskName: currentTask?.taskName,
           taskParentNames: currentTask?.taskParentNames,
@@ -605,6 +607,7 @@ const run = async () => {
     // Intercept console methods to forward logs to host
     const restoreConsole = shouldInterceptConsole
       ? interceptConsole(
+          projectRuntime.name,
           () => taskContext.getCurrent() ?? taskStack[taskStack.length - 1],
           runtimeConfig.disableConsoleIntercept
             ? false