monocart-reporter 2.0.3 → 2.0.4

package/lib/generate-report.js

@@ -11,7 +11,6 @@ const generateJson = (outputDir, htmlFile, reportData) => {
     let jsonPath = path.resolve(outputDir, `${filename}.json`);
     Util.writeJSONSync(jsonPath, reportData);
     jsonPath = Util.relativePath(jsonPath);
-    Util.logInfo(`json report: ${EC.cyan(jsonPath)}`);
     return jsonPath;
 };
 
@@ -37,10 +36,6 @@ const generateHtml = async (outputDir, htmlFile, reportData, inline) => {
     };
 
     const htmlPath = await Util.saveHtmlReport(options);
-    Util.logInfo(`html report: ${EC.cyan(htmlPath)}`);
-
-    const cmd = `npx monocart show-report ${htmlPath}`;
-    Util.logInfo(`view report: ${EC.cyan(cmd)}`);
 
     return htmlPath;
 };
@@ -56,19 +51,20 @@ const sendEmail = (emailOptions) => {
 };
 
 const showTestResults = (reportData) => {
-    Util.logInfo(`test results: ${EC.cyan(reportData.name)}`);
+    Util.logInfo(`test results: ${reportData.name}`);
 
     const summary = reportData.summary;
 
     const colorHandler = (item, row) => {
 
-        if (['failed', 'errors'].includes(item.id) && item.value > 0) {
+        // do not show 'errors' in red
+        if (['failed'].includes(item.id) && item.value > 0) {
             row.name = EC.red(row.name);
             row.value = EC.red(row.value);
             return;
         }
 
-        if (['flaky', 'retries'].includes(item.id) && item.value > 0) {
+        if (['flaky'].includes(item.id) && item.value > 0) {
             row.name = EC.yellow(row.name);
             row.value = EC.yellow(row.value);
             return;
@@ -121,9 +117,12 @@ const showTestResults = (reportData) => {
         };
     });
 
+    // for shards
+    const system = Array.isArray(reportData.system) ? reportData.system[0] : reportData.system;
+
     rows = rows.concat([{
         name: 'Playwright',
-        value: `v${reportData.system.playwright}`
+        value: `v${system.playwright}`
     }, {
         name: 'Date',
         value: new Date(reportData.date).toLocaleString()
@@ -146,11 +145,31 @@ const showTestResults = (reportData) => {
 
 };
 
+const onEndHandler = async (reportData, options) => {
+    // onEnd callback
+    const onEnd = options.onEnd;
+    if (typeof onEnd !== 'function') {
+        return;
+    }
+
+    // generate email data
+    emailPlugin(reportData);
+
+    // forEach rows API
+    const forEach = (callback) => {
+        Util.forEach(reportData.rows, callback);
+    };
+
+    await onEnd(reportData, {
+        sendEmail,
+        forEach
+    });
+};
+
 
 const generateReport = async (reportData, options) => {
 
     Util.logInfo('generating test report ...');
-    showTestResults(reportData);
 
     const {
         outputFile, outputDir, artifacts
@@ -163,6 +182,12 @@ const generateReport = async (reportData, options) => {
             // convert path to relative reporter
             report.path = Util.relativePath(report.path, outputDir);
         });
+
+        reportData.summary.artifacts = {
+            name: 'Artifacts',
+            value: artifacts.length
+        };
+
     }
 
     // console.log(reportData);
@@ -178,30 +203,19 @@ const generateReport = async (reportData, options) => {
     }
     const htmlPath = await generateHtml(outputDir, htmlFile, reportData, inline);
 
-    // onEnd callback
-    const onEnd = options.onEnd;
-    if (typeof onEnd !== 'function') {
-        return;
-    }
-
     // for onEnd after saved
     Object.assign(reportData, {
         htmlPath,
         jsonPath
     });
 
-    // generate email data
-    emailPlugin(reportData);
+    await onEndHandler(reportData, options);
 
-    // forEach rows API
-    const forEach = (callback) => {
-        Util.forEach(reportData.rows, callback);
-    };
+    // after onEnd for summary changes
+    showTestResults(reportData);
 
-    return onEnd(reportData, {
-        sendEmail,
-        forEach
-    });
+    Util.logInfo(`html report: ${EC.cyan(htmlPath)} (json: ${jsonPath})`);
+    Util.logInfo(`view report: ${EC.cyan(`npx monocart show-report ${htmlPath}`)}`);
 
 };
 

package/lib/index.js

@@ -17,6 +17,8 @@ const Util = require('./utils/util.js');
 // https://playwright.dev/docs/test-reporters#custom-reporters
 class Reporter {
 
+    static Util = Util;
+
     static merge = merge;
 
     static attachAuditReport = attachAuditReport;

package/lib/index.mjs

@@ -3,6 +3,8 @@ import MonocartReporter from './index.js';
 export default MonocartReporter;
 export { MonocartReporter };
 
+export const Util = MonocartReporter.Util;
+
 export const merge = MonocartReporter.merge;
 
 export const attachAuditReport = MonocartReporter.attachAuditReport;