@testomatio/reporter 2.0.0-beta.4-gaxios → 2.0.0

package/src/pipe/testomatio.js

@@ -1,6 +1,12 @@
 import createDebugMessages from 'debug';
 import pc from 'picocolors';
-import { Gaxios } from 'gaxios';
+
+// Retry interceptor function
+import axiosRetry from 'axios-retry';
+
+// Default axios instance
+import axios from 'axios';
+
 import JsonCycle from 'json-cycle';
 import { APP_PREFIX, STATUS, AXIOS_TIMEOUT, REPORTER_REQUEST_RETRIES } from '../constants.js';
 import { isValidUrl, foundedTestLog } from '../utils/utils.js';
@@ -51,31 +57,43 @@ class TestomatioPipe {
     this.groupTitle = params.groupTitle || process.env.TESTOMATIO_RUNGROUP_TITLE;
     this.env = process.env.TESTOMATIO_ENV;
     this.label = process.env.TESTOMATIO_LABEL;
-
-    // Create a new instance of gaxios with a custom config
-    this.client = new Gaxios({
+    // Create a new instance of axios with a custom config
+    this.axios = axios.create({
       baseURL: `${this.url.trim()}`,
       timeout: AXIOS_TIMEOUT,
-      proxy: proxy ? proxy.toString() : undefined,
-      retry: true,
-      retryConfig: {
-        retry: REPORTER_REQUEST_RETRIES.retriesPerRequest,
-        retryDelay: REPORTER_REQUEST_RETRIES.retryTimeout,
-        httpMethodsToRetry: ['GET','PUT','HEAD','OPTIONS','DELETE','POST'],
-        shouldRetry: (error) => {
-          if (!error.response) return false;
-          switch (error.response?.status) {
-            case 400: // Bad request (probably wrong API key)
-            case 404: // Test not matched
-            case 429: // Rate limit exceeded
-            case 500: // Internal server error
-              return false;
-            default:
-              break;
+      proxy: proxy
+        ? {
+            host: proxy.hostname,
+            port: parseInt(proxy.port, 10),
+            protocol: proxy.protocol,
           }
-          return error.response?.status >= 401; // Retry on 401+ and 5xx
+        : false,
+    });
+
+    // Pass the axios instance to the retry function
+    axiosRetry(this.axios, {
+      // do not use retries for unit tests
+      retries: REPORTER_REQUEST_RETRIES.retriesPerRequest, // Number of retries
+      shouldResetTimeout: true,
+      retryCondition: error => {
+        if (!error.response) return false;
+        switch (error.response?.status) {
+          case 400: // Bad request (probably wrong API key)
+          case 404: // Test not matched
+          case 429: // Rate limit exceeded
+          case 500: // Internal server error
+            return false;
+          default:
+            break;
         }
-      }
+        return error.response?.status >= 401; // Retry on 401+ and 5xx
+      },
+      retryDelay: () => REPORTER_REQUEST_RETRIES.retryTimeout, // sum = 15sec
+      onRetry: async (retryCount, error) => {
+        this.retriesTimestamps.push(Date.now());
+
+        debug(`${error.message || `Request failed ${error.status}`}. Retry #${retryCount} ...`);
+      },
     });
 
     this.isEnabled = true;
@@ -116,15 +134,12 @@ class TestomatioPipe {
         return;
       }
 
-      const resp = await this.client.request({
-        method: 'GET',
-        url: '/api/test_grep',
-        params: q
-      });
+      const resp = await this.axios.get('/api/test_grep', q);
+      const { data } = resp;
 
-      if (Array.isArray(resp.data?.tests) && resp.data?.tests?.length > 0) {
-        foundedTestLog(APP_PREFIX, resp.data.tests);
-        return resp.data.tests;
+      if (Array.isArray(data?.tests) && data?.tests?.length > 0) {
+        foundedTestLog(APP_PREFIX, data.tests);
+        return data.tests;
       }
 
       console.log(APP_PREFIX, `⛔  No tests found for your --filter --> ${type}=${id}`);
@@ -148,6 +163,7 @@ class TestomatioPipe {
 
     // GitHub Actions Url
     if (!buildUrl && process.env.GITHUB_RUN_ID) {
+      // eslint-disable-next-line max-len
       buildUrl = `${process.env.GITHUB_SERVER_URL}/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID}`;
     }
 
@@ -183,23 +199,16 @@ class TestomatioPipe {
     if (this.runId) {
       this.store.runId = this.runId;
       debug(`Run with id ${this.runId} already created, updating...`);
-      const resp = await this.client.request({
-        method: 'PUT',
-        url: `/api/reporter/${this.runId}`,
-        data: runParams
-      });
+      const resp = await this.axios.put(`/api/reporter/${this.runId}`, runParams);
       if (resp.data.artifacts) setS3Credentials(resp.data.artifacts);
       return;
     }
 
     debug('Creating run...');
     try {
-      const resp = await this.client.request({
-        method: 'POST',
-        url: '/api/reporter',
-        data: runParams,
+      const resp = await this.axios.post(`/api/reporter`, runParams, {
         maxContentLength: Infinity,
-        responseType: 'json'
+        maxBodyLength: Infinity,
       });
 
       this.runId = resp.data.uid;
@@ -216,7 +225,6 @@ class TestomatioPipe {
       debug('Run created', this.runId);
     } catch (err) {
       const errorText = err.response?.data?.message || err.message;
-      debug('Error creating run', err);
       console.log(errorText || err);
       if (!this.apiKey) console.error('Testomat.io API key is not set');
       if (!this.apiKey?.startsWith('tstmt')) console.error('Testomat.io API key is invalid');
@@ -263,15 +271,7 @@ class TestomatioPipe {
 
     debug('Adding test', json);
 
-    return this.client.request({
-      method: 'POST',
-      url: `/api/reporter/${this.runId}/testrun`,
-      data: json,
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      maxContentLength: Infinity
-    }).catch(err => {
+    return this.axios.post(`/api/reporter/${this.runId}/testrun`, json, axiosAddTestrunRequestConfig).catch(err => {
       this.requestFailures++;
       this.notReportedTestsCount++;
       if (err.response) {
@@ -323,43 +323,38 @@ class TestomatioPipe {
     const testsToSend = this.batch.tests.splice(0);
     debug('📨 Batch upload', testsToSend.length, 'tests');
 
-    return this.client.request({
-      method: 'POST',
-      url: `/api/reporter/${this.runId}/testrun`,
-      data: { 
-        api_key: this.apiKey, 
-        tests: testsToSend, 
-        batch_index: this.batch.batchIndex 
-      },
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      maxContentLength: Infinity
-    }).catch(err => {
-      this.requestFailures++;
-      this.notReportedTestsCount += testsToSend.length;
-      if (err.response) {
-        if (err.response.status >= 400) {
-          const responseData = err.response.data || { message: '' };
+    return this.axios
+      .post(
+        `/api/reporter/${this.runId}/testrun`,
+        { api_key: this.apiKey, tests: testsToSend, batch_index: this.batch.batchIndex },
+        axiosAddTestrunRequestConfig,
+      )
+      .catch(err => {
+        this.requestFailures++;
+        this.notReportedTestsCount += testsToSend.length;
+        if (err.response) {
+          if (err.response.status >= 400) {
+            const responseData = err.response.data || { message: '' };
+            console.log(
+              APP_PREFIX,
+              pc.yellow(`Warning: ${responseData.message} (${err.response.status})`),
+              // pc.grey(data?.title || ''),
+            );
+            if (err.response?.data?.message?.includes('could not be matched')) {
+              this.hasUnmatchedTests = true;
+            }
+            return;
+          }
           console.log(
             APP_PREFIX,
-            pc.yellow(`Warning: ${responseData.message} (${err.response.status})`),
+            pc.yellow(`Warning: (${err.response?.status})`),
+            `Report couldn't be processed: ${err?.response?.data?.message}`,
           );
-          if (err.response?.data?.message?.includes('could not be matched')) {
-            this.hasUnmatchedTests = true;
-          }
-          return;
+          printCreateIssue(err);
+        } else {
+          console.log(APP_PREFIX, "Report couldn't be processed", err);
         }
-        console.log(
-          APP_PREFIX,
-          pc.yellow(`Warning: (${err.response?.status})`),
-          `Report couldn't be processed: ${err?.response?.data?.message}`,
-        );
-        printCreateIssue(err);
-      } else {
-        console.log(APP_PREFIX, "Report couldn't be processed", err);
-      }
-    });
+      });
   };
 
   /**
@@ -418,16 +413,12 @@ class TestomatioPipe {
 
     try {
       if (this.runId && !this.proceed) {
-        await this.client.request({
-          method: 'PUT',
-          url: `/api/reporter/${this.runId}`,
-          data: {
-            api_key: this.apiKey,
-            duration: params.duration,
-            status_event,
-            detach: params.detach,
-            tests: params.tests,
-          }
+        await this.axios.put(`/api/reporter/${this.runId}`, {
+          api_key: this.apiKey,
+          duration: params.duration,
+          status_event,
+          detach: params.detach,
+          tests: params.tests,
         });
         if (this.runUrl) {
           console.log(APP_PREFIX, '📊 Report Saved. Report URL:', pc.magenta(this.runUrl));
@@ -487,11 +478,20 @@ function printCreateIssue(err) {
     if (!err.config) return;
 
     const time = new Date().toUTCString();
-    const { body, url, baseURL, method } = err?.config || {};
+    const { data, url, baseURL, method } = err?.config || {};
     console.log('```js');
-    console.log({ body: body?.replace(/"(tstmt_[^"]+)"/g, 'tstmt_*'), url, baseURL, method, time });
+    console.log({ data: data?.replace(/"(tstmt_[^"]+)"/g, 'tstmt_*'), url, baseURL, method, time });
     console.log('```');
   });
 }
 
+const axiosAddTestrunRequestConfig = {
+  maxContentLength: Infinity,
+  maxBodyLength: Infinity,
+  headers: {
+    // Overwrite Axios's automatically set Content-Type
+    'Content-Type': 'application/json',
+  },
+};
+
 export default TestomatioPipe;

package/src/utils/utils.js

@@ -5,9 +5,13 @@ import fs from 'fs';
 import isValid from 'is-valid-path';
 import createDebugMessages from 'debug';
 import os from 'os';
+import { fileURLToPath } from 'url';
 
 const debug = createDebugMessages('@testomatio/reporter:util');
 
+// Use __dirname directly since we're compiling to CommonJS
+const __dirname = path.resolve();
+
 /**
  * @param {String} testTitle - Test title
  *
@@ -107,7 +111,7 @@ const fetchSourceCodeFromStackTrace = (stack = '') => {
     .join('\n');
 };
 
-const TEST_ID_REGEX = /@T([\w\d]{8})/;
+export const TEST_ID_REGEX = /@T([\w\d]{8})/;
 
 const fetchIdFromCode = (code, opts = {}) => {
   const comments = code
@@ -150,6 +154,9 @@ const fetchSourceCode = (contents, opts = {}) => {
       if (lineIndex === -1) lineIndex = lines.findIndex(l => l.includes(`@DisplayName("${title}`));
       if (lineIndex === -1) lineIndex = lines.findIndex(l => l.includes(`public void ${title}`));
       if (lineIndex === -1) lineIndex = lines.findIndex(l => l.includes(`${title}(`));
+    } else if (opts.lang === 'csharp') {
+      if (lineIndex === -1) lineIndex = lines.findIndex(l => l.includes(`public void ${title}`));
+      if (lineIndex === -1) lineIndex = lines.findIndex(l => l.includes(`${title}(`));
     } else {
       lineIndex = lines.findIndex(l => l.includes(title));
     }
@@ -353,6 +360,12 @@ function formatStep(step, shift = 0) {
   return lines;
 }
 
+export function getPackageVersion() {
+  const packageJsonPath = path.resolve(__dirname, '../../package.json');
+  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+  return packageJson.version;
+}
+
 export {
   ansiRegExp,
   isSameTest,

package/src/xmlReader.js

@@ -13,6 +13,7 @@ import {
   fetchSourceCodeFromStackTrace,
   fetchIdFromCode,
   humanize,
+  TEST_ID_REGEX,
 } from './utils/utils.js';
 import { pipesFactory } from './pipe/index.js';
 import adapterFactory from './junit-adapter/index.js';
@@ -26,8 +27,9 @@ const debug = createDebugMessages('@testomatio/reporter:xml');
 const ridRunId = randomUUID();
 
 const TESTOMATIO_URL = process.env.TESTOMATIO_URL || 'https://app.testomat.io';
-const { TESTOMATIO_RUNGROUP_TITLE, TESTOMATIO_TITLE, TESTOMATIO_ENV, TESTOMATIO_RUN, TESTOMATIO_MARK_DETACHED } =
-  process.env;
+const { TESTOMATIO_RUNGROUP_TITLE, TESTOMATIO_SUITE,
+  TESTOMATIO_MAX_STACK_TRACE, TESTOMATIO_TITLE, TESTOMATIO_ENV,
+  TESTOMATIO_RUN, TESTOMATIO_MARK_DETACHED } = process.env;
 
 const options = {
   ignoreDeclaration: true,
@@ -37,6 +39,8 @@ const options = {
   parseTagValue: true,
 };
 
+const MAX_OUTPUT_LENGTH = parseInt(TESTOMATIO_MAX_STACK_TRACE, 10) || 10000;
+
 const reduceOptions = {};
 
 class XmlReader {
@@ -91,7 +95,7 @@ class XmlReader {
     ];
 
     for (const regex of cutRegexes) {
-      xmlData = xmlData.replace(regex, (_, p1, p2, p3) => `${p1}${p2.substring(0, 5000)}${p3}`);
+      xmlData = xmlData.replace(regex, (_, p1, p2, p3) => `${p1}${p2.substring(0, MAX_OUTPUT_LENGTH)}${p3}`);
     }
 
     const jsonResult = this.parser.parse(xmlData);
@@ -341,6 +345,7 @@ class XmlReader {
           if (file.endsWith('.rb')) this.stats.language = 'ruby';
           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 (!fs.existsSync(file)) {
@@ -394,13 +399,14 @@ class XmlReader {
   async uploadArtifacts() {
     for (const test of this.tests.filter(t => !!t.stack)) {
       let files = [];
-      if (test.files?.length) files = test.files.map(f => path.join(process.cwd(), f));
-      files = [...files, ...fetchFilesFromStackTrace(test.stack)];
+      if (!test.files?.length) continue;
+
+      files = test.files.map(f => path.isAbsolute(f) ? f : path.join(process.cwd(), f));
 
       if (!files.length) continue;
 
       const runId = this.runId || this.store.runId || Date.now().toString();
-      test.artifacts = await Promise.all(files.map(f => this.uploader.uploadFileByPath(f, [runId])));
+      test.artifacts = await Promise.all(files.map(f => this.uploader.uploadFileByPath(f, [runId, path.basename(f)])));
       console.log(APP_PREFIX, `🗄️ Uploaded ${pc.bold(`${files.length} artifacts`)} for test ${test.title}`);
     }
   }
@@ -471,7 +477,7 @@ function reduceTestCases(prev, item) {
   testCases
     .filter(t => !!t)
     .forEach(testCaseItem => {
-      const file = testCaseItem.file || item.filepath || '';
+      const file = testCaseItem.file || item.filepath || item.fullname || '';
 
       let stack = '';
       let message = '';
@@ -505,15 +511,38 @@ function reduceTestCases(prev, item) {
       stack = `${
         testCaseItem['system-out'] || testCaseItem.output || testCaseItem.log || ''
       }\n\n${stack}\n\n${suiteOutput}\n\n${suiteErr}`.trim();
-      const testId = fetchIdFromOutput(stack);
+      let testId = fetchIdFromOutput(stack);
+
+      if (tags?.length && !testId) {
+        testId = tags.filter(t => t.startsWith('T')).map(t => `@${t}`).find(t => t.match(TEST_ID_REGEX))?.slice(2);
+      }
 
       let status = STATUS.PASSED.toString();
       if ('failure' in testCaseItem || 'error' in testCaseItem) status = STATUS.FAILED;
       if ('skipped' in testCaseItem) status = STATUS.SKIPPED;
+      if (testCaseItem.result && Object.values(STATUS).includes(testCaseItem.result.toLowerCase())) {
+        status = testCaseItem.result.toLowerCase();
+      }
 
       let rid = null;
       if (testCaseItem.id) rid = `${ridRunId}-${testCaseItem.id}`;
 
+      // Extract attachments
+      let files = [];
+      if (testCaseItem.attachments) {
+        const attachments = Array.isArray(testCaseItem.attachments.attachment) 
+          ? testCaseItem.attachments.attachment 
+          : [testCaseItem.attachments.attachment];
+
+        files = attachments
+          .filter(a => a && a.filePath)
+          .map(a => a.filePath);
+      }
+
+      // Extract files from stack trace using existing utility
+      const stackFiles = fetchFilesFromStackTrace(stack);
+      files = [...new Set([...files, ...stackFiles])]; // Remove duplicates
+
       prev.push({
         rid,
         file,
@@ -528,7 +557,9 @@ function reduceTestCases(prev, item) {
         run_time: parseFloat(testCaseItem.time || testCaseItem.duration) * 1000,
         status,
         title,
+        root_suite_id: TESTOMATIO_SUITE,
         suite_title: suiteTitle,
+        files,
       });
     });
   return prev;
@@ -555,10 +586,15 @@ function fetchProperties(item) {
 
   if (!item.properties) return {};
 
-  const prop = [item.properties?.property].flat().find(p => p.name === 'Description');
+  // Handle both single property and array of properties
+  const properties = Array.isArray(item.properties.property) 
+    ? item.properties.property 
+    : [item.properties.property].filter(Boolean);
+
+  const prop = properties.find(p => p.name === 'Description');
   if (prop) title = prop.value;
-  [item.properties?.property]
-    .flat()
+
+  properties
     .filter(p => p.name === 'Category')
     .forEach(p => tags.push(p.value));
   return { title, tags };