@testomatio/reporter 2.15.0 → 2.17.0-beta

package/lib/adapter/codecept.js

@@ -34,7 +34,9 @@ const HOOK_EXECUTION_ORDER = {
 };
 // codeceptjs workers are self-contained
 data_storage_js_1.dataStorage.isFileStorage = false;
-const DATA_REGEXP = /[|\s]+?(\{".*\}|\[.*\])/;
+// CodeceptJS appends the serialized data row of a data-driven test to its title
+const DATA_REGEXP = / \| (\{.*\}|\[.*\]|null|"(?:\\.|[^"\\])*")((?:\s+@[a-zA-Z0-9-_]+)*)$/;
+const PLACEHOLDER_REGEXP = /\$\{([\w_]+)\}/g;
 if (MAJOR_VERSION < 3) {
     console.log('🔴 This reporter works with CodeceptJS 3+, please update your tests');
 }
@@ -298,16 +300,37 @@ function stripExampleFromTitle(title) {
     const res = title.match(DATA_REGEXP);
     if (!res)
         return { title, example: null };
+    let example = null;
+    let exampleParsed = false;
     try {
-        const example = JSON.parse(res[1]);
-        title = title.replace(DATA_REGEXP, '').trim();
-        return { title, example };
+        example = JSON.parse(res[1]);
+        exampleParsed = true;
     }
     catch (e) {
-        // If JSON parsing fails, return title without example
-        debug('Failed to parse example JSON:', res[1], e.message);
-        return { title: title.replace(DATA_REGEXP, '').trim(), example: null };
+        try {
+            example = JSON.parse(res[1].slice(1, -1));
+            exampleParsed = true;
+        }
+        catch (e2) {
+            debug('Failed to parse example from title:', res[1]);
+        }
     }
+    let baseTitle = title.slice(0, res.index).trim();
+    if (exampleParsed) {
+        baseTitle = baseTitle.replace(PLACEHOLDER_REGEXP, (placeholder, key) => {
+            if (key === 'current')
+                return formatExample(example);
+            if (!Object.hasOwn(example ?? {}, key))
+                return placeholder;
+            return formatExample(example[key]);
+        });
+    }
+    return { title: `${baseTitle}${res[2]}`, example };
+}
+function formatExample(example) {
+    if (example !== null && typeof example === 'object')
+        return JSON.stringify(example);
+    return String(example);
 }
 function stripTagsFromTitle(title) {
     // Remove @tags from the end of titles (e.g., "Hooks Test Suite @hooks" -> "Hooks Test Suite")

package/lib/pipe/testomatio.d.ts

@@ -36,6 +36,7 @@ declare class TestomatioPipe implements Pipe {
     store: any;
     title: any;
     sharedRun: boolean;
+    sharedRunShards: number;
     sharedRunTimeout: number;
     groupTitle: any;
     env: string;

package/lib/pipe/testomatio.js

@@ -76,11 +76,14 @@ class TestomatioPipe {
         this.store = store || {};
         this.title = params.title || process.env.TESTOMATIO_TITLE;
         this.sharedRun = !!process.env.TESTOMATIO_SHARED_RUN;
+        this.sharedRunShards = process.env.TESTOMATIO_SHARDS
+            ? parseInt(process.env.TESTOMATIO_SHARDS, 10) || undefined
+            : undefined;
         this.sharedRunTimeout = process.env.TESTOMATIO_SHARED_RUN_TIMEOUT
             ? parseInt(process.env.TESTOMATIO_SHARED_RUN_TIMEOUT, 10)
             : undefined;
-        if (this.sharedRunTimeout && !this.sharedRun) {
-            debug('Auto-enabling sharedRun because sharedRunTimeout is set');
+        if ((this.sharedRunTimeout || this.sharedRunShards) && !this.sharedRun) {
+            debug('Auto-enabling sharedRun because sharedRunTimeout or sharedRunShards is set');
             this.sharedRun = true;
         }
         if (!this.title && (this.sharedRun || this.sharedRunTimeout)) {
@@ -290,6 +293,7 @@ class TestomatioPipe {
             label: this.label,
             shared_run: this.sharedRun,
             shared_run_timeout: this.sharedRunTimeout,
+            shared_run_shards: this.sharedRunShards,
             kind: params.kind,
             status: params.status,
             configuration,
@@ -527,6 +531,8 @@ class TestomatioPipe {
             status_event = 'pass';
         if (status === constants_js_1.STATUS.FAILED)
             status_event = 'fail';
+        if (this.sharedRun)
+            status_event = 'finish';
         try {
             if (this.runId && !this.proceed) {
                 await this.client.request({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testomatio/reporter",
-  "version": "2.15.0",
+  "version": "2.17.0-beta",
   "description": "Testomatio Reporter Client",
   "engines": {
     "node": ">=18"

package/src/adapter/codecept.js

@@ -34,7 +34,9 @@ const HOOK_EXECUTION_ORDER = {
 // codeceptjs workers are self-contained
 dataStorage.isFileStorage = false;
 
-const DATA_REGEXP = /[|\s]+?(\{".*\}|\[.*\])/;
+// CodeceptJS appends the serialized data row of a data-driven test to its title
+const DATA_REGEXP = / \| (\{.*\}|\[.*\]|null|"(?:\\.|[^"\\])*")((?:\s+@[a-zA-Z0-9-_]+)*)$/;
+const PLACEHOLDER_REGEXP = /\$\{([\w_]+)\}/g;
 
 if (MAJOR_VERSION < 3) {
   console.log('🔴 This reporter works with CodeceptJS 3+, please update your tests');
@@ -349,15 +351,34 @@ function stripExampleFromTitle(title) {
   const res = title.match(DATA_REGEXP);
   if (!res) return { title, example: null };
 
+  let example = null;
+  let exampleParsed = false;
   try {
-    const example = JSON.parse(res[1]);
-    title = title.replace(DATA_REGEXP, '').trim();
-    return { title, example };
+    example = JSON.parse(res[1]);
+    exampleParsed = true;
   } catch (e) {
-    // If JSON parsing fails, return title without example
-    debug('Failed to parse example JSON:', res[1], e.message);
-    return { title: title.replace(DATA_REGEXP, '').trim(), example: null };
+    try {
+      example = JSON.parse(res[1].slice(1, -1));
+      exampleParsed = true;
+    } catch (e2) {
+      debug('Failed to parse example from title:', res[1]);
+    }
+  }
+
+  let baseTitle = title.slice(0, res.index).trim();
+  if (exampleParsed) {
+    baseTitle = baseTitle.replace(PLACEHOLDER_REGEXP, (placeholder, key) => {
+      if (key === 'current') return formatExample(example);
+      if (!Object.hasOwn(example ?? {}, key)) return placeholder;
+      return formatExample(example[key]);
+    });
   }
+  return { title: `${baseTitle}${res[2]}`, example };
+}
+
+function formatExample(example) {
+  if (example !== null && typeof example === 'object') return JSON.stringify(example);
+  return String(example);
 }
 
 function stripTagsFromTitle(title) {

package/src/pipe/testomatio.js

@@ -88,12 +88,15 @@ class TestomatioPipe {
     this.store = store || {};
     this.title = params.title || process.env.TESTOMATIO_TITLE;
     this.sharedRun = !!process.env.TESTOMATIO_SHARED_RUN;
+    this.sharedRunShards = process.env.TESTOMATIO_SHARDS
+      ? parseInt(process.env.TESTOMATIO_SHARDS, 10) || undefined
+      : undefined;
     this.sharedRunTimeout = process.env.TESTOMATIO_SHARED_RUN_TIMEOUT
       ? parseInt(process.env.TESTOMATIO_SHARED_RUN_TIMEOUT, 10)
       : undefined;
 
-    if (this.sharedRunTimeout && !this.sharedRun) {
-      debug('Auto-enabling sharedRun because sharedRunTimeout is set');
+    if ((this.sharedRunTimeout || this.sharedRunShards) && !this.sharedRun) {
+      debug('Auto-enabling sharedRun because sharedRunTimeout or sharedRunShards is set');
       this.sharedRun = true;
     }
 
@@ -323,6 +326,7 @@ class TestomatioPipe {
         label: this.label,
         shared_run: this.sharedRun,
         shared_run_timeout: this.sharedRunTimeout,
+        shared_run_shards: this.sharedRunShards,
         kind: params.kind,
         status: params.status,
         configuration,
@@ -570,6 +574,7 @@ class TestomatioPipe {
     if (status === STATUS.FINISHED) status_event = 'finish';
     if (status === STATUS.PASSED) status_event = 'pass';
     if (status === STATUS.FAILED) status_event = 'fail';
+    if (this.sharedRun) status_event = 'finish';
 
     try {
       if (this.runId && !this.proceed) {