testbeats 2.1.1 → 2.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testbeats",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "Publish test results to Microsoft Teams, Google Chat, Slack and InfluxDB",
   "main": "src/index.js",
   "types": "./src/index.d.ts",
@@ -55,7 +55,7 @@
     "pretty-ms": "^7.0.1",
     "rosters": "0.0.1",
     "sade": "^1.8.1",
-    "test-results-parser": "0.2.4"
+    "test-results-parser": "0.2.5"
   },
   "devDependencies": {
     "c8": "^7.12.0",

package/src/beats/beats.attachments.js

@@ -4,10 +4,11 @@ const FormData = require('form-data-lite');
 const TestResult = require('test-results-parser/src/models/TestResult');
 const { BeatsApi } = require('./beats.api');
 const logger = require('../utils/logger');
+const TestAttachment = require('test-results-parser/src/models/TestAttachment');
 
 const MAX_ATTACHMENTS_PER_REQUEST = 5;
 const MAX_ATTACHMENTS_PER_RUN = 20;
-const MAX_ATTACHMENT_SIZE = 1024 * 1024;
+const MAX_ATTACHMENT_SIZE = 2 * 1024 * 1024;
 
 class BeatsAttachments {
 
@@ -53,8 +54,6 @@ class BeatsAttachments {
       return;
     }
     logger.info(`⏳ Uploading ${this.attachments.length} attachments...`);
-    const result_file = this.config.results[0].files[0];
-    const result_file_dir = path.dirname(result_file);
     try {
       let count = 0;
       const size = MAX_ATTACHMENTS_PER_REQUEST;
@@ -68,7 +67,11 @@ class BeatsAttachments {
         form.append('test_run_id', this.test_run_id);
         const file_images = []
         for (const attachment of attachments_subset) {
-          const attachment_path = path.join(result_file_dir, attachment.path);
+          const attachment_path = this.#getAttachmentFilePath(attachment);
+          if (!attachment_path) {
+            logger.warn(`⚠️ Unable to find attachment ${attachment.path}`);
+            continue;
+          }
           const stats = fs.statSync(attachment_path);
           if (stats.size > MAX_ATTACHMENT_SIZE) {
             logger.warn(`⚠️ Attachment ${attachment.path} is too big (${stats.size} bytes). Allowed size is ${MAX_ATTACHMENT_SIZE} bytes.`);
@@ -93,6 +96,33 @@ class BeatsAttachments {
     }
   }
 
+  /**
+   *
+   * @param {TestAttachment} attachment
+   */
+  #getAttachmentFilePath(attachment) {
+    const result_file = this.config.results[0].files[0];
+    const result_file_dir = path.dirname(result_file);
+    const relative_attachment_path = path.join(result_file_dir, attachment.path);
+    const raw_attachment_path = attachment.path;
+
+    try {
+      fs.statSync(relative_attachment_path);
+      return relative_attachment_path;
+    } catch {
+      // nothing
+    }
+
+    try {
+      fs.statSync(raw_attachment_path);
+      return raw_attachment_path;
+    } catch {
+      // nothing
+    }
+
+    return null;
+  }
+
 
 
 }

package/src/extensions/error-clusters.extension.js

@@ -1,5 +1,6 @@
 const { BaseExtension } = require('./base.extension');
 const { STATUS, HOOK } = require("../helpers/constants");
+const { truncate } = require('../helpers/helper');
 
 class ErrorClustersExtension extends BaseExtension {
 
@@ -35,7 +36,7 @@ class ErrorClustersExtension extends BaseExtension {
 
     const texts = [];
     for (const cluster of clusters) {
-      texts.push(`${cluster.failure} - ${this.bold(`(x${cluster.count})`)}`);
+      texts.push(`${truncate(cluster.failure, 150)} - ${this.bold(`(x${cluster.count})`)}`);
     }
     this.text = this.mergeTexts(texts);
   }

package/src/helpers/helper.js

@@ -46,9 +46,15 @@ function processData(data) {
   return data;
 }
 
+/**
+ *
+ * @param {string} text
+ * @param {number} length
+ * @returns
+ */
 function truncate(text, length) {
   if (text && text.length > length) {
-    return text.slice(0, length) + "...";
+    return text.slice(0, length).trim() + "...";
   } else {
     return text;
   }

package/src/platforms/base.platform.js

@@ -103,12 +103,22 @@ class BasePlatform {
 
     const texts = [];
 
+    // webdriver io
+    if (suite.metadata.device && typeof suite.metadata.device === 'string') {
+      texts.push(`${suite.metadata.device}`);
+    }
+
     if (suite.metadata.platform && suite.metadata.platform.name && suite.metadata.platform.version) {
-      texts.push(`${suite.metadata.platform.name} ${suite.metadata.platform.version}`)
+      texts.push(`${suite.metadata.platform.name} ${suite.metadata.platform.version}`);
     }
 
     if (suite.metadata.browser && suite.metadata.browser.name && suite.metadata.browser.version) {
-      texts.push(`${suite.metadata.browser.name} ${suite.metadata.browser.version}`)
+      texts.push(`${suite.metadata.browser.name} ${suite.metadata.browser.version}`);
+    }
+
+    // playwright
+    if (suite.metadata.hostname && typeof suite.metadata.hostname === 'string') {
+      texts.push(`${suite.metadata.hostname}`);
     }
 
     return texts.join(' • ');