@testomatio/reporter 2.0.0-beta.2-xml → 2.0.0-beta.3-xml

package/lib/adapter/nightwatch.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const client_js_1 = __importDefault(require("../client.js"));
 const config_js_1 = require("../config.js");
-const constants_1 = require("../constants");
+const constants_js_1 = require("../constants.js");
 const utils_js_1 = require("../utils/utils.js");
 const apiKey = config_js_1.config.TESTOMATIO;
 const client = new client_js_1.default({ apiKey });
@@ -29,14 +29,14 @@ module.exports = {
                 let status;
                 switch (test.status) {
                     case 'pass':
-                        status = constants_1.STATUS.PASSED;
+                        status = constants_js_1.STATUS.PASSED;
                         break;
                     case 'fail':
-                        status = constants_1.STATUS.FAILED;
+                        status = constants_js_1.STATUS.FAILED;
                         break;
                     // probably not required (because skipped tests are in separate array), but just in case
                     case 'skip':
-                        status = constants_1.STATUS.SKIPPED;
+                        status = constants_js_1.STATUS.SKIPPED;
                         console.info('Skipped test is in completed tests array:', test, 'Not expected behavior.');
                         break;
                     default:
@@ -58,7 +58,7 @@ module.exports = {
             }
             // just array with skipped tests titles, no any other info
             for (const testTitle of skippedTests) {
-                client.addTestRun(constants_1.STATUS.SKIPPED, {
+                client.addTestRun(constants_js_1.STATUS.SKIPPED, {
                     suite_title: suiteTitle,
                     tags,
                     rid: `${testModule.uuid || ''}_${testTitle || ''}`,

package/lib/adapter/webdriver.d.ts

@@ -19,6 +19,6 @@ declare class WebdriverReporter extends WDIOReporter {
      */
     addBddScenario(scenario: import("../../types/types.js").WebdriverIOScenario): Promise<import("../../types/types.js").PipeResult[]>;
 }
-import WDIOReporter from '@wdio/reporter';
+import { default as WDIOReporter } from '@wdio/reporter';
 import TestomatClient from '../client.js';
 import { RunnerStats } from '@wdio/reporter';

package/lib/bin/cli.js

@@ -11,17 +11,18 @@ const debug_1 = __importDefault(require("debug"));
 const client_js_1 = __importDefault(require("../client.js"));
 const xmlReader_js_1 = __importDefault(require("../xmlReader.js"));
 const constants_js_1 = require("../constants.js");
-const package_json_1 = require("../../package.json");
-const config_js_1 = require("../config.js");
 const utils_js_1 = require("../utils/utils.js");
+const config_js_1 = require("../config.js");
+const utils_js_2 = require("../utils/utils.js");
 const picocolors_1 = __importDefault(require("picocolors"));
 const filesize_1 = require("filesize");
 const dotenv_1 = __importDefault(require("dotenv"));
 const debug = (0, debug_1.default)('@testomatio/reporter:xml-cli');
-console.log(picocolors_1.default.cyan(picocolors_1.default.bold(` 🤩 Testomat.io Reporter v${package_json_1.version}`)));
+const version = (0, utils_js_1.getPackageVersion)();
+console.log(picocolors_1.default.cyan(picocolors_1.default.bold(` 🤩 Testomat.io Reporter v${version}`)));
 const program = new commander_1.Command();
 program
-    .version(package_json_1.version)
+    .version(version)
     .option('--env-file <envfile>', 'Load environment variables from env file')
     .hook('preAction', thisCommand => {
     const opts = thisCommand.opts();
@@ -48,7 +49,7 @@ program
     .command('finish')
     .description('Finish Run by its ID')
     .action(async () => {
-    process.env.TESTOMATIO_RUN ||= (0, utils_js_1.readLatestRunId)();
+    process.env.TESTOMATIO_RUN ||= (0, utils_js_2.readLatestRunId)();
     if (!process.env.TESTOMATIO_RUN) {
         console.log('TESTOMATIO_RUN environment variable must be set or restored from a previous run.');
         return process.exit(1);
@@ -180,7 +181,7 @@ program
     .action(async (opts) => {
     const apiKey = config_js_1.config.TESTOMATIO;
     process.env.TESTOMATIO_DISABLE_ARTIFACTS = '';
-    const runId = process.env.TESTOMATIO_RUN || process.env.runId || (0, utils_js_1.readLatestRunId)();
+    const runId = process.env.TESTOMATIO_RUN || process.env.runId || (0, utils_js_2.readLatestRunId)();
     if (!runId) {
         console.log('TESTOMATIO_RUN environment variable must be set or restored from a previous run.');
         return process.exit(1);

package/lib/bin/reportXml.js

@@ -10,10 +10,12 @@ const glob_1 = require("glob");
 const debug_1 = __importDefault(require("debug"));
 const constants_js_1 = require("../constants.js");
 const xmlReader_js_1 = __importDefault(require("../xmlReader.js"));
-const package_json_1 = require("../../package.json");
+const utils_js_1 = require("../utils/utils.js");
 const dotenv_1 = __importDefault(require("dotenv"));
+const path_1 = __importDefault(require("path"));
+const version = (0, utils_js_1.getPackageVersion)();
 const debug = (0, debug_1.default)('@testomatio/reporter:xml-cli');
-console.log(picocolors_1.default.cyan(picocolors_1.default.bold(` 🤩 Testomat.io XML Reporter v${package_json_1.version}`)));
+console.log(picocolors_1.default.cyan(picocolors_1.default.bold(` 🤩 Testomat.io XML Reporter v${version}`)));
 const program = new commander_1.Command();
 program
     .arguments('<pattern>')

package/lib/bin/startTest.js

@@ -9,10 +9,11 @@ const commander_1 = require("commander");
 const picocolors_1 = __importDefault(require("picocolors"));
 const client_js_1 = __importDefault(require("../client.js"));
 const constants_js_1 = require("../constants.js");
-const package_json_1 = require("../../package.json");
+const utils_js_1 = require("../utils/utils.js");
 const config_js_1 = require("../config.js");
 const dotenv_1 = __importDefault(require("dotenv"));
-console.log(picocolors_1.default.cyan(picocolors_1.default.bold(` 🤩 Testomat.io Reporter v${package_json_1.version}`)));
+const version = (0, utils_js_1.getPackageVersion)();
+console.log(picocolors_1.default.cyan(picocolors_1.default.bold(` 🤩 Testomat.io Reporter v${version}`)));
 const program = new commander_1.Command();
 program
     .option('-c, --command <cmd>', 'Test runner command')

package/lib/bin/uploadArtifacts.js

@@ -9,12 +9,13 @@ const picocolors_1 = __importDefault(require("picocolors"));
 const debug_1 = __importDefault(require("debug"));
 const client_js_1 = __importDefault(require("../client.js"));
 const constants_js_1 = require("../constants.js");
-const package_json_1 = require("../../package.json");
-const config_js_1 = require("../config.js");
 const utils_js_1 = require("../utils/utils.js");
+const config_js_1 = require("../config.js");
+const utils_js_2 = require("../utils/utils.js");
 const dotenv_1 = __importDefault(require("dotenv"));
 const debug = (0, debug_1.default)('@testomatio/reporter:upload-cli');
-console.log(picocolors_1.default.cyan(picocolors_1.default.bold(` 🤩 Testomat.io Reporter v${package_json_1.version}`)));
+const version = (0, utils_js_1.getPackageVersion)();
+console.log(picocolors_1.default.cyan(picocolors_1.default.bold(` 🤩 Testomat.io Reporter v${version}`)));
 const program = new commander_1.Command();
 program
     .option('--env-file <envfile>', 'Load environment variables from env file')
@@ -28,7 +29,7 @@ program
     }
     const apiKey = config_js_1.config.TESTOMATIO;
     process.env.TESTOMATIO_DISABLE_ARTIFACTS = '';
-    const runId = process.env.TESTOMATIO_RUN || process.env.runId || (0, utils_js_1.readLatestRunId)();
+    const runId = process.env.TESTOMATIO_RUN || process.env.runId || (0, utils_js_2.readLatestRunId)();
     if (!runId) {
         console.log('TESTOMATIO_RUN environment variable must be set or restored from a previous run.');
         return process.exit(1);

package/lib/data-storage.d.ts

@@ -1,6 +1,6 @@
 export const dataStorage: DataStorage;
 declare class DataStorage {
-    static "__#12@#instance": any;
+    static "__#11@#instance": any;
     /**
      *
      * @returns {DataStorage}

package/lib/junit-adapter/csharp.d.ts

@@ -1,4 +1,5 @@
 export default CSharpAdapter;
 declare class CSharpAdapter extends Adapter {
+    getFilePath(t: any): string;
 }
 import Adapter from './adapter.js';

package/lib/junit-adapter/csharp.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
 const adapter_js_1 = __importDefault(require("./adapter.js"));
 class CSharpAdapter extends adapter_js_1.default {
     formatTest(t) {
@@ -12,9 +13,18 @@ class CSharpAdapter extends adapter_js_1.default {
             t.example = { ...example[1].split(',') };
         const suite = t.suite_title.split('.');
         t.suite_title = suite.pop();
-        t.file = suite.join('/');
+        t.file = namespaceToFileName(t.file);
         t.title = title.trim();
         return t;
     }
+    getFilePath(t) {
+        const fileName = namespaceToFileName(t.file);
+        return fileName;
+    }
 }
 module.exports = CSharpAdapter;
+function namespaceToFileName(fileName) {
+    const fileParts = fileName.split('.');
+    fileParts[fileParts.length - 1] = fileParts[fileParts.length - 1]?.replace(/\$.*/, '');
+    return `${fileParts.join(path_1.default.sep)}.cs`;
+}

package/lib/pipe/bitbucket.d.ts

@@ -11,7 +11,6 @@ export class BitbucketPipe {
     tests: any[];
     token: any;
     hiddenCommentData: string;
-    client: Gaxios;
     cleanLog(log: any): Promise<string>;
     prepareRun(): Promise<void>;
     createRun(): Promise<void>;
@@ -22,4 +21,3 @@ export class BitbucketPipe {
 }
 export type Pipe = import("../../types/types.js").Pipe;
 export type TestData = import("../../types/types.js").TestData;
-import { Gaxios } from 'gaxios';

package/lib/pipe/bitbucket.js

@@ -40,7 +40,7 @@ exports.BitbucketPipe = void 0;
 const constants_js_1 = require("../constants.js");
 const utils_js_1 = require("../utils/utils.js");
 const pipe_utils_js_1 = require("../utils/pipe_utils.js");
-const gaxios_1 = require("gaxios");
+const axios_1 = __importDefault(require("axios"));
 const picocolors_1 = __importDefault(require("picocolors"));
 const humanize_duration_1 = __importDefault(require("humanize-duration"));
 const lodash_merge_1 = __importDefault(require("lodash.merge"));
@@ -69,13 +69,6 @@ class BitbucketPipe {
             return;
         }
         this.isEnabled = true;
-        this.client = new gaxios_1.Gaxios({
-            baseURL: 'https://api.bitbucket.org/2.0',
-            headers: {
-                'Content-Type': 'application/json',
-                'Authorization': `Bearer ${this.token}`
-            }
-        });
         debug('Bitbucket Pipe: Enabled');
     }
     async cleanLog(log) {
@@ -175,17 +168,18 @@ class BitbucketPipe {
         }
         // Construct Bitbucket API URL for comments
         // eslint-disable-next-line max-len
-        const commentsRequestURL = `/repositories/${this.ENV.BITBUCKET_WORKSPACE}/${this.ENV.BITBUCKET_REPO_SLUG}/pullrequests/${this.ENV.BITBUCKET_PR_ID}/comments`;
+        const commentsRequestURL = `https://api.bitbucket.org/2.0/repositories/${this.ENV.BITBUCKET_WORKSPACE}/${this.ENV.BITBUCKET_REPO_SLUG}/pullrequests/${this.ENV.BITBUCKET_PR_ID}/comments`;
         // Delete previous report
-        await deletePreviousReport(this.client, commentsRequestURL, this.hiddenCommentData);
+        await deletePreviousReport(axios_1.default, commentsRequestURL, this.hiddenCommentData, this.token);
         // Add current report
         debug(`Adding comment via URL: ${commentsRequestURL}`);
         debug(`Final Bitbucket API call body: ${body}`);
         try {
-            const addCommentResponse = await this.client.request({
-                method: 'POST',
-                url: commentsRequestURL,
-                data: { content: { raw: body } }
+            const addCommentResponse = await axios_1.default.post(commentsRequestURL, { content: { raw: body } }, {
+                headers: {
+                    Authorization: `Bearer ${this.token}`,
+                    'Content-Type': 'application/json',
+                },
             });
             const commentID = addCommentResponse.data.id;
             // eslint-disable-next-line max-len
@@ -204,15 +198,17 @@ class BitbucketPipe {
     updateRun() { }
 }
 exports.BitbucketPipe = BitbucketPipe;
-async function deletePreviousReport(client, commentsRequestURL, hiddenCommentData) {
+async function deletePreviousReport(axiosInstance, commentsRequestURL, hiddenCommentData, token) {
     if (process.env.BITBUCKET_KEEP_OUTDATED_REPORTS)
         return;
     // Get comments
     let comments = [];
     try {
-        const response = await client.request({
-            method: 'GET',
-            url: commentsRequestURL
+        const response = await axiosInstance.get(commentsRequestURL, {
+            headers: {
+                Authorization: `Bearer ${token}`,
+                'Content-Type': 'application/json',
+            },
         });
         comments = response.data.values;
     }
@@ -227,9 +223,11 @@ async function deletePreviousReport(client, commentsRequestURL, hiddenCommentDat
             try {
                 // Delete previous comment
                 const deleteCommentURL = `${commentsRequestURL}/${comment.id}`;
-                await client.request({
-                    method: 'DELETE',
-                    url: deleteCommentURL
+                await axiosInstance.delete(deleteCommentURL, {
+                    headers: {
+                        Authorization: `Bearer ${token}`,
+                        'Content-Type': 'application/json',
+                    },
                 });
             }
             catch (e) {

package/lib/pipe/gitlab.d.ts

@@ -14,7 +14,6 @@ declare class GitLabPipe {
     tests: any[];
     token: any;
     hiddenCommentData: string;
-    client: Gaxios;
     prepareRun(): Promise<void>;
     createRun(): Promise<void>;
     addTest(test: any): void;
@@ -22,4 +21,3 @@ declare class GitLabPipe {
     toString(): string;
     updateRun(): void;
 }
-import { Gaxios } from 'gaxios';

package/lib/pipe/gitlab.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const debug_1 = __importDefault(require("debug"));
-const gaxios_1 = require("gaxios");
+const axios_1 = __importDefault(require("axios"));
 const picocolors_1 = __importDefault(require("picocolors"));
 const humanize_duration_1 = __importDefault(require("humanize-duration"));
 const lodash_merge_1 = __importDefault(require("lodash.merge"));
@@ -39,12 +39,6 @@ class GitLabPipe {
             return;
         }
         this.isEnabled = true;
-        this.client = new gaxios_1.Gaxios({
-            baseURL: 'https://gitlab.com/api/v4',
-            headers: {
-                'Content-Type': 'application/json',
-            }
-        });
         debug('GitLab Pipe: Enabled');
     }
     // TODO: to using SET opts as argument => prepareRun(opts)
@@ -132,18 +126,13 @@ class GitLabPipe {
             body += '\n</details>';
         }
         // eslint-disable-next-line max-len
-        const commentsRequestURL = `/projects/${this.ENV.CI_PROJECT_ID}/merge_requests/${this.ENV.CI_MERGE_REQUEST_IID}/notes`;
+        const commentsRequestURL = `https://gitlab.com/api/v4/projects/${this.ENV.CI_PROJECT_ID}/merge_requests/${this.ENV.CI_MERGE_REQUEST_IID}/notes`;
         // delete previous report
-        await deletePreviousReport(this.client, commentsRequestURL, this.hiddenCommentData, this.token);
+        await deletePreviousReport(axios_1.default, commentsRequestURL, this.hiddenCommentData, this.token);
         // add current report
         debug(`Adding comment via url: ${commentsRequestURL}`);
         try {
-            const addCommentResponse = await this.client.request({
-                method: 'POST',
-                url: commentsRequestURL,
-                params: { access_token: this.token },
-                data: { body }
-            });
+            const addCommentResponse = await axios_1.default.post(`${commentsRequestURL}?access_token=${this.token}`, { body });
             const commentID = addCommentResponse.data.id;
             // eslint-disable-next-line max-len
             const commentURL = `${this.ENV.CI_PROJECT_URL}/-/merge_requests/${this.ENV.CI_MERGE_REQUEST_IID}#note_${commentID}`;
@@ -160,17 +149,13 @@ class GitLabPipe {
     }
     updateRun() { }
 }
-async function deletePreviousReport(client, commentsRequestURL, hiddenCommentData, token) {
+async function deletePreviousReport(axiosInstance, commentsRequestURL, hiddenCommentData, token) {
     if (process.env.GITLAB_KEEP_OUTDATED_REPORTS)
         return;
     // get comments
     let comments = [];
     try {
-        const response = await client.request({
-            method: 'GET',
-            url: commentsRequestURL,
-            params: { access_token: token }
-        });
+        const response = await axiosInstance.get(`${commentsRequestURL}?access_token=${token}`);
         comments = response.data;
     }
     catch (e) {
@@ -183,12 +168,8 @@ async function deletePreviousReport(client, commentsRequestURL, hiddenCommentDat
         if (comment.body.includes(hiddenCommentData)) {
             try {
                 // delete previous comment
-                const deleteCommentURL = `${commentsRequestURL}/${comment.id}`;
-                await client.request({
-                    method: 'DELETE',
-                    url: deleteCommentURL,
-                    params: { access_token: token }
-                });
+                const deleteCommentURL = `${commentsRequestURL}/${comment.id}?access_token=${token}`;
+                await axiosInstance.delete(deleteCommentURL);
             }
             catch (e) {
                 console.warn(`Can't delete previously added comment with testomat.io report. Ignore.`);

package/lib/pipe/testomatio.d.ts

@@ -31,7 +31,7 @@ declare class TestomatioPipe implements Pipe {
     groupTitle: any;
     env: string;
     label: string;
-    client: Gaxios;
+    axios: import("axios").AxiosInstance;
     proceed: string;
     jiraId: string;
     runId: any;
@@ -68,4 +68,3 @@ declare class TestomatioPipe implements Pipe {
     toString(): string;
     #private;
 }
-import { Gaxios } from 'gaxios';

package/lib/pipe/testomatio.js

@@ -5,7 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const debug_1 = __importDefault(require("debug"));
 const picocolors_1 = __importDefault(require("picocolors"));
-const gaxios_1 = require("gaxios");
+// Retry interceptor function
+const axios_retry_1 = __importDefault(require("axios-retry"));
+// Default axios instance
+const axios_1 = __importDefault(require("axios"));
 const json_cycle_1 = __importDefault(require("json-cycle"));
 const constants_js_1 = require("../constants.js");
 const utils_js_1 = require("../utils/utils.js");
@@ -51,31 +54,42 @@ 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_1.Gaxios({
+        // Create a new instance of axios with a custom config
+        this.axios = axios_1.default.create({
             baseURL: `${this.url.trim()}`,
             timeout: constants_js_1.AXIOS_TIMEOUT,
-            proxy: proxy ? proxy.toString() : undefined,
-            retry: true,
-            agent: new (require('https').Agent)({ rejectUnauthorized: false, keepAlive: false }),
-            retryConfig: {
-                retry: constants_js_1.REPORTER_REQUEST_RETRIES.retriesPerRequest,
-                retryDelay: constants_js_1.REPORTER_REQUEST_RETRIES.retryTimeout,
-                shouldRetry: (error) => {
-                    if (!error.response)
+            proxy: proxy
+                ? {
+                    host: proxy.hostname,
+                    port: parseInt(proxy.port, 10),
+                    protocol: proxy.protocol,
+                }
+                : false,
+        });
+        // Pass the axios instance to the retry function
+        (0, axios_retry_1.default)(this.axios, {
+            // do not use retries for unit tests
+            retries: constants_js_1.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;
-                    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
+                    default:
+                        break;
                 }
-            }
+                return error.response?.status >= 401; // Retry on 401+ and 5xx
+            },
+            retryDelay: () => constants_js_1.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;
         // do not finish this run (for parallel testing)
@@ -110,14 +124,11 @@ class TestomatioPipe {
             if (!q) {
                 return;
             }
-            const resp = await this.client.request({
-                method: 'GET',
-                url: '/api/test_grep',
-                params: q
-            });
-            if (Array.isArray(resp.data?.tests) && resp.data?.tests?.length > 0) {
-                (0, utils_js_1.foundedTestLog)(constants_js_1.APP_PREFIX, resp.data.tests);
-                return resp.data.tests;
+            const resp = await this.axios.get('/api/test_grep', q);
+            const { data } = resp;
+            if (Array.isArray(data?.tests) && data?.tests?.length > 0) {
+                (0, utils_js_1.foundedTestLog)(constants_js_1.APP_PREFIX, data.tests);
+                return data.tests;
             }
             console.log(constants_js_1.APP_PREFIX, `⛔  No tests found for your --filter --> ${type}=${id}`);
         }
@@ -139,6 +150,7 @@ class TestomatioPipe {
         let buildUrl = process.env.BUILD_URL || process.env.CI_JOB_URL || process.env.CIRCLE_BUILD_URL;
         // 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}`;
         }
         // Azure DevOps Url
@@ -168,23 +180,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)
                 (0, pipe_utils_js_1.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;
             this.runUrl = `${this.url}/${resp.data.url.split('/').splice(3).join('/')}`;
@@ -200,7 +205,6 @@ class TestomatioPipe {
         }
         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');
@@ -241,15 +245,7 @@ class TestomatioPipe {
         }
         const json = json_cycle_1.default.stringify(data);
         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) {
@@ -294,19 +290,9 @@ class TestomatioPipe {
         // get tests from batch and clear batch
         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 => {
+        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) {
@@ -380,16 +366,12 @@ class TestomatioPipe {
             status_event += '_parallel';
         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(constants_js_1.APP_PREFIX, '📊 Report Saved. Report URL:', picocolors_1.default.magenta(this.runUrl));
@@ -439,10 +421,18 @@ 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',
+    },
+};
 module.exports = TestomatioPipe;

package/lib/reporter.d.ts

@@ -8,7 +8,7 @@ export type log = typeof import("./reporter-functions.js");
 export const log: (...args: any[]) => void;
 export type logger = typeof import("./services/index.js");
 export const logger: {
-    "__#13@#originalUserLogger": {
+    "__#12@#originalUserLogger": {
         assert(condition?: boolean, ...data: any[]): void;
         assert(value: any, message?: string, ...optionalParams: any[]): void;
         clear(): void;
@@ -53,13 +53,13 @@ export const logger: {
         profile(label?: string): void;
         profileEnd(label?: string): void;
     };
-    "__#13@#userLoggerWithOverridenMethods": any;
+    "__#12@#userLoggerWithOverridenMethods": any;
     logLevel: string;
     step(strings: any, ...values: any[]): void;
     getLogs(context: string): string[];
-    "__#13@#stringifyLogs"(...args: any[]): string;
+    "__#12@#stringifyLogs"(...args: any[]): string;
     _templateLiteralLog(strings: any, ...args: any[]): void;
-    "__#13@#logWrapper"(argsArray: any, level: any): void;
+    "__#12@#logWrapper"(argsArray: any, level: any): void;
     assert(...args: any[]): void;
     debug(...args: any[]): void;
     error(...args: any[]): void;
@@ -83,7 +83,7 @@ export type step = typeof import("./reporter-functions.js");
 export const step: (message: string) => void;
 declare namespace _default {
     let testomatioLogger: {
-        "__#13@#originalUserLogger": {
+        "__#12@#originalUserLogger": {
             assert(condition?: boolean, ...data: any[]): void;
             assert(value: any, message?: string, ...optionalParams: any[]): void;
             clear(): void;
@@ -128,13 +128,13 @@ declare namespace _default {
             profile(label?: string): void;
             profileEnd(label?: string): void;
         };
-        "__#13@#userLoggerWithOverridenMethods": any;
+        "__#12@#userLoggerWithOverridenMethods": any;
         logLevel: string;
         step(strings: any, ...values: any[]): void;
         getLogs(context: string): string[];
-        "__#13@#stringifyLogs"(...args: any[]): string;
+        "__#12@#stringifyLogs"(...args: any[]): string;
         _templateLiteralLog(strings: any, ...args: any[]): void;
-        "__#13@#logWrapper"(argsArray: any, level: any): void;
+        "__#12@#logWrapper"(argsArray: any, level: any): void;
         assert(...args: any[]): void;
         debug(...args: any[]): void;
         error(...args: any[]): void;
@@ -157,7 +157,7 @@ declare namespace _default {
     }, context?: any) => void;
     let log: (...args: any[]) => void;
     let logger: {
-        "__#13@#originalUserLogger": {
+        "__#12@#originalUserLogger": {
             assert(condition?: boolean, ...data: any[]): void;
             assert(value: any, message?: string, ...optionalParams: any[]): void;
             clear(): void;
@@ -202,13 +202,13 @@ declare namespace _default {
             profile(label?: string): void;
             profileEnd(label?: string): void;
         };
-        "__#13@#userLoggerWithOverridenMethods": any;
+        "__#12@#userLoggerWithOverridenMethods": any;
         logLevel: string;
         step(strings: any, ...values: any[]): void;
         getLogs(context: string): string[];
-        "__#13@#stringifyLogs"(...args: any[]): string;
+        "__#12@#stringifyLogs"(...args: any[]): string;
         _templateLiteralLog(strings: any, ...args: any[]): void;
-        "__#13@#logWrapper"(argsArray: any, level: any): void;
+        "__#12@#logWrapper"(argsArray: any, level: any): void;
         assert(...args: any[]): void;
         debug(...args: any[]): void;
         error(...args: any[]): void;

package/lib/services/artifacts.d.ts

@@ -3,7 +3,7 @@ export const artifactStorage: ArtifactStorage;
  * Artifact storage is supposed to store file paths
  */
 declare class ArtifactStorage {
-    static "__#14@#instance": any;
+    static "__#13@#instance": any;
     /**
      * Singleton
      * @returns {ArtifactStorage}

package/lib/services/key-values.d.ts

@@ -1,6 +1,6 @@
 export const keyValueStorage: KeyValueStorage;
 declare class KeyValueStorage {
-    static "__#15@#instance": any;
+    static "__#14@#instance": any;
     /**
      *
      * @returns {KeyValueStorage}

package/lib/services/logger.d.ts

@@ -5,7 +5,7 @@ export const logger: Logger;
  * Supports different syntaxes to satisfy any user preferences.
  */
 declare class Logger {
-    static "__#13@#instance": any;
+    static "__#12@#instance": any;
     /**
      *
      * @returns {Logger}

package/lib/utils/utils.d.ts

@@ -1,3 +1,5 @@
+export function getPackageVersion(): any;
+export const TEST_ID_REGEX: RegExp;
 export function ansiRegExp(): RegExp;
 export function isSameTest(test: any, t: any): boolean;
 export function fetchSourceCode(contents: any, opts?: {}): string;

package/lib/utils/utils.js

@@ -36,7 +36,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.testRunnerHelper = exports.specificTestInfo = exports.parseSuite = exports.isValidUrl = exports.humanize = exports.getTestomatIdFromTestTitle = exports.getCurrentDateTime = exports.foundedTestLog = exports.fileSystem = exports.fetchFilesFromStackTrace = exports.fetchIdFromOutput = exports.fetchIdFromCode = exports.fetchSourceCodeFromStackTrace = exports.fetchSourceCode = exports.isSameTest = exports.ansiRegExp = void 0;
+exports.testRunnerHelper = exports.specificTestInfo = exports.parseSuite = exports.isValidUrl = exports.humanize = exports.getTestomatIdFromTestTitle = exports.getCurrentDateTime = exports.foundedTestLog = exports.fileSystem = exports.fetchFilesFromStackTrace = exports.fetchIdFromOutput = exports.fetchIdFromCode = exports.fetchSourceCodeFromStackTrace = exports.fetchSourceCode = exports.isSameTest = exports.ansiRegExp = exports.TEST_ID_REGEX = void 0;
+exports.getPackageVersion = getPackageVersion;
 exports.formatStep = formatStep;
 exports.readLatestRunId = readLatestRunId;
 exports.removeColorCodes = removeColorCodes;
@@ -48,7 +49,9 @@ const fs_1 = __importDefault(require("fs"));
 const is_valid_path_1 = __importDefault(require("is-valid-path"));
 const debug_1 = __importDefault(require("debug"));
 const os_1 = __importDefault(require("os"));
+const url_2 = require("url");
 const debug = (0, debug_1.default)('@testomatio/reporter:util');
+// Use __dirname directly since we're compiling to CommonJS
 /**
  * @param {String} testTitle - Test title
  *
@@ -140,7 +143,7 @@ const fetchSourceCodeFromStackTrace = (stack = '') => {
         .join('\n');
 };
 exports.fetchSourceCodeFromStackTrace = fetchSourceCodeFromStackTrace;
-const TEST_ID_REGEX = /@T([\w\d]{8})/;
+exports.TEST_ID_REGEX = /@T([\w\d]{8})/;
 const fetchIdFromCode = (code, opts = {}) => {
     const comments = code
         .split('\n')
@@ -154,11 +157,11 @@ const fetchIdFromCode = (code, opts = {}) => {
                 return l.startsWith('// ');
         }
     });
-    return comments.find(c => c.match(TEST_ID_REGEX))?.match(TEST_ID_REGEX)?.[1];
+    return comments.find(c => c.match(exports.TEST_ID_REGEX))?.match(exports.TEST_ID_REGEX)?.[1];
 };
 exports.fetchIdFromCode = fetchIdFromCode;
 const fetchIdFromOutput = output => {
-    const TID_FULL_PATTERN = new RegExp(`tid:\\/\\/.*?(${TEST_ID_REGEX.source})`);
+    const TID_FULL_PATTERN = new RegExp(`tid:\\/\\/.*?(${exports.TEST_ID_REGEX.source})`);
     return output.match(TID_FULL_PATTERN)?.[2];
 };
 exports.fetchIdFromOutput = fetchIdFromOutput;
@@ -183,6 +186,12 @@ const fetchSourceCode = (contents, opts = {}) => {
             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));
         }
@@ -384,6 +393,13 @@ function formatStep(step, shift = 0) {
     }
     return lines;
 }
+function getPackageVersion() {
+    const packageJsonPath = path_1.default.resolve(__dirname, '../../package.json');
+    const packageJson = JSON.parse(fs_1.default.readFileSync(packageJsonPath, 'utf8'));
+    return packageJson.version;
+}
+
+module.exports.getPackageVersion = getPackageVersion;
 
 module.exports.formatStep = formatStep;
 

package/lib/xmlReader.js

@@ -20,7 +20,7 @@ const uploader_js_1 = require("./uploader.js");
 const debug = (0, debug_1.default)('@testomatio/reporter:xml');
 const ridRunId = (0, crypto_1.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,
     ignoreAttributes: false,
@@ -28,6 +28,7 @@ const options = {
     attributeNamePrefix: '',
     parseTagValue: true,
 };
+const MAX_OUTPUT_LENGTH = parseInt(TESTOMATIO_MAX_STACK_TRACE, 10) || 10000;
 const reduceOptions = {};
 class XmlReader {
     constructor(opts = {}) {
@@ -75,7 +76,7 @@ class XmlReader {
             /(<system-out><!\[CDATA\[)([\s\S]*?)(\]\]><\/system-out>)/g,
         ];
         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);
         let jsonSuite;
@@ -313,6 +314,8 @@ class XmlReader {
                         this.stats.language = 'js';
                     if (file.endsWith('.ts'))
                         this.stats.language = 'ts';
+                    if (file.endsWith('.cs'))
+                        this.stats.language = 'csharp';
                 }
                 if (!fs_1.default.existsSync(file)) {
                     debug('Failed to open file with the source code', file);
@@ -359,13 +362,13 @@ 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_1.default.join(process.cwd(), f));
-            files = [...files, ...(0, utils_js_1.fetchFilesFromStackTrace)(test.stack)];
+            if (!test.files?.length)
+                continue;
+            files = test.files.map(f => path_1.default.isAbsolute(f) ? f : path_1.default.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_1.default.basename(f)])));
             console.log(constants_js_1.APP_PREFIX, `🗄️ Uploaded ${picocolors_1.default.bold(`${files.length} artifacts`)} for test ${test.title}`);
         }
     }
@@ -425,7 +428,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 = '';
         if (testCaseItem.error)
@@ -458,15 +461,34 @@ function reduceTestCases(prev, item) {
             title = title.replace(/\(.*?\)/, '').trim();
         }
         stack = `${testCaseItem['system-out'] || testCaseItem.output || testCaseItem.log || ''}\n\n${stack}\n\n${suiteOutput}\n\n${suiteErr}`.trim();
-        const testId = (0, utils_js_1.fetchIdFromOutput)(stack);
+        let testId = (0, utils_js_1.fetchIdFromOutput)(stack);
+        if (tags?.length && !testId) {
+            testId = tags.filter(t => t.startsWith('T')).map(t => `@${t}`).find(t => t.match(utils_js_1.TEST_ID_REGEX))?.slice(2);
+        }
         let status = constants_js_1.STATUS.PASSED.toString();
         if ('failure' in testCaseItem || 'error' in testCaseItem)
             status = constants_js_1.STATUS.FAILED;
         if ('skipped' in testCaseItem)
             status = constants_js_1.STATUS.SKIPPED;
+        if (testCaseItem.result && Object.values(constants_js_1.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 = (0, utils_js_1.fetchFilesFromStackTrace)(stack);
+        files = [...new Set([...files, ...stackFiles])]; // Remove duplicates
         prev.push({
             rid,
             file,
@@ -481,7 +503,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;
@@ -505,11 +529,14 @@ function fetchProperties(item) {
     let title = '';
     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 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testomatio/reporter",
-  "version": "2.0.0-beta.2-xml",
+  "version": "2.0.0-beta.3-xml",
   "description": "Testomatio Reporter Client",
   "engines": {
     "node": ">=18"