monocart-reporter 2.6.5 → 2.7.1

package/lib/plugins/coverage/coverage.js

@@ -108,10 +108,45 @@ const generateGlobalCoverageReport = async (reporterOptions) => {
     }
 
     // coverageResults: type, reportPath, name, watermarks, summary, files
-
     // showing list props: global, name, path, title
 
-    // console.log('global coverage report', report);
+    // there is no reportPath if only raw
+    const reportPath = coverageResults.reportPath;
+
+    const artifact = {
+        global: true,
+        type: 'coverage',
+        name: coverageResults.name,
+        path: reportPath
+    };
+
+    const reports = {};
+    const { reportGroup, outputDir } = coverageReport.options;
+    if (reportGroup) {
+        reportGroup.forEach((group) => {
+            group.forEach((o, k) => {
+                reports[k] = o;
+            });
+        });
+    }
+
+    if (reports.raw) {
+        const rawDir = path.resolve(outputDir, reports.raw.outputDir || 'raw');
+        artifact.rawDir = Util.relativePath(rawDir, reporterOptions.outputDir);
+    }
+
+    return artifact;
+};
+
+const mergeGlobalCoverageReport = async (coverageRawList, reporterOptions) => {
+    const coverageOptions = await getGlobalCoverageOptions(reporterOptions);
+    coverageOptions.inputDir = coverageRawList;
+
+    const coverageReport = MCR(coverageOptions);
+    const coverageResults = await coverageReport.generate();
+    if (!coverageResults) {
+        return;
+    }
 
     const reportPath = coverageResults.reportPath;
     if (reportPath && fs.existsSync(reportPath)) {
@@ -128,5 +163,6 @@ const generateGlobalCoverageReport = async (reporterOptions) => {
 module.exports = {
     addCoverageReport,
     attachCoverageReport,
-    generateGlobalCoverageReport
+    generateGlobalCoverageReport,
+    mergeGlobalCoverageReport
 };

package/lib/visitor.js

@@ -511,6 +511,9 @@ class Visitor {
                 return;
             }
 
+            // fixed expected image path
+            this.expectedAttachmentHandler(item, attachments);
+
             if (item.body) {
                 if (!item.path) {
                     this.saveAttachmentBodyHandler(item, i, caseId);
@@ -555,6 +558,51 @@ class Visitor {
         }
     }
 
+    getImageCategory(item) {
+        if (item.contentType && item.contentType.startsWith('image/')) {
+            if (item.name) {
+                const match = item.name.match(/^(.*)-(expected|actual|diff)(\.[^.]+)?$/);
+                if (match) {
+                    // , name, category, extension
+                    return match[2];
+                }
+            }
+        }
+    }
+
+    expectedAttachmentHandler(item, attachments) {
+        const category = this.getImageCategory(item);
+        if (category !== 'expected') {
+            return;
+        }
+
+        const actualItem = attachments.find((it) => {
+            if (it.retry !== item.retry) {
+                return false;
+            }
+            const c = this.getImageCategory(it);
+            if (c === 'actual') {
+                return true;
+            }
+            return false;
+        });
+        if (!actualItem) {
+            return;
+        }
+
+        // console.log(item, actualItem);
+
+        const itemDir = path.dirname(actualItem.path);
+        const itemPath = path.resolve(itemDir, item.name);
+
+        if (fs.existsSync(itemPath)) {
+            item.path = itemPath;
+        }
+
+        // no need copy the expected file, it exists
+
+    }
+
     reportHandler(item, itemName, title) {
 
         const definition = Util.attachments[itemName];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "monocart-reporter",
-    "version": "2.6.5",
+    "version": "2.7.1",
     "description": "A playwright test reporter. Shows suites/cases/steps with tree style, markdown annotations, custom columns/formatters/data collection visitors, console logs, style tags, send email.",
     "main": "lib/index.js",
     "bin": {
@@ -46,27 +46,27 @@
         "koa": "^2.15.3",
         "koa-static-resolver": "^1.0.6",
         "lz-utils": "^2.1.0",
-        "monocart-coverage-reports": "^2.10.2",
+        "monocart-coverage-reports": "^2.10.3",
         "monocart-locator": "^1.0.2",
         "nodemailer": "^6.9.14"
     },
     "devDependencies": {
         "@babel/code-frame": "^7.24.7",
-        "@playwright/test": "^1.46.0",
+        "@playwright/test": "^1.46.1",
         "ansi-to-html": "^0.7.2",
         "async-tick": "^1.0.0",
         "autolinker": "^4.0.0",
-        "axios": "^1.7.3",
+        "axios": "^1.7.5",
         "commander": "^12.1.0",
         "dotenv": "^16.4.5",
-        "eslint": "^9.8.0",
+        "eslint": "^9.9.1",
         "eslint-config-plus": "^2.0.2",
         "eslint-plugin-html": "^8.1.1",
         "eslint-plugin-vue": "^9.27.0",
         "file-saver": "^2.0.5",
         "github-markdown-css": "^5.6.1",
-        "marked": "^14.0.0",
-        "mermaid": "^10.9.1",
+        "marked": "^14.1.0",
+        "mermaid": "^11.0.2",
         "mitt": "^3.0.1",
         "monocart-code-viewer": "^1.1.4",
         "monocart-formatter": "^3.0.0",
@@ -74,7 +74,7 @@
         "open": "8.4.2",
         "sanitize-filename": "^1.6.3",
         "stack-utils": "^2.0.6",
-        "stylelint": "^16.8.1",
+        "stylelint": "^16.9.0",
         "stylelint-config-plus": "^1.1.2",
         "turbogrid": "^3.2.0",
         "vine-ui": "^3.1.16",