testomatio-reporter-cli 2.9.1-beta.1-allure-chunking → 2.9.1-beta.3-allure-steps

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testomatio-reporter-cli",
-  "version": "2.9.1-beta.1-allure-chunking",
+  "version": "2.9.1-beta.3-allure-steps",
   "description": "Yarn Berry compatible standalone CLI for @testomatio/reporter",
   "type": "module",
   "bin": {

package/src/allureReader.js

@@ -193,6 +193,13 @@ class AllureReader {
       overwrite: true,
     };
 
+    // Use the @TmsLink / Testomat.io link as the test id so reported tests MATCH
+    // existing cases instead of creating duplicates on every run.
+    const testId = this.extractTestId(result);
+    if (testId) {
+      test.test_id = testId;
+    }
+
     // Add description if present
     if (result.description) {
       test.description = result.description;
@@ -233,6 +240,29 @@ class AllureReader {
     return statusMap[status] || 'failed';
   }
 
+  /**
+   * Map an Allure step status to the Testomat.io Step status enum
+   * (`passed | failed | none | custom`, see testomat-api-definition.yml).
+   *
+   * Allure marks a step `broken` when it threw an unexpected error — that is a
+   * failure for reporting purposes, matching how `mapStatus` treats tests.
+   * `skipped` and anything unknown/absent become `none` (the neutral value),
+   * since the step enum has no `skipped`.
+   *
+   * @param {string} status - Allure step status
+   * @returns {'passed'|'failed'|'none'} Testomat.io step status
+   */
+  mapStepStatus(status) {
+    const statusMap = {
+      passed: 'passed',
+      failed: 'failed',
+      broken: 'failed',
+      skipped: 'none',
+      pending: 'none',
+    };
+    return statusMap[status] || 'none';
+  }
+
   extractSuiteTitle(result) {
     const labels = result.labels || [];
 
@@ -346,6 +376,58 @@ class AllureReader {
     return links.length > 0 ? links : undefined;
   }
 
+  /**
+   * Extract a Testomat.io test id from Allure links so reported tests match
+   * existing cases instead of creating duplicates.
+   *
+   * Allure's `@TmsLink("T1a2b3c4d")` produces a link with `type: "tms"`. Some exporters
+   * omit the type but still point the link URL at a Testomat.io test page; both are
+   * accepted. The link `name` is used as the id (falling back to the last URL segment).
+   *
+   * @param {object} result - Parsed Allure result JSON
+   * @returns {string|null} Normalized test id, or null when no usable link exists
+   */
+  extractTestId(result) {
+    const links = result.links || [];
+    if (!links.length) return null;
+
+    const isTmsLink = l => typeof l?.type === 'string' && l.type.toLowerCase() === 'tms';
+    const isTestomatioLink = l => typeof l?.url === 'string' && /testomat\.io\/[^\s]*\/test\//i.test(l.url);
+
+    const link = links.find(isTmsLink) || links.find(isTestomatioLink);
+    if (!link) return null;
+
+    // Prefer the explicit link name; fall back to the id segment of a Testomat.io URL.
+    let id = this.normalizeTestId(link.name);
+    if (!id && typeof link.url === 'string') {
+      const fromUrl = link.url.match(/\/test\/([\w\d]{8})(?=$|[/?#])/i);
+      if (fromUrl) id = fromUrl[1];
+    }
+
+    return id;
+  }
+
+  /**
+   * Normalize a value into a Testomat.io test id.
+   *
+   * Testomat.io test ids are exactly **8 word characters**. The value may arrive bare
+   * (`1a2b3c4d`), or carrying the `T` / `@T` markers Testomat uses in code and titles
+   * (`T1a2b3c4d`, `@T1a2b3c4d`). The markers are removed only when doing so still leaves
+   * a valid 8-char id, so a real id that happens to start with `T` is preserved.
+   *
+   * Anything that does not resolve to a valid 8-char id — a numeric Allure TestOps id
+   * like `12345`, a JIRA key, a 6-digit TMS number — is rejected (returns null) so we
+   * never send an unmatchable id that would create duplicates.
+   *
+   * @param {string|number|null|undefined} value
+   * @returns {string|null} The bare 8-char id, or null when the value is not a valid id
+   */
+  normalizeTestId(value) {
+    if (value === null || value === undefined) return null;
+    const match = value.toString().trim().match(/^@?T?([\w\d]{8})$/);
+    return match ? match[1] : null;
+  }
+
   convertSteps(steps, depth = 0) {
     if (depth >= 10) return null;
 
@@ -354,6 +436,7 @@ class AllureReader {
         const convertedStep = {
           category: 'user',
           title: step.name || step.title || 'Unknown step',
+          status: this.mapStepStatus(step.status),
           duration: this.calculateRunTime(step),
           steps: this.convertSteps(step.steps || [], depth + 1),
         };
@@ -482,8 +565,10 @@ class AllureReader {
           debug('Fetched code for test %s', t.title);
         }
 
+        // Don't override an id already taken from a @TmsLink — the link is the
+        // explicit, source-independent match key the client maintains.
         const testId = fetchIdFromCode(contents, { lang: this.getLanguage() });
-        if (testId) {
+        if (testId && !t.test_id) {
           t.test_id = testId;
           debug('Fetched test id %s for test %s', testId, t.title);
         }