monocart-reporter 1.6.34 → 1.6.35

package/README.md

@@ -159,7 +159,11 @@ Separated metadata file (Already included in the above HTML and compressed, it c
 ## View Trace Online 
 > The [Trace Viewer](https://trace.playwright.dev/) requires that the trace file must be loaded over the http:// or https:// protocols without [CORS](https://developer.mozilla.org/en-US/docs/Glossary/CORS) issue, try following start a local web server:
 ```sh
+# serve and open report
 npx monocart show-report <your-outputFile-path>
+
+# serve report
+npx monocart serve-report <your-outputFile-path>
 ```
 Or customize your own trace viewer url with option `traceViewerUrl` defaults to  `https://trace.playwright.dev/?trace={traceUrl}`
 

package/lib/cli.js

@@ -35,7 +35,7 @@ const openUrl = async (p) => {
 };
 
 
-const showReport = async (list) => {
+const serveReport = async (list, openReport) => {
     if (!list.length) {
         list.push(defaultOptions.outputFile);
     }
@@ -83,7 +83,9 @@ const showReport = async (list) => {
 
     server.listen(port, function() {
         EC.logCyan(`${new Date().toLocaleString()} server listening on ${url}`);
-        openUrl(url);
+        if (openReport) {
+            openUrl(url);
+        }
     });
 
 };
@@ -93,7 +95,12 @@ const start = function() {
     const command = args.shift();
     // console.log(command, args);
     if (command === 'show-report') {
-        showReport(args);
+        serveReport(args, true);
+        return;
+    }
+
+    if (command === 'serve-report') {
+        serveReport(args, false);
     }
 };
 

package/lib/generate-data.js

@@ -6,6 +6,7 @@ const Visitor = require('./visitor.js');
 const { calculateSummary } = require('./common.js');
 const { generateGlobalCoverageReport } = require('./plugins/coverage/coverage.js');
 const { generateGlobalNetworkReport } = require('./plugins/network/network.js');
+const version = require('../package.json').version;
 
 const getReportName = (options, config, metadata) => {
     const reportName = options.name || config.name || metadata.name;
@@ -92,6 +93,8 @@ const generateData = async (results) => {
     system.configFile = Util.relativePath(config.configFile);
     // playwright version
     system.playwright = config.version;
+    // monocart version
+    system.monocart = version;
 
     // test root dir
     system.testDir = Util.relativePath(config.rootDir);

package/lib/plugins/audit/audit.js

@@ -70,13 +70,10 @@ const attachAuditReport = async (runnerResult, testInfo, options = {}) => {
         return;
     }
 
-    const title = options.title || `Lighthouse Report - ${testInfo.title}`;
-
     options = {
-        title,
+        title: `Lighthouse Report - ${testInfo.title}`,
         outputDir: Util.resolveOutputDir(testInfo),
-        outputName: `audit-${Util.shortTestId(testInfo.testId)}`,
-
+        outputName: `audit-${Util.resolveTestIdWithRetry(testInfo)}`,
         ... options
     };
 
@@ -90,7 +87,7 @@ const attachAuditReport = async (runnerResult, testInfo, options = {}) => {
 
     // `.lhr` is the Lighthouse Result as a JS object
     const report = {
-        title,
+        title: options.title,
         ... getSummaryReport(runnerResult.lhr)
     };
 

package/lib/plugins/coverage/coverage.js

@@ -140,15 +140,15 @@ const attachCoverageReport = (coverageInput, testInfo, options = {}) => {
         return;
     }
 
-    const title = options.title || `Coverage Report - ${testInfo.title}`;
-
     options = {
-        title,
+        // default title
+        title: `Coverage Report - ${testInfo.title}`,
         outputDir: Util.resolveOutputDir(testInfo),
-        outputName: `coverage-${Util.shortTestId(testInfo.testId)}`,
+        outputName: `coverage-${Util.resolveTestIdWithRetry(testInfo)}`,
         ... options
     };
 
+    // support multiple calls
     let htmlDir = path.resolve(options.outputDir, options.outputName);
     let i = 1;
     while (fs.existsSync(htmlDir)) {
@@ -200,8 +200,7 @@ const addCoverageReport = async (v8list, testInfo) => {
     const artifactsDir = path.resolve(reportDir, '.artifacts');
     options.artifactsDir = artifactsDir;
 
-    const id = Util.shortTestId(testInfo.testId);
-    const filename = `coverage-${id}.json`;
+    const filename = `coverage-${Util.resolveTestIdWithRetry(testInfo)}.json`;
     const jsonPath = path.resolve(artifactsDir, filename);
 
     // init v8list and unpack sourcemap

package/lib/plugins/network/network.js

@@ -128,14 +128,14 @@ const attachNetworkReport = async (har, testInfo, options = {}) => {
     }
 
     options = {
+        // default title
+        title: `Network Report - ${testInfo.title}`,
         outputDir: Util.resolveOutputDir(testInfo),
-        outputName: `network-${Util.shortTestId(testInfo.testId)}`,
+        outputName: `network-${Util.resolveTestIdWithRetry(testInfo)}`,
         inline: false,
         ... options
     };
 
-    const title = options.title || `Network Report - ${testInfo.title}`;
-
     const htmlDir = path.resolve(options.outputDir, options.outputName);
     if (!fs.existsSync(htmlDir)) {
         fs.mkdirSync(htmlDir, {
@@ -148,7 +148,7 @@ const attachNetworkReport = async (har, testInfo, options = {}) => {
 
     // save har
     const reportData = {
-        title,
+        title: options.title,
         summary,
         ... harData
     };
@@ -156,7 +156,7 @@ const attachNetworkReport = async (har, testInfo, options = {}) => {
     const htmlPath = await saveNetworkHtmlReport(reportData, options);
 
     const report = {
-        title,
+        title: options.title,
         ... harData.log,
         htmlPath,
         summary