@testomatio/reporter 1.4.3 → 1.4.5-beta.1-report-id

package/lib/adapter/codecept.js

@@ -129,7 +129,7 @@ function CodeceptReporter(config) {
     await Promise.all(reportTestPromises);
 
     if (upload.isArtifactsEnabled()) {
-      uploadAttachments(client, videos, '🎞️  Uploading', 'video');
+      uploadAttachments(client, videos, '🎞️ Uploading', 'video');
       uploadAttachments(client, traces, '📁 Uploading', 'trace');
     }
 
@@ -142,7 +142,6 @@ function CodeceptReporter(config) {
     if (id && failedTests.includes(id)) {
       failedTests = failedTests.filter(failed => id !== failed);
     }
-    const testId = getTestomatIdFromTestTitle(`${title} ${tags?.join(' ')}`);
     const testObj = getTestAndMessage(title);
 
     const logs = getTestLogs(test);
@@ -152,11 +151,12 @@ function CodeceptReporter(config) {
 
     client.addTestRun(STATUS.PASSED, {
       ...stripExampleFromTitle(title),
+      rid: id,
       suite_title: test.parent && test.parent.title,
       message: testObj.message,
       time: getDuration(test),
       steps: global.testomatioDataStore.steps.join('\n') || null,
-      test_id: testId,
+      test_id: getTestomatIdFromTestTitle(`${title} ${tags?.join(' ')}`),
       logs,
       manuallyAttachedArtifacts,
       meta: keyValues,
@@ -179,6 +179,7 @@ function CodeceptReporter(config) {
       const testId = getTestomatIdFromTestTitle(`${title} ${tags?.join(' ')}`);
 
       client.addTestRun(STATUS.FAILED, {
+        rid: id,
         ...stripExampleFromTitle(title),
         suite_title: suite.title,
         test_id: testId,
@@ -194,7 +195,6 @@ function CodeceptReporter(config) {
     if (test.err) error = test.err;
     const { id, tags, title, artifacts } = test;
     failedTests.push(id || title);
-    let testId = getTestomatIdFromTestTitle(`${title} ${tags?.join(' ')}`);
     const testObj = getTestAndMessage(title);
 
     const files = [];
@@ -206,10 +206,10 @@ function CodeceptReporter(config) {
     const keyValues = services.keyValues.get(test.fullTitle());
     services.setContext(null);
 
-    const reportTestPromise = client
-      .addTestRun(STATUS.FAILED, {
+    client.addTestRun(STATUS.FAILED, {
         ...stripExampleFromTitle(title),
-        test_id: testId,
+        rid: id,
+        test_id: getTestomatIdFromTestTitle(`${title} ${tags?.join(' ')}`),
         suite_title: test.parent && test.parent.title,
         error,
         message: testObj.message,
@@ -219,19 +219,14 @@ function CodeceptReporter(config) {
         logs,
         manuallyAttachedArtifacts,
         meta: keyValues,
-      })
-      .then(pipes => {
-        testId = pipes.filter(p => p.pipe.includes('Testomatio'))[0]?.result?.data?.test_id;
+    });
 
-        debug('artifacts', artifacts);
+    debug('artifacts', artifacts);
 
-        for (const aid in artifacts) {
-          if (aid.startsWith('video')) videos.push({ testId, title, path: artifacts[aid], type: 'video/webm' });
-          if (aid.startsWith('trace')) traces.push({ testId, title, path: artifacts[aid], type: 'application/zip' });
-        }
-      });
-
-    reportTestPromises.push(reportTestPromise);
+    for (const aid in artifacts) {
+      if (aid.startsWith('video')) videos.push({ rid: id, title, path: artifacts[aid], type: 'video/webm' });
+      if (aid.startsWith('trace')) traces.push({ rid: id, title, path: artifacts[aid], type: 'application/zip' });
+    }
 
     // output.stop();
   });
@@ -240,11 +235,11 @@ function CodeceptReporter(config) {
     const { id, tags, title } = test;
     if (failedTests.includes(id || title)) return;
 
-    const testId = getTestomatIdFromTestTitle(`${title} ${tags?.join(' ')}`);
     const testObj = getTestAndMessage(title);
     client.addTestRun(STATUS.SKIPPED, {
+      rid: id,
       ...stripExampleFromTitle(title),
-      test_id: testId,
+      test_id: getTestomatIdFromTestTitle(`${title} ${tags?.join(' ')}`),
       suite_title: test.parent && test.parent.title,
       message: testObj.message,
       time: getDuration(test),
@@ -313,11 +308,11 @@ async function uploadAttachments(client, attachments, messagePrefix, attachmentT
     console.log(APP_PREFIX, `Attachments: ${messagePrefix} ${attachments.length} ${attachmentType}/-s ...`);
 
     const promises = attachments.map(async attachment => {
-      const { testId, title, path, type } = attachment;
+      const { rid, title, path, type } = attachment;
       const file = { path, type, title };
       return client.addTestRun(undefined, {
         ...stripExampleFromTitle(title),
-        test_id: testId,
+        rid,
         files: [file],
       });
     });

package/lib/adapter/playwright.js

@@ -39,8 +39,6 @@ class PlaywrightReporter {
 
     const { title } = test;
 
-    let testId = getTestomatIdFromTestTitle(`${title} ${test.tags?.join(' ')}`);
-
     const { error, duration } = result;
 
     const suite_title = test.parent ? test.parent?.title : path.basename(test?.location?.file);
@@ -58,10 +56,10 @@ class PlaywrightReporter {
     const manuallyAttachedArtifacts = services.artifacts.get(fullTestTitle);
     const keyValues = services.keyValues.get(fullTestTitle);
 
-    const reportTestPromise = this.client
-      .addTestRun(checkStatus(result.status), {
+    const reportTestPromise = this.client.addTestRun(checkStatus(result.status), {
+        rid: test.testId,
         error,
-        test_id: testId,
+        test_id: getTestomatIdFromTestTitle(`${title} ${test.tags?.join(' ')}`),
         suite_title,
         title,
         steps: steps.join('\n'),
@@ -70,21 +68,16 @@ class PlaywrightReporter {
         manuallyAttachedArtifacts,
         meta: keyValues,
         file: test.location?.file,
-      })
-      .then(pipes => {
-        testId = pipes?.filter(p => p.pipe.includes('Testomatio'))[0]?.result?.data?.test_id;
-
-        this.uploads.push({
-          testId,
-          title,
-          suite_title,
-          files: result.attachments.filter(a => a.body || a.path),
-          file: test.location?.file,
-        });
-        // remove empty uploads
-        this.uploads = this.uploads.filter(upload => upload.files.length);
       });
 
+    this.uploads.push({
+      rid: test.testId,
+      files: result.attachments.filter(a => a.body || a.path),
+      file: test.location?.file,
+    });
+    // remove empty uploads
+    this.uploads = this.uploads.filter(upload => upload.files.length);
+
     reportTestPromises.push(reportTestPromise);
   }
 
@@ -110,7 +103,7 @@ class PlaywrightReporter {
     await Promise.all(reportTestPromises);
 
     if (this.uploads.length && isArtifactsEnabled()) {
-      console.log(APP_PREFIX, `🎞️  Uploading ${this.uploads.length} files...`);
+      console.log(APP_PREFIX, `🎞️ Uploading ${this.uploads.length} files...`);
 
       const promises = [];
 

package/lib/client.js

@@ -6,7 +6,7 @@ const fs = require('fs');
 const chalk = require('chalk');
 const { randomUUID } = require('crypto');
 const upload = require('./fileUploader');
-const { APP_PREFIX } = require('./constants');
+const { APP_PREFIX, STATUS } = require('./constants');
 const pipesFactory = require('./pipe');
 const { glob } = require('glob');
 const path = require('path');
@@ -122,6 +122,11 @@ class Client {
 
     if (isTestShouldBeExculedFromReport(testData)) return [];
 
+    if (status === STATUS.SKIPPED && process.env.TESTOMATIO_EXCLUDE_SKIPPED) {
+      debug('Skipping test from report', testData?.title)
+      return []; // do not log skipped tests
+    }
+
     if (!testData)
       testData = {
         title: 'Unknown test',
@@ -129,6 +134,7 @@ class Client {
       };
 
     const {
+      rid,
       error = null,
       time = '',
       example = null,
@@ -179,6 +185,7 @@ class Client {
     this.totalUploaded += artifacts.length;
 
     const data = {
+      rid,
       files,
       steps,
       status,

package/lib/pipe/testomatio.js

@@ -339,6 +339,9 @@ class TestomatioPipe {
   addTest(data) {
     if (!this.isEnabled) return;
     if (!this.runId) return;
+
+    // add test ID + run ID
+    data.rid = `${this.runId}-${data.rid}`;
     data.api_key = this.apiKey;
     data.create = this.createNewTests;
 
@@ -354,11 +357,11 @@ class TestomatioPipe {
    * @returns
    */
   async finishRun(params) {
-    this.#batchUpload();
+    if (!this.isEnabled) return;
+    
+    await this.#batchUpload();
     if (this.batch.intervalFunction) clearInterval(this.batch.intervalFunction);
 
-    debug('Finishing run...');
-    if (!this.isEnabled) return;
     debug('Finishing run...');
 
     if (this.reportingCanceledDueToReqFailures) {

package/lib/xmlReader.js

@@ -460,6 +460,7 @@ function reduceTestCases(prev, item) {
       // SpecFlow config
       let { title, tags } = fetchProperties(item.type === 'ParameterizedMethod' ? item : testCaseItem);
       let example = null;
+      const suiteTitle = reduceOptions.preferClassname ? testCaseItem.classname : item.name || testCaseItem.classname;
 
       title ||= testCaseItem.name || testCaseItem.methodname || testCaseItem.classname;
       tags ||= [];
@@ -493,7 +494,7 @@ function reduceTestCases(prev, item) {
         run_time: parseFloat(testCaseItem.time || testCaseItem.duration) * 1000,
         status,
         title,
-        suite_title: reduceOptions.preferClassname ? testCaseItem.classname : item.name || testCaseItem.classname,
+        suite_title: suiteTitle,
       });
     });
   return prev;
@@ -527,4 +528,4 @@ function fetchProperties(item) {
     .filter(p => p.name === 'Category')
     .forEach(p => tags.push(p.value));
   return { title, tags };
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testomatio/reporter",
-  "version": "1.4.3",
+  "version": "1.4.5-beta.1-report-id",
   "description": "Testomatio Reporter Client",
   "main": "./lib/reporter.js",
   "typings": "typings/index.d.ts",