@testomatio/reporter 0.8.1 → 0.8.3

package/lib/adapter/playwright.js

@@ -5,7 +5,7 @@ const path = require('path');
 const fs = require('fs');
 const { APP_PREFIX, STATUS: Status } = require('../constants');
 const TestomatioClient = require('../client');
-const upload = require('../fileUploader');
+const { isArtifactsEnabled } = require('../fileUploader');
 const { parseTest } = require('../util');
 
 
@@ -13,7 +13,7 @@ class TestomatioReporter {
   constructor(config = {}) {
     this.client = new TestomatioClient({ apiKey: config?.apiKey });
 
-    this.videos = [];
+    this.uploads = [];
   }
 
   onBegin(_config, suite) {
@@ -37,32 +37,15 @@ class TestomatioReporter {
       appendStep(step, steps);
     }
 
-    const files = [];
-
-    for (const attachment of result.attachments) {
-      if (!attachment.body && !attachment.path) {
-        continue;
-      }
-      if (attachment.contentType && attachment.contentType.startsWith('video')) {
-        // video is post-processed
-        this.videos.push({ testId, attachment, title, suite_title });
-        continue;
-      }
-
-      let fileName = attachment.path;
-      if (attachment.body) {
-        fileName = tmpFile();
-        fs.writeFileSync(fileName, attachment.body);
-      }
-      files.push({ path: fileName, type: attachment.contentType });
-    }
+    this.uploads.push({
+      testId, title, suite_title, files: result.attachments.filter((a) => a.body || a.path)
+    })
 
     this.client.addTestRun(checkStatus(result.status), {
       error,
       test_id: testId,
       suite_title,
       title,
-      files,
       steps: steps.join('\n'),
       time: duration,
     });
@@ -71,19 +54,30 @@ class TestomatioReporter {
   async onEnd(result) {
     if (!this.client) return;
 
-    if (this.videos.length && upload.isArtifactsEnabled()) {
-      console.log(APP_PREFIX, `🎞️  Uploading ${this.videos.length} videos...`);
+    if (this.uploads.length && isArtifactsEnabled()) {
+      console.log(APP_PREFIX, `🎞️  Uploading ${this.uploads.length} files...`);
 
       const promises = [];
-      for (const video of this.videos) {
-        const { testId, title, attachment, suite_title } = video;
-        const file = { path: attachment.path, title, type: attachment.contentType };
+
+      for (const upload of this.uploads) {
+
+        const { title, testId, suite_title } = upload;
+
+        const files = upload.files.map((attachment) => {
+          if (attachment.body) {
+            const fileName = tmpFile();
+            fs.writeFileSync(fileName, attachment.body);
+          }
+          return { path: attachment.path, title, type: attachment.contentType };
+        });
+
+
         promises.push(
           this.client.addTestRun(undefined, {
             test_id: testId,
             title,
             suite_title,
-            files: [file],
+            files,
           }),
         );
       }

package/lib/fileUploader.js

@@ -1,6 +1,7 @@
 const debug = require('debug')('@testomatio/reporter:file-uploader');
 const { S3 } = require('@aws-sdk/client-s3');
 const { Upload } = require('@aws-sdk/lib-storage');
+
 const fs = require('fs');
 const path = require('path');
 const chalk = require('chalk');
@@ -27,10 +28,14 @@ function getConfig() {
     acc[key] = process.env[key];
     return acc;
   }, {});
-  debug('Config', config);
   return config;
 }
 
+function getMaskedConfig() {
+  return Object.fromEntries(Object.entries(getConfig())
+    .map(([key, value]) => [key, key === 'S3_SECRET_ACCESS_KEY' || key === 'S3_ACCESS_KEY_ID' ? '***' : value]));
+}
+
 let isEnabled;
 
 const isArtifactsEnabled = () => {
@@ -89,27 +94,31 @@ const uploadUsingS3 = async (filePath, runId) => {
   }
 
   const {
-    S3_REGION, S3_ACCESS_KEY_ID, S3_SECRET_ACCESS_KEY, S3_ENDPOINT, TESTOMATIO_PRIVATE_ARTIFACTS, S3_BUCKET
+    TESTOMATIO_PRIVATE_ARTIFACTS, S3_BUCKET
   } = getConfig();
+
+  debug('S3 config', getMaskedConfig());
+  debug('Uploading', filePath, 'to', S3_BUCKET);
   
-  const file = fs.readFileSync(filePath);
+const fileData = fs.readFileSync(filePath);
 
   Key = `${runId}/${randomUUID()}-${Key || path.basename(filePath)}`;
   const ACL = TESTOMATIO_PRIVATE_ARTIFACTS ? 'private' : 'public-read';
 
   const s3 = new S3(_getS3Config());
 
+  const params = {
+    Bucket: S3_BUCKET,
+    Key,
+    Body: fileData,
+    ContentType,
+    ACL,
+  };
+
   try {
     const out = new Upload({
       client: s3,
-
-      params: {
-        Bucket: S3_BUCKET,
-        Key,
-        Body: file,
-        ContentType,
-        ACL,
-      }
+      params
     });
 
     await out.done();
@@ -117,14 +126,8 @@ const uploadUsingS3 = async (filePath, runId) => {
 
     return out.singleUploadResult.Location;
   } catch (e) {
-    console.log(APP_PREFIX, chalk.bold.red(`Failed uploading '${Key}'. Please check S3 credentials`), {
-      accessKeyId: S3_ACCESS_KEY_ID,
-      secretAccessKey: S3_SECRET_ACCESS_KEY ? '**** (hidden) ***' : '(empty)',
-      region: S3_REGION,
-      bucket: S3_BUCKET,
-      acl: ACL,
-      endpoint: S3_ENDPOINT,
-    });
+    console.log(e);
+    console.log(APP_PREFIX, chalk.red(`Failed uploading '${Key}'. Please check S3 credentials`), getMaskedConfig());
 
     console.log(APP_PREFIX, `To ${chalk.bold('disable')} artifact uploads set: TESTOMATIO_DISABLE_ARTIFACTS=1`);
     if (!TESTOMATIO_PRIVATE_ARTIFACTS) {
@@ -136,7 +139,7 @@ const uploadUsingS3 = async (filePath, runId) => {
       );
     }
     console.log(APP_PREFIX, '---------------');
-  }
+  } 
 };
 
 const uploadUsingS3AsBuffer = async (buffer, fileName, runId) => {

package/lib/pipe/csv.js

@@ -18,11 +18,11 @@ class CsvPipe {
   constructor(params, store) {
     this.store = store || {};
     this.title = params.title || process.env.TESTOMATIO_TITLE;
-    this.isEnabled = true;
     this.results = [];
 
     this.outputDir = 'export';
     this.csvFilename = process.env.TESTOMATIO_CSV_FILENAME;
+    this.isEnabled = !!this.csvFilename
     this.isCsvSave = false;
 
     if (this.csvFilename !== undefined && this.csvFilename.split('.').length > 0) {

package/lib/pipe/github.js

@@ -79,7 +79,9 @@ class GitHubPipe {
 | Summary | ${statusEmoji('failed')} **${failedCount}** failed; ${statusEmoji(
       'passed',
     )} **${passedCount}** passed; **${statusEmoji('skipped')}** ${skippedCount} skipped |
-| Duration | 🕐  **${humanizeDuration(parseFloat(this.tests.reduce((a, t) => a + (t.run_time || 0), 0)))}** |
+| Duration | 🕐  **${humanizeDuration(parseInt(this.tests.reduce((a, t) => a + (t.run_time || 0), 0), 10), {
+      maxDecimalPoints: 0,
+    })}** |
 `;
     if (this.store.runUrl) {
       summary += `| Testomat.io Report | 📊 [Run #${this.store.runId}](${this.store.runUrl})  | `;
@@ -154,7 +156,6 @@ class GitHubPipe {
         .join('\n');
       body += '\n</details>';
     }
-    
 
     await deletePreviousReport(this.octokit, owner, repo, this.issue, this.hiddenCommentData);
 

package/lib/pipe/gitlab.js

@@ -81,7 +81,9 @@ class GitLabPipe {
   | Summary | ${statusEmoji('failed')} **${failedCount}** failed; ${statusEmoji(
       'passed',
     )} **${passedCount}** passed; **${statusEmoji('skipped')}** ${skippedCount} skipped |
-  | Duration | 🕐  **${humanizeDuration(parseFloat(this.tests.reduce((a, t) => a + (t.run_time || 0), 0)))}** |
+  | Duration | 🕐  **${humanizeDuration(parseInt(this.tests.reduce((a, t) => a + (t.run_time || 0), 0), 10), {
+    maxDecimalPoints: 0,
+  })}** |
   `;
 
     if (this.ENV.CI_JOB_NAME && this.ENV.CI_JOB_ID) {

package/lib/xmlReader.js

@@ -144,8 +144,9 @@ class XmlReader {
     if (!Array.isArray(result)) result = [result].filter(d => !!d);
 
     const results = result.map(td => ({ 
-      id: td.executionId, 
-      run_time: parseFloat(td.duration),
+      id: td.executionId,
+      // seconds are used in junit reports, but ms are used by testomatio
+      run_time: parseFloat(td.duration) * 1000,
       status: td.outcome, 
       stack: td.Output.StdOut,
       files: td?.ResultFiles?.ResultFile?.map(rf => rf.path)
@@ -278,7 +279,7 @@ class XmlReader {
   async uploadArtifacts() {
     for (const test of this.tests.filter(t => !!t.stack)) {
       let files = [];
-      if (test.files.length) files = test.files.map(f => path.join(process.cwd(), f))
+      if (test.files?.length) files = test.files.map(f => path.join(process.cwd(), f))
       files = [...files, ...fetchFilesFromStackTrace(test.stack)];
       debug('Uploading files', files)
       test.artifacts = await Promise.all(files.map(f => upload.uploadFileByPath(f, this.runId)));
@@ -361,7 +362,8 @@ function reduceTestCases(prev, item) {
       stack,
       message,
       line: testCaseItem.lineno,
-      run_time: parseFloat(testCaseItem.time || testCaseItem.duration),
+      // seconds are used in junit reports, but ms are used by testomatio
+      run_time: parseFloat(testCaseItem.time || testCaseItem.duration) * 1000,
       status,
       title: testCaseItem.name,
       suite_title: reduceOptions.preferClassname ? testCaseItem.classname : (item.name || testCaseItem.classname),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testomatio/reporter",
-  "version": "0.8.1",
+  "version": "0.8.3",
   "description": "Testomatio Reporter Client",
   "main": "./lib/reporter.js",
   "typings": "typings/index.d.ts",