@testomatio/reporter 1.4.6-proxy-support → 1.4.7

package/lib/adapter/codecept.js

@@ -207,18 +207,18 @@ function CodeceptReporter(config) {
     services.setContext(null);
 
     client.addTestRun(STATUS.FAILED, {
-        ...stripExampleFromTitle(title),
-        rid: id,
-        test_id: getTestomatIdFromTestTitle(`${title} ${tags?.join(' ')}`),
-        suite_title: test.parent && test.parent.title,
-        error,
-        message: testObj.message,
-        time: getDuration(test),
-        files,
-        steps: global.testomatioDataStore?.steps?.join('\n') || null,
-        logs,
-        manuallyAttachedArtifacts,
-        meta: keyValues,
+      ...stripExampleFromTitle(title),
+      rid: id,
+      test_id: getTestomatIdFromTestTitle(`${title} ${tags?.join(' ')}`),
+      suite_title: test.parent && test.parent.title,
+      error,
+      message: testObj.message,
+      time: getDuration(test),
+      files,
+      steps: global.testomatioDataStore?.steps?.join('\n') || null,
+      logs,
+      manuallyAttachedArtifacts,
+      meta: keyValues,
     });
 
     debug('artifacts', artifacts);
@@ -319,7 +319,6 @@ async function uploadAttachments(client, attachments, messagePrefix, attachmentT
   });
 
   await Promise.all(promises);
-
 }
 
 function getTestAndMessage(title) {

package/lib/adapter/playwright.js

@@ -39,14 +39,15 @@ class PlaywrightReporter {
     if (!this.client) return;
 
     const { title } = test;
-
     const { error, duration } = result;
-
     const suite_title = test.parent ? test.parent?.title : path.basename(test?.location?.file);
 
     const steps = [];
     for (const step of result.steps) {
-      appendStep(step, steps);
+      const appendedStep = appendStep(step);
+      if (appendedStep) {
+        steps.push(appendedStep);
+      }
     }
 
     const fullTestTitle = getTestContextName(test);
@@ -56,22 +57,21 @@ class PlaywrightReporter {
     }
     const manuallyAttachedArtifacts = services.artifacts.get(fullTestTitle);
     const keyValues = services.keyValues.get(fullTestTitle);
-
     const rid = test.id || test.testId || uuidv4();
 
     const reportTestPromise = this.client.addTestRun(checkStatus(result.status), {
-        rid,
-        error,
-        test_id: getTestomatIdFromTestTitle(`${title} ${test.tags?.join(' ')}`),
-        suite_title,
-        title,
-        steps: steps.join('\n'),
-        time: duration,
-        logs,
-        manuallyAttachedArtifacts,
-        meta: keyValues,
-        file: test.location?.file,
-      });
+      rid,
+      error,
+      test_id: getTestomatIdFromTestTitle(`${title} ${test.tags?.join(' ')}`),
+      suite_title,
+      title,
+      steps: steps.length ? steps : undefined,
+      time: duration,
+      logs,
+      manuallyAttachedArtifacts,
+      meta: keyValues,
+      file: test.location?.file,
+    });
 
     this.uploads.push({
       rid,
@@ -146,18 +146,44 @@ function checkStatus(status) {
   );
 }
 
-function appendStep(step, steps = [], shift = 0) {
-  const prefix = ' '.repeat(shift);
-
-  if (step.error) {
-    steps.push(`${prefix}${chalk.red(step.title)} ${chalk.gray(`${step.duration}ms`)}`);
-  } else {
-    steps.push(`${prefix}${step.title} ${chalk.gray(`${step.duration}ms`)}`);
+function appendStep(step, shift = 0) {
+  let newCategory = step.category;
+  switch (newCategory) {
+    case 'test.step':
+      newCategory = 'user';
+      break;
+    case 'hook':
+      newCategory = 'hook';
+      break;
+    case 'attach':
+      return null; // Skip steps with category 'attach'
+    default:
+      newCategory = 'framework';
   }
 
+  const formattedSteps = [];
   for (const child of step.steps || []) {
-    appendStep(child, steps, shift + 2);
+    const appendedChild = appendStep(child, shift + 2);
+    if (appendedChild) {
+      formattedSteps.push(appendedChild);
+    }
+  }
+
+  const resultStep = {
+    category: newCategory,
+    title: step.title,
+    duration: step.duration,
+  };
+
+  if (formattedSteps.length) {
+    resultStep.steps = formattedSteps;
   }
+
+  if (step.error !== undefined) {
+    resultStep.error = step.error;
+  }
+
+  return resultStep;
 }
 
 function tmpFile(prefix = 'tmp.') {

package/lib/bin/reportXml.js

@@ -44,15 +44,10 @@ program
 
     let timeoutTimer;
     if (opts.timelimit) {
-      timeoutTimer = setTimeout(
-        () => {
-          console.log(
-            `⚠️  Reached timeout of ${opts.timelimit}s. Exiting... (Exit code is 0 to not fail the pipeline)`,
-          );
-          process.exit(0);
-        },
-        parseInt(opts.timelimit, 10) * 1000,
-      );
+      timeoutTimer = setTimeout(() => {
+        console.log(`⚠️  Reached timeout of ${opts.timelimit}s. Exiting... (Exit code is 0 to not fail the pipeline)`);
+        process.exit(0);
+      }, parseInt(opts.timelimit, 10) * 1000);
     }
 
     try {

package/lib/client.js

@@ -227,7 +227,7 @@ class Client {
   /**
    *
    * Updates the status of the current test run and finishes the run.
-   * @param {'passed' | 'failed' | 'finished'} status - The status of the current test run.
+   * @param {'passed' | 'failed' | 'skipped' | 'finished'} status - The status of the current test run.
    * Must be one of "passed", "failed", or "finished"
    * @param {boolean} [isParallel] - Whether the current test run was executed in parallel with other tests.
    * @returns {Promise<any>} - A Promise that resolves when finishes the run.
@@ -276,7 +276,7 @@ class Client {
    */
   formatLogs({ error, steps, logs }) {
     error = error?.trim();
-    steps = steps?.trim();
+    steps = typeof steps === 'string' ? steps?.trim() : steps;
     logs = logs?.trim();
 
     let testLogs = '';
@@ -299,7 +299,7 @@ class Client {
     stack += `${message}\n`;
 
     if (error.diff) {
-      // diff for vitest 
+      // diff for vitest
       stack += error.diff;
       stack += '\n\n';
     } else if (error.actual && error.expected && error.actual !== error.expected) {

package/lib/pipe/gitlab.js

@@ -79,13 +79,13 @@ class GitLabPipe {
     let summary = `${this.hiddenCommentData}
     
   | [![Testomat.io Report](${testomatLogoURL})](https://testomat.io)  | ${statusEmoji(
-    runParams.status,
-  )} ${runParams.status.toUpperCase()} ${statusEmoji(runParams.status)} |
+      runParams.status,
+    )} ${runParams.status.toUpperCase()} ${statusEmoji(runParams.status)} |
   | --- | --- |
   | Tests | ✔️  **${this.tests.length}** tests run  |
   | Summary | ${statusEmoji('failed')} **${failedCount}** failed; ${statusEmoji(
-    'passed',
-  )} **${passedCount}** passed; **${statusEmoji('skipped')}** ${skippedCount} skipped |
+      'passed',
+    )} **${passedCount}** passed; **${statusEmoji('skipped')}** ${skippedCount} skipped |
   | Duration | 🕐  **${humanizeDuration(
     parseInt(
       this.tests.reduce((a, t) => a + (t.run_time || 0), 0),

package/lib/pipe/testomatio.js

@@ -350,7 +350,7 @@ class TestomatioPipe {
     if (!this.runId) return;
 
     // add test ID + run ID
-    data.rid = `${this.runId}-${data.rid}`;
+    if (data.rid) data.rid = `${this.runId}-${data.rid}`;
     data.api_key = this.apiKey;
     data.create = this.createNewTests;
 

package/lib/xmlReader.js

@@ -2,6 +2,7 @@ const debug = require('debug')('@testomatio/reporter:xml');
 const path = require('path');
 const chalk = require('chalk');
 const fs = require('fs');
+const { randomUUID } = require('crypto');
 const { XMLParser } = require('fast-xml-parser');
 const { APP_PREFIX, STATUS } = require('./constants');
 const {
@@ -17,6 +18,8 @@ const pipesFactory = require('./pipe');
 const adapterFactory = require('./junit-adapter');
 const config = require('./config');
 
+const ridRunId = randomUUID();
+
 const TESTOMATIO_URL = process.env.TESTOMATIO_URL || 'https://app.testomat.io';
 const { TESTOMATIO_RUNGROUP_TITLE, TESTOMATIO_TITLE, TESTOMATIO_ENV, TESTOMATIO_RUN } = process.env;
 
@@ -457,17 +460,20 @@ function reduceTestCases(prev, item) {
       if (testCaseItem.error && testCaseItem.error['#text']) stack = testCaseItem.error['#text'];
       if (!message) message = stack.trim().split('\n')[0];
 
+      const isParametrized = item.type === 'ParameterizedMethod';
+      const preferClassname = reduceOptions.preferClassname || isParametrized;
+
       // SpecFlow config
-      let { title, tags } = fetchProperties(item.type === 'ParameterizedMethod' ? item : testCaseItem);
+      let { title, tags } = fetchProperties(isParametrized ? item : testCaseItem);
       let example = null;
-      const suiteTitle = reduceOptions.preferClassname ? testCaseItem.classname : item.name || testCaseItem.classname;
+      const suiteTitle = preferClassname ? testCaseItem.classname : item.name || testCaseItem.classname;
 
       title ||= testCaseItem.name || testCaseItem.methodname || testCaseItem.classname;
       tags ||= [];
 
-      const exampleMatches = title.match(/\((.*?)\)/);
+      const exampleMatches = testCaseItem.name?.match(/\S\((.*?)\)/);
       if (exampleMatches) {
-        example = { ...exampleMatches[1].split(',').map(v => v.replace(/^['"]|['"]$/g, '')) };
+        example = { ...exampleMatches[1].split(',').map(v => v.trim().replace(/[^\w\s-]/g, '')) };
         title = title.replace(/\(.*?\)/, '').trim();
       }
 
@@ -481,12 +487,16 @@ function reduceTestCases(prev, item) {
       if ('failure' in testCaseItem || 'error' in testCaseItem) status = STATUS.FAILED;
       if ('skipped' in testCaseItem) status = STATUS.SKIPPED;
 
+      let rid = null;
+      if (testCaseItem.id) rid = `${ridRunId}-${testCaseItem.id}`;
+
       prev.push({
-        create: true,
+        rid,
         file,
         stack,
         example,
         tags,
+        create: true,
         test_id: testId,
         message,
         line: testCaseItem.lineno,
@@ -510,9 +520,9 @@ function processTestSuite(testsuite) {
     suites = [testsuite];
   }
 
-  const res = suites.flat().reduce(reduceTestCases, []);
+  const subSuites = suites.filter(s => s['test-suite'] && !testsuite['test-case']);
 
-  return res;
+  return [...subSuites.map(s => processTestSuite(s['test-suite'])), ...suites.reduce(reduceTestCases, [])].flat();
 }
 
 function fetchProperties(item) {

package/package.json

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