@testomatio/reporter 2.0.0-beta.1-xml → 2.0.0-beta.2-gaxios

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: {
-    "__#12@#originalUserLogger": {
+    "__#13@#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;
     };
-    "__#12@#userLoggerWithOverridenMethods": any;
+    "__#13@#userLoggerWithOverridenMethods": any;
     logLevel: string;
     step(strings: any, ...values: any[]): void;
     getLogs(context: string): string[];
-    "__#12@#stringifyLogs"(...args: any[]): string;
+    "__#13@#stringifyLogs"(...args: any[]): string;
     _templateLiteralLog(strings: any, ...args: any[]): void;
-    "__#12@#logWrapper"(argsArray: any, level: any): void;
+    "__#13@#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: {
-        "__#12@#originalUserLogger": {
+        "__#13@#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;
         };
-        "__#12@#userLoggerWithOverridenMethods": any;
+        "__#13@#userLoggerWithOverridenMethods": any;
         logLevel: string;
         step(strings: any, ...values: any[]): void;
         getLogs(context: string): string[];
-        "__#12@#stringifyLogs"(...args: any[]): string;
+        "__#13@#stringifyLogs"(...args: any[]): string;
         _templateLiteralLog(strings: any, ...args: any[]): void;
-        "__#12@#logWrapper"(argsArray: any, level: any): void;
+        "__#13@#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: {
-        "__#12@#originalUserLogger": {
+        "__#13@#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;
         };
-        "__#12@#userLoggerWithOverridenMethods": any;
+        "__#13@#userLoggerWithOverridenMethods": any;
         logLevel: string;
         step(strings: any, ...values: any[]): void;
         getLogs(context: string): string[];
-        "__#12@#stringifyLogs"(...args: any[]): string;
+        "__#13@#stringifyLogs"(...args: any[]): string;
         _templateLiteralLog(strings: any, ...args: any[]): void;
-        "__#12@#logWrapper"(argsArray: any, level: any): void;
+        "__#13@#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 "__#13@#instance": any;
+    static "__#14@#instance": any;
     /**
      * Singleton
      * @returns {ArtifactStorage}

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

@@ -1,6 +1,6 @@
 export const keyValueStorage: KeyValueStorage;
 declare class KeyValueStorage {
-    static "__#14@#instance": any;
+    static "__#15@#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 "__#12@#instance": any;
+    static "__#13@#instance": any;
     /**
      *
      * @returns {Logger}

package/lib/utils/utils.d.ts

@@ -1,5 +1,3 @@
-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,8 +36,7 @@ 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 = exports.TEST_ID_REGEX = void 0;
-exports.getPackageVersion = getPackageVersion;
+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.formatStep = formatStep;
 exports.readLatestRunId = readLatestRunId;
 exports.removeColorCodes = removeColorCodes;
@@ -49,9 +48,7 @@ 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
  *
@@ -143,7 +140,7 @@ const fetchSourceCodeFromStackTrace = (stack = '') => {
         .join('\n');
 };
 exports.fetchSourceCodeFromStackTrace = fetchSourceCodeFromStackTrace;
-exports.TEST_ID_REGEX = /@T([\w\d]{8})/;
+const TEST_ID_REGEX = /@T([\w\d]{8})/;
 const fetchIdFromCode = (code, opts = {}) => {
     const comments = code
         .split('\n')
@@ -157,11 +154,11 @@ const fetchIdFromCode = (code, opts = {}) => {
                 return l.startsWith('// ');
         }
     });
-    return comments.find(c => c.match(exports.TEST_ID_REGEX))?.match(exports.TEST_ID_REGEX)?.[1];
+    return comments.find(c => c.match(TEST_ID_REGEX))?.match(TEST_ID_REGEX)?.[1];
 };
 exports.fetchIdFromCode = fetchIdFromCode;
 const fetchIdFromOutput = output => {
-    const TID_FULL_PATTERN = new RegExp(`tid:\\/\\/.*?(${exports.TEST_ID_REGEX.source})`);
+    const TID_FULL_PATTERN = new RegExp(`tid:\\/\\/.*?(${TEST_ID_REGEX.source})`);
     return output.match(TID_FULL_PATTERN)?.[2];
 };
 exports.fetchIdFromOutput = fetchIdFromOutput;
@@ -186,12 +183,6 @@ 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));
         }
@@ -393,13 +384,6 @@ 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_SUITE, TESTOMATIO_MAX_STACK_TRACE, TESTOMATIO_TITLE, TESTOMATIO_ENV, TESTOMATIO_RUN, TESTOMATIO_MARK_DETACHED } = process.env;
+const { TESTOMATIO_RUNGROUP_TITLE, TESTOMATIO_TITLE, TESTOMATIO_ENV, TESTOMATIO_RUN, TESTOMATIO_MARK_DETACHED } = process.env;
 const options = {
     ignoreDeclaration: true,
     ignoreAttributes: false,
@@ -28,7 +28,6 @@ const options = {
     attributeNamePrefix: '',
     parseTagValue: true,
 };
-const MAX_OUTPUT_LENGTH = parseInt(TESTOMATIO_MAX_STACK_TRACE, 10) || 10000;
 const reduceOptions = {};
 class XmlReader {
     constructor(opts = {}) {
@@ -76,7 +75,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, MAX_OUTPUT_LENGTH)}${p3}`);
+            xmlData = xmlData.replace(regex, (_, p1, p2, p3) => `${p1}${p2.substring(0, 5000)}${p3}`);
         }
         const jsonResult = this.parser.parse(xmlData);
         let jsonSuite;
@@ -314,8 +313,6 @@ 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);
@@ -362,13 +359,13 @@ class XmlReader {
     async uploadArtifacts() {
         for (const test of this.tests.filter(t => !!t.stack)) {
             let files = [];
-            if (!test.files?.length)
-                continue;
-            files = test.files.map(f => path_1.default.isAbsolute(f) ? f : path_1.default.join(process.cwd(), f));
+            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 (!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, path_1.default.basename(f)])));
+            test.artifacts = await Promise.all(files.map(f => this.uploader.uploadFileByPath(f, [runId])));
             console.log(constants_js_1.APP_PREFIX, `🗄️ Uploaded ${picocolors_1.default.bold(`${files.length} artifacts`)} for test ${test.title}`);
         }
     }
@@ -428,7 +425,7 @@ function reduceTestCases(prev, item) {
     testCases
         .filter(t => !!t)
         .forEach(testCaseItem => {
-        const file = testCaseItem.file || item.filepath || item.fullname || '';
+        const file = testCaseItem.file || item.filepath || '';
         let stack = '';
         let message = '';
         if (testCaseItem.error)
@@ -461,34 +458,15 @@ 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();
-        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);
-        }
+        const testId = (0, utils_js_1.fetchIdFromOutput)(stack);
         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,
@@ -503,9 +481,7 @@ 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;
@@ -529,14 +505,11 @@ function fetchProperties(item) {
     let title = '';
     if (!item.properties)
         return {};
-    // 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');
+    const prop = [item.properties?.property].flat().find(p => p.name === 'Description');
     if (prop)
         title = prop.value;
-    properties
+    [item.properties?.property]
+        .flat()
         .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.1-xml",
+  "version": "2.0.0-beta.2-gaxios",
   "description": "Testomatio Reporter Client",
   "engines": {
     "node": ">=18"
@@ -16,8 +16,7 @@
     "@cucumber/cucumber": "^10.9.0",
     "@octokit/rest": "^21.1.1",
     "aws-sdk": "^2.1072.0",
-    "axios": "^1.6.2",
-    "axios-retry": "^3.9.1",
+    "gaxios": "^6.0.0",
     "callsite-record": "^4.1.4",
     "commander": "^12",
     "cross-spawn": "^7.0.3",
@@ -49,6 +48,7 @@
     "testcafe"
   ],
   "scripts": {
+    "@cucumber/cucumber": "^10.9.0",
     "clear-exportdir": "rm -rf export/",
     "pretty": "npx prettier --check .",
     "pretty:fix": "prettier --write .",
@@ -67,9 +67,8 @@
     "test:adapter:playwright:example": "npx playwright test --config='./tests/adapter/examples/playwright/playwright.config.ts'",
     "test:adapter:vitest:example": "npx vitest --config='./tests/adapter/examples/vitest/vitest.config.ts'",
     "test:storage": "npx mocha tests-storage/artifact-storage.test.js && npx mocha tests-storage/data-storage.test.js && TESTOMATIO_INTERCEPT_CONSOLE_LOGS=true npx mocha tests-storage/logger.test.js && npx mocha tests-storage/logger-2.test.js && npx mocha tests-storage/reporter-functions.test.js",
-    "build": "rm -rf ./cjs && tsc --module commonjs && npx tsx build/scripts/edit-js-files.js && npx tsx build/scripts/edit-package-json.js && chmod +x ./build/scripts/copy-tesmplate.sh && ./build/scripts/copy-tesmplate.sh",
-    "build:bun": "rm -rf ./cjs && bun build ./src/reporter.js ./src/bin/reportXml.js ./src/bin/startTest.js ./src/bin/uploadArtifacts.js --outdir ./cjs --target node",
-    "build:watch:bun": "rm -rf ./cjs && bun build ./src/bin/reportXml.js ./src/bin/startTest.js ./src/bin/uploadArtifacts.js --outdir ./cjs --target node --watch --onSuccess \"build/scripts/post-build.js\""
+    "//": "builds code from /src (esm) into /lib (commonjs)",
+    "build": "rm -rf ./cjs && tsc --module commonjs && npx tsx build/scripts/edit-js-files.js && npx tsx build/scripts/edit-package-json.js && chmod +x ./build/scripts/copy-tesmplate.sh && ./build/scripts/copy-tesmplate.sh"
   },
   "devDependencies": {
     "@playwright/test": "^1.49.1",

package/src/adapter/nightwatch.js

@@ -1,6 +1,6 @@
 import TestomatClient from '../client.js';
 import { config } from '../config.js';
-import { STATUS } from '../constants.js';
+import { STATUS } from '../constants';
 import { getTestomatIdFromTestTitle } from '../utils/utils.js';
 
 const apiKey = config.TESTOMATIO;

package/src/adapter/webdriver.js

@@ -1,4 +1,4 @@
-import { default as WDIOReporter, RunnerStats } from '@wdio/reporter';
+import WDIOReporter, { RunnerStats } from '@wdio/reporter';
 import TestomatClient from '../client.js';
 import { getTestomatIdFromTestTitle, fileSystem } from '../utils/utils.js';
 import { services } from '../services/index.js';

package/src/bin/cli.js

@@ -7,7 +7,7 @@ import createDebugMessages from 'debug';
 import TestomatClient from '../client.js';
 import XmlReader from '../xmlReader.js';
 import { APP_PREFIX, STATUS } from '../constants.js';
-import { getPackageVersion } from '../utils/utils.js';
+import { version } from '../../package.json';
 import { config } from '../config.js';
 import { readLatestRunId } from '../utils/utils.js';
 import pc from 'picocolors';
@@ -15,7 +15,6 @@ import { filesize as prettyBytes } from 'filesize';
 import dotenv from 'dotenv';
 
 const debug = createDebugMessages('@testomatio/reporter:xml-cli');
-const version = getPackageVersion();
 console.log(pc.cyan(pc.bold(` 🤩 Testomat.io Reporter v${version}`)));
 const program = new Command();
 

package/src/bin/reportXml.js

@@ -5,11 +5,8 @@ import { glob } from 'glob';
 import createDebugMessages from 'debug';
 import { APP_PREFIX } from '../constants.js';
 import XmlReader from '../xmlReader.js';
-import { getPackageVersion } from '../utils/utils.js';
+import { version } from '../../package.json';
 import dotenv from 'dotenv';
-import path from 'path';
-
-const version = getPackageVersion();
 
 const debug = createDebugMessages('@testomatio/reporter:xml-cli');
 console.log(pc.cyan(pc.bold(` 🤩 Testomat.io XML Reporter v${version}`)));

package/src/bin/startTest.js

@@ -4,11 +4,10 @@ import { Command } from 'commander';
 import pc from 'picocolors';
 import TestomatClient from '../client.js';
 import { APP_PREFIX, STATUS } from '../constants.js';
-import { getPackageVersion } from '../utils/utils.js';
+import { version } from '../../package.json';
 import { config } from '../config.js';
 import dotenv from 'dotenv';
 
-const version = getPackageVersion();
 console.log(pc.cyan(pc.bold(` 🤩 Testomat.io Reporter v${version}`)));
 const program = new Command();
 

package/src/bin/uploadArtifacts.js

@@ -5,13 +5,12 @@ import pc from 'picocolors';
 import createDebugMessages from 'debug';
 import TestomatClient from '../client.js';
 import { APP_PREFIX } from '../constants.js';
-import { getPackageVersion } from '../utils/utils.js';
+import { version } from '../../package.json';
 import { config } from '../config.js';
 import { readLatestRunId } from '../utils/utils.js';
 import dotenv from 'dotenv';
 
 const debug = createDebugMessages('@testomatio/reporter:upload-cli');
-const version = getPackageVersion();
 console.log(pc.cyan(pc.bold(` 🤩 Testomat.io Reporter v${version}`)));
 const program = new Command();
 

package/src/junit-adapter/csharp.js

@@ -1,4 +1,3 @@
-import path from 'path';
 import Adapter from './adapter.js';
 
 class CSharpAdapter extends Adapter {
@@ -8,21 +7,10 @@ class CSharpAdapter extends Adapter {
     if (example) t.example = { ...example[1].split(',') };
     const suite = t.suite_title.split('.');
     t.suite_title = suite.pop();
-    t.file = namespaceToFileName(t.file);
+    t.file = suite.join('/');
     t.title = title.trim();
     return t;
   }
-
-  getFilePath(t) {
-    const fileName = namespaceToFileName(t.file);
-    return fileName;
-  }
 }
 
 export default CSharpAdapter;
-
-function namespaceToFileName(fileName) {
-  const fileParts = fileName.split('.');
-  fileParts[fileParts.length - 1] = fileParts[fileParts.length - 1]?.replace(/\$.*/, '');
-  return `${fileParts.join(path.sep)}.cs`;
-}

package/src/pipe/bitbucket.js

@@ -1,7 +1,7 @@
 import { APP_PREFIX, testomatLogoURL } from '../constants.js';
 import { ansiRegExp, isSameTest } from '../utils/utils.js';
 import { statusEmoji, fullName } from '../utils/pipe_utils.js';
-import axios from 'axios';
+import { Gaxios } from 'gaxios';
 import pc from 'picocolors';
 import humanizeDuration from 'humanize-duration';
 import merge from 'lodash.merge';
@@ -40,6 +40,13 @@ export class BitbucketPipe {
     }
 
     this.isEnabled = true;
+    this.client = new Gaxios({
+      baseURL: 'https://api.bitbucket.org/2.0',
+      headers: {
+        'Content-Type': 'application/json',
+        'Authorization': `Bearer ${this.token}`
+      }
+    });
 
     debug('Bitbucket Pipe: Enabled');
   }
@@ -166,26 +173,21 @@ export class BitbucketPipe {
 
     // Construct Bitbucket API URL for comments
     // eslint-disable-next-line max-len
-    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`;
+    const commentsRequestURL = `/repositories/${this.ENV.BITBUCKET_WORKSPACE}/${this.ENV.BITBUCKET_REPO_SLUG}/pullrequests/${this.ENV.BITBUCKET_PR_ID}/comments`;
 
     // Delete previous report
-    await deletePreviousReport(axios, commentsRequestURL, this.hiddenCommentData, this.token);
+    await deletePreviousReport(this.client, commentsRequestURL, this.hiddenCommentData);
 
     // Add current report
     debug(`Adding comment via URL: ${commentsRequestURL}`);
     debug(`Final Bitbucket API call body: ${body}`);
 
     try {
-      const addCommentResponse = await axios.post(
-        commentsRequestURL,
-        { content: { raw: body } },
-        {
-          headers: {
-            Authorization: `Bearer ${this.token}`,
-            'Content-Type': 'application/json',
-          },
-        },
-      );
+      const addCommentResponse = await this.client.request({
+        method: 'POST',
+        url: commentsRequestURL,
+        data: { content: { raw: body } }
+      });
 
       const commentID = addCommentResponse.data.id;
       // eslint-disable-next-line max-len
@@ -210,18 +212,16 @@ export class BitbucketPipe {
   updateRun() {}
 }
 
-async function deletePreviousReport(axiosInstance, commentsRequestURL, hiddenCommentData, token) {
+async function deletePreviousReport(client, commentsRequestURL, hiddenCommentData) {
   if (process.env.BITBUCKET_KEEP_OUTDATED_REPORTS) return;
 
   // Get comments
   let comments = [];
 
   try {
-    const response = await axiosInstance.get(commentsRequestURL, {
-      headers: {
-        Authorization: `Bearer ${token}`,
-        'Content-Type': 'application/json',
-      },
+    const response = await client.request({
+      method: 'GET',
+      url: commentsRequestURL
     });
     comments = response.data.values;
   } catch (e) {
@@ -236,11 +236,9 @@ async function deletePreviousReport(axiosInstance, commentsRequestURL, hiddenCom
       try {
         // Delete previous comment
         const deleteCommentURL = `${commentsRequestURL}/${comment.id}`;
-        await axiosInstance.delete(deleteCommentURL, {
-          headers: {
-            Authorization: `Bearer ${token}`,
-            'Content-Type': 'application/json',
-          },
+        await client.request({
+          method: 'DELETE',
+          url: deleteCommentURL
         });
       } catch (e) {
         console.warn(`Can't delete previously added comment with testomat.io report. Ignored.`);

package/src/pipe/gitlab.js

@@ -1,5 +1,5 @@
 import createDebugMessages from 'debug';
-import axios from 'axios';
+import { Gaxios } from 'gaxios';
 import pc from 'picocolors';
 import humanizeDuration from 'humanize-duration';
 import merge from 'lodash.merge';
@@ -45,6 +45,12 @@ class GitLabPipe {
     }
 
     this.isEnabled = true;
+    this.client = new Gaxios({
+      baseURL: 'https://gitlab.com/api/v4',
+      headers: {
+        'Content-Type': 'application/json',
+      }
+    });
 
     debug('GitLab Pipe: Enabled');
   }
@@ -157,16 +163,21 @@ class GitLabPipe {
     }
 
     // eslint-disable-next-line max-len
-    const commentsRequestURL = `https://gitlab.com/api/v4/projects/${this.ENV.CI_PROJECT_ID}/merge_requests/${this.ENV.CI_MERGE_REQUEST_IID}/notes`;
+    const commentsRequestURL = `/projects/${this.ENV.CI_PROJECT_ID}/merge_requests/${this.ENV.CI_MERGE_REQUEST_IID}/notes`;
 
     // delete previous report
-    await deletePreviousReport(axios, commentsRequestURL, this.hiddenCommentData, this.token);
+    await deletePreviousReport(this.client, commentsRequestURL, this.hiddenCommentData, this.token);
 
     // add current report
     debug(`Adding comment via url: ${commentsRequestURL}`);
 
     try {
-      const addCommentResponse = await axios.post(`${commentsRequestURL}?access_token=${this.token}`, { body });
+      const addCommentResponse = await this.client.request({
+        method: 'POST',
+        url: commentsRequestURL,
+        params: { access_token: this.token },
+        data: { body }
+      });
 
       const commentID = addCommentResponse.data.id;
       // eslint-disable-next-line max-len
@@ -191,14 +202,18 @@ class GitLabPipe {
   updateRun() {}
 }
 
-async function deletePreviousReport(axiosInstance, commentsRequestURL, hiddenCommentData, token) {
+async function deletePreviousReport(client, commentsRequestURL, hiddenCommentData, token) {
   if (process.env.GITLAB_KEEP_OUTDATED_REPORTS) return;
 
   // get comments
   let comments = [];
 
   try {
-    const response = await axiosInstance.get(`${commentsRequestURL}?access_token=${token}`);
+    const response = await client.request({
+      method: 'GET',
+      url: commentsRequestURL,
+      params: { access_token: token }
+    });
     comments = response.data;
   } catch (e) {
     console.error('Error while attempt to retrieve comments on GitLab Merge Request:\n', e);
@@ -211,8 +226,12 @@ async function deletePreviousReport(axiosInstance, commentsRequestURL, hiddenCom
     if (comment.body.includes(hiddenCommentData)) {
       try {
         // delete previous comment
-        const deleteCommentURL = `${commentsRequestURL}/${comment.id}?access_token=${token}`;
-        await axiosInstance.delete(deleteCommentURL);
+        const deleteCommentURL = `${commentsRequestURL}/${comment.id}`;
+        await client.request({
+          method: 'DELETE',
+          url: deleteCommentURL,
+          params: { access_token: token }
+        });
       } catch (e) {
         console.warn(`Can't delete previously added comment with testomat.io report. Ignore.`);
       }