@testomatio/reporter 2.1.3-beta.3-multi-links → 2.2.2

package/src/bin/startTest.js

@@ -1,124 +1,53 @@
 #!/usr/bin/env node
-import { spawn } from 'cross-spawn';
-import { Command } from 'commander';
-import pc from 'picocolors';
-import TestomatClient from '../client.js';
-import { APP_PREFIX, STATUS } from '../constants.js';
+import { spawn } from 'node:child_process';
+import { join, dirname } from 'node:path';
 import { getPackageVersion } from '../utils/utils.js';
-import { config } from '../config.js';
-import dotenv from 'dotenv';
+import pc from 'picocolors';
+
+// Define __dirname - this will be replaced by build script with actual __dirname for CommonJS
+const __dirname = typeof globalThis.__dirname !== 'undefined' ? globalThis.__dirname : '.';
+const cliPath = join(__dirname, 'cli.js');
 
 const version = getPackageVersion();
 console.log(pc.cyan(pc.bold(` 🤩 Testomat.io Reporter v${version}`)));
-const program = new Command();
-
-program
-  .option('-c, --command <cmd>', 'Test runner command')
-  .option('--launch', 'Start a new run and return its ID')
-  .option('--finish', 'Finish Run by its ID')
-  .option('--env-file <envfile>', 'Load environment variables from env file')
-  .option('--filter <filter>', 'Additional execution filter')
-  .action(async opts => {
-    const { launch, finish, filter } = opts;
-    let { command } = opts;
-
-    if (opts.envFile) dotenv.config({ path: opts.envFile });
-
-    const apiKey = process.env['INPUT_TESTOMATIO-KEY'] || config.TESTOMATIO;
-    const title = process.env.TESTOMATIO_TITLE;
-
-    if (launch) {
-      console.log('Starting a new Run on Testomat.io...');
-      const client = new TestomatClient({ apiKey });
-
-      client.createRun().then(() => {
-        console.log(process.env.runId);
-        process.exit(0);
-      });
-      return;
-    }
-
-    if (finish) {
-      // TODO: add error in case of TESTOMATIO environment variable is not set
-      // because command is fine in console, but actually (on testomat.io) run is not finished
-      if (!process.env.TESTOMATIO_RUN) {
-        console.log('TESTOMATIO_RUN environment variable must be set.');
-        return process.exit(1);
-      }
-
-      console.log('Finishing Run on Testomat.io...');
-
-      const client = new TestomatClient({ apiKey });
 
-      // @ts-ignore
-      client.updateRunStatus(STATUS.FINISHED).then(() => {
-        console.log(pc.yellow(`Run ${process.env.TESTOMATIO_RUN} was finished`));
-        process.exit(0);
-      });
-      return;
+// Parse command line arguments to map start-test-run options to @testomatio/reporter run format
+const args = process.argv.slice(2);
+const newArgs = ['run'];
+
+let i = 0;
+while (i < args.length) {
+  const arg = args[i];
+  
+  if (arg === '-c' || arg === '--command') {
+    // Map -c/--command to positional argument for run command
+    i++;
+    if (i < args.length) {
+      newArgs.push(args[i]);
     }
+  } else if (arg.startsWith('--command=')) {
+    // Handle --command=value format
+    const command = arg.split('=', 2)[1];
+    newArgs.push(command);
+  } else if (arg === '--launch') {
+    // Map --launch to start command
+    newArgs[0] = 'start';
+  } else if (arg === '--finish') {
+    // Map --finish to finish command  
+    newArgs[0] = 'finish';
+  } else {
+    // Pass through other arguments
+    newArgs.push(arg);
+  }
+  i++;
+}
 
-    let exitCode = 0;
-
-    if (!command.split) {
-      process.exitCode = 255;
-      console.log(APP_PREFIX, `No command provided. Use -c option to launch a test runner.`);
-      return;
-    }
-
-    const client = new TestomatClient({ apiKey, title, parallel: true });
-
-    if (filter) {
-      const [pipe, ...optsArray] = filter.split(':');
-      const pipeOptions = optsArray.join(':');
-
-      try {
-        const tests = await client.prepareRun({ pipe, pipeOptions });
-
-        if (!tests || tests.length === 0) {
-          return;
-        }
-
-        const grep = ` --grep (${tests.join('|')})`;
-        command += grep;
-      } catch (err) {
-        console.log(APP_PREFIX, err);
-      }
-    }
-
-    const testCmds = command.split(' ');
-    console.log(APP_PREFIX, `🚀 Running`, pc.green(command));
-
-    if (!apiKey) {
-      const cmd = spawn(testCmds[0], testCmds.slice(1), { stdio: 'inherit' });
-
-      cmd.on('close', code => {
-        console.log(APP_PREFIX, '⚠️ ', `Runner exited with ${pc.bold(code)}, report is ignored`);
-
-        if (code > exitCode) exitCode = code;
-        process.exitCode = exitCode;
-      });
-
-      return;
-    }
-
-    client.createRun().then(() => {
-      const cmd = spawn(testCmds[0], testCmds.slice(1), { stdio: 'inherit' });
-
-      cmd.on('close', code => {
-        const emoji = code === 0 ? '🟢' : '🔴';
-        console.log(APP_PREFIX, emoji, `Runner exited with ${pc.bold(code)}`);
-        const status = code === 0 ? 'passed' : 'failed';
-        client.updateRunStatus(status, true);
-
-        if (code > exitCode) exitCode = code;
-        process.exitCode = exitCode;
-      });
-    });
-  });
+// Execute the main CLI with mapped arguments
 
-if (process.argv.length <= 2) {
-  program.outputHelp();
-}
+const child = spawn(process.execPath, [cliPath, ...newArgs], {
+  stdio: 'inherit'
+});
 
-program.parse(process.argv);
+child.on('exit', (code) => {
+  process.exit(code);
+});

package/src/client.js

@@ -11,6 +11,7 @@ import path, { sep } from 'path';
 import { fileURLToPath } from 'node:url';
 import { S3Uploader } from './uploader.js';
 import { formatStep, readLatestRunId, storeRunId, validateSuiteId } from './utils/utils.js';
+import { linkStorage } from './services/links.js';
 import { filesize as prettyBytes } from 'filesize';
 
 const debug = createDebugMessages('@testomatio/reporter:client');
@@ -182,7 +183,6 @@ class Client {
       test_id,
       timestamp,
       manuallyAttachedArtifacts,
-      labels,
       overwrite,
     } = testData;
     let { message = '', meta = {} } = testData;
@@ -224,7 +224,9 @@ class Client {
         return acc;
       }, {});
 
-    // Labels are simple array of strings, no processing needed
+    // Get links from storage using the test context
+    const testContext = suite_title ? `${suite_title} ${title}` : title;
+    const links = linkStorage.get(testContext) || [];
 
     let errorFormatted = '';
     if (error) {
@@ -280,7 +282,7 @@ class Client {
       timestamp,
       artifacts,
       meta,
-      labels,
+      links,
       overwrite,
       ...(rootSuiteId && { root_suite_id: rootSuiteId }),
     };
@@ -310,10 +312,9 @@ class Client {
    * Updates the status of the current test run and finishes the 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.
    */
-  async updateRunStatus(status, isParallel = false) {
+  async updateRunStatus(status) {
     this.pipes ||= await pipesFactory(this.paramsForPipesFactory || {}, this.pipeStore);
     this.runId ||= readLatestRunId();
 
@@ -321,7 +322,7 @@ class Client {
     // all pipes disabled, skipping
     if (!this.pipes?.filter(p => p.isEnabled).length) return Promise.resolve();
 
-    const runParams = { status, parallel: isParallel };
+    const runParams = { status };
 
     this.queue = this.queue
       .then(() => Promise.all(this.pipes.map(p => p.finishRun(runParams))))

package/src/data-storage.js

@@ -6,8 +6,6 @@ import { TESTOMAT_TMP_STORAGE_DIR } from './constants.js';
 import { fileSystem, testRunnerHelper } from './utils/utils.js';
 import crypto from 'crypto';
 
-const startTime = Date.now();
-
 const debug = createDebugMessages('@testomatio/reporter:storage');
 class DataStorage {
   static #instance;
@@ -43,7 +41,7 @@ class DataStorage {
   /**
    * Puts any data to storage (file or global variable).
    * If file: stores data as text, if global variable – stores as array of data.
-   * @param {'log' | 'artifact' | 'keyvalue' | 'labels'} dataType
+   * @param {'log' | 'artifact' | 'keyvalue' | 'links'} dataType
    * @param {*} data anything you want to store (string, object, array, etc)
    * @param {*} context could be testId or any context (test name, suite name, including their IDs etc)
    * suite name + test name is used by default
@@ -72,7 +70,7 @@ class DataStorage {
    * Returns data, stored for specific test/context (or data which was stored without test id specified).
    * This method will get data from global variable and/or from from file (previosly saved with put method).
    *
-   * @param {'log' | 'artifact' | 'keyvalue' | 'labels'} dataType
+   * @param {'log' | 'artifact' | 'keyvalue' | 'links'} dataType
    * @param {string} context
    * @returns {any []} array of data (any type), null (if no data found for context) or string (if data type is log)
    */
@@ -110,7 +108,7 @@ class DataStorage {
   }
 
   /**
-   * @param {'log' | 'artifact' | 'keyvalue' | 'labels'} dataType
+   * @param {'log' | 'artifact' | 'keyvalue' | 'links'} dataType
    * @param {string} context
    * @returns aray of data (any type)
    */
@@ -129,7 +127,7 @@ class DataStorage {
   }
 
   /**
-   * @param {'log' | 'artifact' | 'keyvalue' | 'labels'} dataType
+   * @param {'log' | 'artifact' | 'keyvalue' | 'links'} dataType
    * @param {*} context
    * @returns array of data (any type)
    */
@@ -153,7 +151,7 @@ class DataStorage {
 
   /**
    * Puts data to global variable. Unlike the file storage, stores data in array (file storage just append as string).
-   * @param {'log' | 'artifact' | 'keyvalue' | 'labels'} dataType
+   * @param {'log' | 'artifact' | 'keyvalue' | 'links'} dataType
    * @param {*} data
    * @param {*} context
    */
@@ -168,7 +166,7 @@ class DataStorage {
 
   /**
    * Puts data to file. Unlike the global variable storage, stores data as string
-   * @param {'log' | 'artifact' | 'keyvalue' | 'labels'} dataType
+   * @param {'log' | 'artifact' | 'keyvalue' | 'links'} dataType
    * @param {*} data
    * @param {string} context
    * @returns
@@ -195,7 +193,7 @@ function stringToMD5Hash(str) {
   md5.update(str);
   const hash = md5.digest('hex');
 
-  return `${startTime}_${hash}`;
+  return hash;
 }
 
 export const dataStorage = DataStorage.getInstance();

package/src/pipe/testomatio.js

@@ -43,7 +43,6 @@ class TestomatioPipe {
     const proxyUrl = process.env.HTTP_PROXY || process.env.HTTPS_PROXY;
     const proxy = proxyUrl ? new URL(proxyUrl) : null;
 
-    this.parallel = params.parallel;
     this.store = store || {};
     this.title = params.title || process.env.TESTOMATIO_TITLE;
     this.sharedRun = !!process.env.TESTOMATIO_SHARED_RUN;
@@ -119,8 +118,7 @@ class TestomatioPipe {
       const resp = await this.client.request({
         method: 'GET',
         url: '/api/test_grep',
-        params: q.params,
-        responseType: q.responseType
+        ...q,
       });
 
       if (Array.isArray(resp.data?.tests) && resp.data?.tests?.length > 0) {
@@ -168,7 +166,6 @@ class TestomatioPipe {
     const runParams = Object.fromEntries(
       Object.entries({
         ci_build_url: buildUrl,
-        parallel: this.parallel,
         api_key: this.apiKey.trim(),
         group_title: this.groupTitle,
         access_event: accessEvent,
@@ -188,7 +185,8 @@ class TestomatioPipe {
       const resp = await this.client.request({
         method: 'PUT',
         url: `/api/reporter/${this.runId}`,
-        data: runParams
+        data: runParams,
+        responseType: 'json'
       });
       if (resp.data.artifacts) setS3Credentials(resp.data.artifacts);
       return;
@@ -419,14 +417,13 @@ class TestomatioPipe {
       console.warn(`${APP_PREFIX} ${errorMessage}`);
     }
 
-    const { status, parallel } = params;
+    const { status } = params;
 
     let status_event;
 
     if (status === STATUS.FINISHED) status_event = 'finish';
     if (status === STATUS.PASSED) status_event = 'pass';
     if (status === STATUS.FAILED) status_event = 'fail';
-    if (parallel) status_event += '_parallel';
 
     try {
       if (this.runId && !this.proceed) {

package/src/replay.js

@@ -246,7 +246,7 @@ export class Replay {
       }
     }
 
-    await client.updateRunStatus(finishParams.status || STATUS.FINISHED, finishParams.parallel || false);
+    await client.updateRunStatus(finishParams.status || STATUS.FINISHED);
 
     const result = {
       success: true,

package/src/reporter-functions.js

@@ -3,6 +3,8 @@ import { services } from './services/index.js';
 /**
  * Stores path to file as artifact and uploads it to the S3 storage
  * @param {string | {path: string, type: string, name: string}} data - path to file or object with path, type and name
+ * @param {any} [context=null] - optional context parameter
+ * @returns {void}
  */
 function saveArtifact(data, context = null) {
   if (process.env.IS_PLAYWRIGHT)
@@ -14,7 +16,8 @@ function saveArtifact(data, context = null) {
 
 /**
  * Attach log message(s) to the test report
- * @param  string
+ * @param {...any} args - log messages to attach
+ * @returns {void}
  */
 function logMessage(...args) {
   if (process.env.IS_PLAYWRIGHT) throw new Error('This function is not available in Playwright framework');
@@ -23,7 +26,8 @@ function logMessage(...args) {
 
 /**
  * Similar to "log" function but marks message in report as a step
- * @param {string} message
+ * @param {string} message - step message
+ * @returns {void}
  */
 function addStep(message) {
   if (process.env.IS_PLAYWRIGHT)
@@ -34,8 +38,9 @@ function addStep(message) {
 
 /**
  * Add key-value pair(s) to the test report
- * @param {{[key: string]: string} | string} keyValue object { key: value } (multiple props allowed) or key (string)
- * @param {string?} value
+ * @param {{[key: string]: string} | string} keyValue - object { key: value } (multiple props allowed) or key (string)
+ * @param {string|null} [value=null] - optional value when keyValue is a string
+ * @returns {void}
  */
 function setKeyValue(keyValue, value = null) {
   if (process.env.IS_PLAYWRIGHT)
@@ -48,48 +53,32 @@ function setKeyValue(keyValue, value = null) {
 }
 
 /**
- * Add a single label to the test report
+ * Add label(s) to the test report
  * @param {string} key - label key (e.g. 'severity', 'feature', or just 'smoke' for labels without values)
- * @param {string} [value] - optional label value (e.g. 'high', 'login')
+ * @param {string|string[]|null} [value=null] - optional label value(s) (e.g. 'high', 'login') or array of values
+ * @returns {void}
  */
 function setLabel(key, value = null) {
   if (Array.isArray(value)) {
-    value.forEach(v => setLabel(key, v));
+    value.forEach(val => setLabel(key, val));
     return;
   }
 
-  if (!key || typeof key !== 'string') {
-    console.warn('Label key must be a non-empty string');
-    return;
-  }
-
-  // Limit key length to 255 characters
-  if (key.length > 255) {
-    console.warn('Label key is too long, trimmed to 255 characters:', key);
-    key = key.substring(0, 255);
-  }
-
-  let labelString = key;
-  if (value !== null && value !== undefined && value !== '') {
-    if (typeof value !== 'string') {
-      console.warn('Label value must be a string, converting:', value);
-      value = String(value);
-    }
-    // Limit value length to 255 characters
-    if (value.length > 255) {
-      console.warn('Label value is too long, trimmed to 255 characters:', value);
-      value = value.substring(0, 255);
-    }
-    labelString = `${key}:${value}`;
-  }
+  const labelObject = value !== null && value !== undefined && value !== '' 
+    ? { label: `${key}:${value}` } 
+    : { label: key };
+  services.links.put([labelObject]);
+}
 
-  // Limit total label length to 255 characters
-  if (labelString.length > 255) {
-    console.warn('Label is too long, trimmed to 255 characters:', labelString);
-    labelString = labelString.substring(0, 255);
-  }
 
-  services.labels.put([labelString]);
+/**
+ * Add link(s) to the test report
+ * @param {...string} testIds - test IDs to link
+ * @returns {void}
+ */
+function linkTest(...testIds) {
+  const links = testIds.map(testId => ({ test: testId }));
+  services.links.put(links);
 }
 
 export default {
@@ -98,4 +87,5 @@ export default {
   step: addStep,
   keyValue: setKeyValue,
   label: setLabel,
+  linkTest,
 };

package/src/reporter.js

@@ -9,14 +9,15 @@ export const logger = services.logger;
 export const meta = reporterFunctions.keyValue;
 export const step = reporterFunctions.step;
 export const label = reporterFunctions.label;
+export const linkTest = reporterFunctions.linkTest;
 
 /**
- * @typedef {import('./reporter-functions.js')} artifact
- * @typedef {import('./reporter-functions.js')} log
- * @typedef {import('./services/index.js')} logger
- * @typedef {import('./reporter-functions.js')} meta
- * @typedef {import('./reporter-functions.js')} step
- * @typedef {import('./reporter-functions.js')} label
+ * @typedef {typeof import('./reporter-functions.js').default.artifact} ArtifactFunction
+ * @typedef {typeof import('./reporter-functions.js').default.log} LogFunction
+ * @typedef {typeof import('./services/index.js').services.logger} LoggerService
+ * @typedef {typeof import('./reporter-functions.js').default.keyValue} MetaFunction
+ * @typedef {typeof import('./reporter-functions.js').default.step} StepFunction
+ * @typedef {typeof import('./reporter-functions.js').default.label} LabelFunction
  */
 export default {
   /**
@@ -30,6 +31,7 @@ export default {
   meta: reporterFunctions.keyValue,
   step: reporterFunctions.step,
   label: reporterFunctions.label,
+  linkTest: reporterFunctions.linkTest,
 
   // TestomatClient,
   // TRConstants,

package/src/services/index.js

@@ -1,14 +1,14 @@
 import { logger } from './logger.js';
 import { artifactStorage } from './artifacts.js';
 import { keyValueStorage } from './key-values.js';
-import { labelStorage } from './labels.js';
+import { linkStorage } from './links.js';
 import { dataStorage } from '../data-storage.js';
 
 export const services = {
   logger,
   artifacts: artifactStorage,
   keyValues: keyValueStorage,
-  labels: labelStorage,
+  links: linkStorage,
   setContext: context => {
     dataStorage.setContext(context);
   },

package/src/services/labels.js

@@ -23,7 +23,7 @@ class LabelStorage {
    */
   put(labels, context = null) {
     if (!labels || !Array.isArray(labels)) return;
-    dataStorage.putData('labels', labels, context);
+    dataStorage.putData('links', labels, context);
   }
 
   /**
@@ -32,7 +32,7 @@ class LabelStorage {
    * @returns {string[]} labels array, e.g. ['smoke', 'severity:high', 'feature:user_account']
    */
   get(context = null) {
-    const labelsList = dataStorage.getData('labels', context);
+    const labelsList = dataStorage.getData('links', context);
     if (!labelsList || !labelsList?.length) return [];
 
     const allLabels = [];

package/src/services/links.js

@@ -0,0 +1,69 @@
+import createDebugMessages from 'debug';
+import { dataStorage } from '../data-storage.js';
+
+const debug = createDebugMessages('@testomatio/reporter:services-links');
+
+class LinkStorage {
+  static #instance;
+
+  /**
+   *
+   * @returns {LinkStorage}
+   */
+  static getInstance() {
+    if (!this.#instance) {
+      this.#instance = new LinkStorage();
+    }
+    return this.#instance;
+  }
+
+  /**
+   * Stores links array and passes it to reporter
+   * @param {object[]} links - array of link objects
+   * @param {*} context - full test title
+   */
+  put(links, context = null) {
+    if (!links || !Array.isArray(links)) return;
+    dataStorage.putData('links', links, context);
+  }
+
+  /**
+   * Returns links array for the test
+   * @param {*} context testId or test context from test runner
+   * @returns {object[]} links array, e.g. [{test: 'TEST-123'}, {jira: 'JIRA-456'}]
+   */
+  get(context = null) {
+    const linksList = dataStorage.getData('links', context);
+    if (!linksList || !linksList?.length) return [];
+
+    const allLinks = [];
+    for (const links of linksList) {
+      if (Array.isArray(links)) {
+        allLinks.push(...links);
+      } else if (typeof links === 'string') {
+        try {
+          const parsedLinks = JSON.parse(links);
+          if (Array.isArray(parsedLinks)) {
+            allLinks.push(...parsedLinks);
+          }
+        } catch (e) {
+          debug(`Error parsing links for test ${context}`, links);
+        }
+      }
+    }
+
+    // Remove duplicates based on JSON string comparison
+    const uniqueLinks = [];
+    const seen = new Set();
+    for (const link of allLinks) {
+      const key = JSON.stringify(link);
+      if (!seen.has(key)) {
+        seen.add(key);
+        uniqueLinks.push(link);
+      }
+    }
+    return uniqueLinks;
+  }
+}
+
+export const linkStorage = LinkStorage.getInstance();

package/src/utils/utils.js

@@ -53,7 +53,7 @@ const parseSuite = suiteTitle => {
  */
 const validateSuiteId = suiteId => {
   if (!suiteId) return null;
-  
+
   const match = suiteId.match(SUITE_ID_REGEX);
   return match ? match[0] : null;
 };
@@ -273,7 +273,7 @@ const fileSystem = {
 const foundedTestLog = (app, tests) => {
   const n = tests.length;
 
-  return n === 1 ? console.log(app, `✅ We found one test!`) : console.log(app, `✅ We found ${n} tests!`);
+  return console.log(app, `✅ We found ${n === 1 ? 'one test' : `${n} tests`} in Testomat.io!`);
 };
 
 const humanize = text => {
@@ -354,12 +354,14 @@ function storeRunId(runId) {
 }
 
 /**
- * 
+ *
  * @returns {String|null} latest run ID
  */
 function readLatestRunId() {
   try {
     const filePath = path.join(os.tmpdir(), `testomatio.latest.run`);
+    if (!fs.existsSync(filePath)) return null;
+    
     const stats = fs.statSync(filePath);
     const diff = +new Date() - +stats.mtime;
     const diffHours = diff / 1000 / 60 / 60;

package/lib/utils/cli_utils.d.ts

@@ -1 +0,0 @@
-export function checkForEnvPassedAsArguments(): void;