testomatio-reporter-cli 2.10.1 → 2.11.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testomatio-reporter-cli",
-  "version": "2.10.1",
+  "version": "2.11.0",
   "description": "Yarn Berry compatible standalone CLI for @testomatio/reporter",
   "type": "module",
   "bin": {

package/src/bin/cli.js

@@ -8,7 +8,7 @@ import TestomatClient from '../client.js';
 import XmlReader from '../xmlReader.js';
 import AllureReader from '../allureReader.js';
 import { APP_PREFIX, STATUS, DEBUG_FILE, BATCH_MODE } from '../constants.js';
-import { cleanLatestRunId, getPackageVersion, applyFilter } from '../utils/utils.js';
+import { cleanLatestRunId, getPackageVersion, applyFilter, transformEnvVarToBoolean } from '../utils/utils.js';
 import { config } from '../config.js';
 import { readLatestRunId } from '../utils/utils.js';
 import pc from 'picocolors';
@@ -107,8 +107,11 @@ program
     const apiKey = process.env['INPUT_TESTOMATIO-KEY'] || config.TESTOMATIO;
     const client = new TestomatClient({ apiKey });
 
+    const finishParams = {};
+    if (transformEnvVarToBoolean(process.env.TESTOMATIO_FINISH_SHARED_RUN)) finishParams.force_finish_shared_run = true;
+
     // @ts-ignore
-    client.updateRunStatus(STATUS.FINISHED).then(() => {
+    client.updateRunStatus(STATUS.FINISHED, finishParams).then(() => {
       process.exit(0);
     });
   });

package/src/client.js

@@ -206,9 +206,9 @@ class Client {
         suite_title: 'Unknown suite',
       };
 
-    // Add timestamp if not already present (microseconds since Unix epoch)
+    // Add timestamp if not already present (Unix seconds)
     if (!testData.timestamp && !process.env.TESTOMATIO_NO_TIMESTAMP) {
-      testData.timestamp = Math.floor((performance.timeOrigin + performance.now()) * 1000);
+      testData.timestamp = Math.floor((performance.timeOrigin + performance.now()) / 1000);
     }
 
     /**

package/src/junit-adapter/dart.js

@@ -0,0 +1,103 @@
+import path from 'path';
+import Adapter from './adapter.js';
+
+class DartAdapter extends Adapter {
+  
+  getFilePath(t) {
+    if (t.title.startsWith('runDartTest[')) {
+      // Android: runDartTest[tests.path.to.test Test name]
+      const fileName = namespaceToFileName(t.title.split('[')[1].split(' ')[0]);
+      return fileName;
+    }
+    // iOS: RunnerUITests tests.path.to.test Test name
+    const parts = t.title.split(' ');
+    const pathToken = parts.length > 1 ? parts[1] : parts[0];
+    return namespaceToFileName(pathToken);
+  }
+
+  formatTest(t) {
+    if (t.title.startsWith('runDartTest[')) {
+      // Android: runDartTest[<path> <name>]
+      // First space is between the path and the test name; strip up to and including it, remove trailing ']'
+      const spaceIndex = t.title.indexOf(' ');
+      if (spaceIndex > -1) {
+        const pathToken = t.title.slice('runDartTest['.length, spaceIndex);
+        t.file = namespaceToFileName(pathToken);
+        t.title = t.title.slice(spaceIndex + 1).replace(/\]$/, '');
+      }
+    } else {
+      // iOS: <ClassName> <test.path> <test name>
+      // Skip both the classname token and the dot-separated test path token
+      const parts = t.title.split(' ');
+      if (parts.length > 2 && parts[1] && parts[1].includes('.')) {
+        t.file = namespaceToFileName(parts[1]);
+        t.title = parts.slice(2).join(' ');
+      } else {
+        const spaceIndex = t.title.indexOf(' ');
+        if (spaceIndex > -1) {
+          t.title = t.title.slice(spaceIndex + 1);
+        }
+      }
+    }
+
+    // classname: cut everything after the last dot (inclusive)
+    if (t.suite_title && t.suite_title.includes('.')) {
+      const lastDot = t.suite_title.lastIndexOf('.');
+      t.suite_title = t.suite_title.slice(0, lastDot);
+    }
+
+    if (!t.file) {
+      t.file = namespaceToFileName(t.suite_title || '');
+    }
+
+    // detect params
+    const paramMatches = t.title.match(/\[(.*?)\]/g);
+
+    if (paramMatches) {
+      const params = paramMatches.map((_match, index) => `param${index + 1}`);
+      if (params.length === 1) params[0] = 'param';
+      let paramIndex = 0;
+
+      t.title = t.title.replace(/\[(.*?)\]/g, () => {
+        if (params.length < 2) return `\${param}`;
+        const paramName = params[paramIndex] || `param${paramIndex + 1}`;
+        paramIndex++;
+        return `\${${paramName}}`;
+      });
+      const example = {};
+      paramMatches.forEach((match, index) => {
+        example[params[index]] = match.replace(/[[\]]/g, '');
+      });
+      t.example = example;
+    }
+
+    return t;
+  }
+}
+
+function namespaceToFileName(fileName) {
+  let testName = fileName;
+
+  // If it's already an extracted test name (contains dots but no runDartTest prefix)
+  if (fileName.includes('.') && !fileName.startsWith('runDartTest')) {
+    // Take only the first part before any spaces (the actual test path)
+    testName = fileName.split(' ')[0];
+  } else {
+    // Legacy handling for full runDartTest[...] format
+    const dartMatch = fileName.match(/runDartTest\[(.+?) /);
+    if (dartMatch) {
+      testName = dartMatch[1];
+    } else {
+      const parts = fileName.split(' ');
+      if (parts.length > 1) {
+        testName = parts[1];
+      }
+    }
+  }
+
+  const fileParts = testName.split('.');
+  fileParts[fileParts.length - 1] = fileParts[fileParts.length - 1]?.replace(/\$.*/, '');
+  return `${fileParts.join(path.sep)}.dart`;
+}
+
+export default DartAdapter;

package/src/junit-adapter/index.js

@@ -5,6 +5,7 @@ import PythonAdapter from './python.js';
 import RubyAdapter from './ruby.js';
 import CSharpAdapter from './csharp.js';
 import KotlinAdapter from './kotlin.js';
+import DartAdapter from './dart.js';
 
 function AdapterFactory(lang, opts) {
   if (lang === 'java') {
@@ -25,6 +26,9 @@ function AdapterFactory(lang, opts) {
   if (lang === 'kotlin') {
     return new KotlinAdapter(opts);
   }
+  if (lang === 'dart') {
+    return new DartAdapter(opts);
+  }
 
   return new Adapter(opts);
 }

package/src/pipe/testomatio.js

@@ -167,6 +167,12 @@ class TestomatioPipe {
     // add test ID + run ID
     if (data.rid) data.rid = `${this.runId}-${data.rid}`;
 
+    // convert timestamp to seconds
+    if (data.timestamp > 1e11) {
+      if (data.timestamp > 1e14) data.timestamp = Math.floor(data.timestamp / 1e6); // convert microseconds
+      else if (data.timestamp > 1e11) data.timestamp = Math.floor(data.timestamp / 1e3); // convert milliseconds
+    }
+
     if (!process.env.TESTOMATIO_STACK_PASSED && data.status === STATUS.PASSED) {
       data.stack = null;
     }
@@ -569,6 +575,7 @@ class TestomatioPipe {
             status_event,
             detach: params.detach,
             tests: params.tests,
+            ...(params.force_finish_shared_run && { force_finish_shared_run: true }),
           },
         });
 

package/src/utils/utils.js

@@ -271,6 +271,26 @@ const fetchIdFromOutput = output => {
   return output.match(TID_FULL_PATTERN)?.[2];
 };
 
+const findDartTestLine = (lines, expectedTitle) => {
+  const testFunctions = ['patrolTest', 'testWidgets'];
+  const quotedTitles = [`'${expectedTitle}',`, `"${expectedTitle}",`, `r'${expectedTitle}',`, `r"${expectedTitle}",`];
+
+  return lines.findIndex((_line, index) => {
+    const declaration = lines
+      .slice(index, index + 5)
+      .map(line => line.trim())
+      .join(' ');
+    const functionName = testFunctions.find(name => declaration.startsWith(name));
+    if (!functionName) return false;
+
+    const argumentsList = declaration.slice(functionName.length).trimStart();
+    if (!argumentsList.startsWith('(')) return false;
+
+    const firstArgument = argumentsList.slice(1).trimStart();
+    return quotedTitles.some(title => firstArgument.startsWith(title));
+  });
+};
+
 const fetchSourceCode = (contents, opts = {}) => {
   if (!opts.title && !opts.line) return '';
 
@@ -354,6 +374,32 @@ const fetchSourceCode = (contents, opts = {}) => {
           }
         }
       }
+    } else if (opts.lang === 'dart') {
+      // For Dart, locate the specific patrolTest/testWidgets block by title first —
+      // otherwise every test sharing the same main() gets the same @T comment.
+      const rawTitle = opts.title || '';
+      let dartTestTitle = '';
+
+      if (rawTitle.startsWith('runDartTest[')) {
+        // Android: runDartTest[<path> <test name>]
+        const spaceIndex = rawTitle.indexOf(' ');
+        if (spaceIndex > -1) {
+          dartTestTitle = rawTitle.slice(spaceIndex + 1).replace(/\]$/, '');
+        }
+      } else {
+        // iOS: <ClassName> <test.path> <test name>
+        const parts = rawTitle.split(' ');
+        if (parts.length > 2 && parts[1] && parts[1].includes('.')) {
+          dartTestTitle = parts.slice(2).join(' ');
+        }
+      }
+
+      let testLineIndex = -1;
+      if (dartTestTitle) {
+        testLineIndex = findDartTestLine(lines, dartTestTitle);
+      }
+
+      lineIndex = testLineIndex;
     } else {
       lineIndex = lines.findIndex(l => l.includes(title));
     }
@@ -371,8 +417,8 @@ const fetchSourceCode = (contents, opts = {}) => {
     for (let i = lineIndex; i < lineIndex + limit; i++) {
       if (lines[i] === undefined) continue;
 
-      // Track brace depth for C# to stop after method closes
-      if (opts.lang === 'csharp') {
+      // Track brace depth for C# and Dart to stop after method/main closes
+      if (opts.lang === 'csharp' || opts.lang === 'dart') {
         const line = lines[i];
         // Count opening and closing braces
         const openBraces = (line.match(/\{/g) || []).length;

package/src/xmlReader.js

@@ -472,6 +472,7 @@ class XmlReader {
           if (file.endsWith('.js')) this.stats.language = 'js';
           if (file.endsWith('.ts')) this.stats.language = 'ts';
           if (file.endsWith('.cs')) this.stats.language = 'csharp';
+          if (file.endsWith('.dart')) this.stats.language = 'dart';
         }
 
         if (!fs.existsSync(file)) {

package/types/types.d.ts

@@ -274,6 +274,9 @@ export interface RunData {
    * An array of `TestData` objects representing the individual test cases in the test run.
    * Used for JUNit report when we don't send the tests in realtime but in a batch as a part of final result */
   tests?: TestData[];
+
+  /** Force-finish a shared run even if other participants haven't finished yet. Set via `TESTOMATIO_FINISH_SHARED_RUN`. */
+  force_finish_shared_run?: boolean;
 }
 
 export enum TestStatus {