@testomatio/reporter 2.0.1-beta-2-ignore-xml → 2.0.1-beta.1

package/lib/pipe/testomatio.js

@@ -5,19 +5,15 @@ 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"));
-// Retry interceptor function
-const axios_retry_1 = __importDefault(require("axios-retry"));
-// Default axios instance
-const axios_1 = __importDefault(require("axios"));
+const gaxios_1 = require("gaxios");
 const json_cycle_1 = __importDefault(require("json-cycle"));
 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 config_js_1 = require("../config.js");
 const debug = (0, debug_1.default)('@testomatio/reporter:pipe:testomatio');
-if (process.env.TESTOMATIO_RUN) {
-    // process.env.runId = process.env.TESTOMATIO_RUN;
-}
+if (process.env.TESTOMATIO_RUN)
+    process.env.runId = process.env.TESTOMATIO_RUN;
 /**
  * @typedef {import('../../types/types.js').Pipe} Pipe
  * @typedef {import('../../types/types.js').TestData} TestData
@@ -55,48 +51,37 @@ 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 axios with a custom config
-        this.axios = axios_1.default.create({
+        // Create a new instance of gaxios with a custom config
+        this.client = new gaxios_1.Gaxios({
             baseURL: `${this.url.trim()}`,
             timeout: constants_js_1.AXIOS_TIMEOUT,
-            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
+            proxy: proxy ? proxy.toString() : undefined,
+            retry: true,
+            retryConfig: {
+                retry: constants_js_1.REPORTER_REQUEST_RETRIES.retriesPerRequest,
+                retryDelay: constants_js_1.REPORTER_REQUEST_RETRIES.retryTimeout,
+                httpMethodsToRetry: ['GET', 'PUT', 'HEAD', 'OPTIONS', 'DELETE', 'POST'],
+                shouldRetry: (error) => {
+                    if (!error.response)
                         return false;
-                    default:
-                        break;
+                    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
                 }
-                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)
         this.proceed = process.env.TESTOMATIO_PROCEED;
         this.jiraId = process.env.TESTOMATIO_JIRA_ID;
-        this.runId = params.runId || process.env.runId;
+        this.runId = params.runId || process.env.TESTOMATIO_RUN;
         this.createNewTests = params.createNewTests ?? !!process.env.TESTOMATIO_CREATE;
         this.hasUnmatchedTests = false;
         this.requestFailures = 0;
@@ -125,11 +110,14 @@ class TestomatioPipe {
             if (!q) {
                 return;
             }
-            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;
+            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;
             }
             console.log(constants_js_1.APP_PREFIX, `⛔  No tests found for your --filter --> ${type}=${id}`);
         }
@@ -181,16 +169,23 @@ class TestomatioPipe {
         if (this.runId) {
             this.store.runId = this.runId;
             debug(`Run with id ${this.runId} already created, updating...`);
-            const resp = await this.axios.put(`/api/reporter/${this.runId}`, runParams);
+            const resp = await this.client.request({
+                method: 'PUT',
+                url: `/api/reporter/${this.runId}`,
+                data: runParams
+            });
             if (resp.data.artifacts)
                 (0, pipe_utils_js_1.setS3Credentials)(resp.data.artifacts);
             return;
         }
         debug('Creating run...');
         try {
-            const resp = await this.axios.post(`/api/reporter`, runParams, {
+            const resp = await this.client.request({
+                method: 'POST',
+                url: '/api/reporter',
+                data: runParams,
                 maxContentLength: Infinity,
-                maxBodyLength: Infinity,
+                responseType: 'json'
             });
             this.runId = resp.data.uid;
             this.runUrl = `${this.url}/${resp.data.url.split('/').splice(3).join('/')}`;
@@ -206,6 +201,7 @@ 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');
@@ -246,7 +242,15 @@ class TestomatioPipe {
         }
         const json = json_cycle_1.default.stringify(data);
         debug('Adding test', json);
-        return this.axios.post(`/api/reporter/${this.runId}/testrun`, json, axiosAddTestrunRequestConfig).catch(err => {
+        return this.client.request({
+            method: 'POST',
+            url: `/api/reporter/${this.runId}/testrun`,
+            data: json,
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            maxContentLength: Infinity
+        }).catch(err => {
             this.requestFailures++;
             this.notReportedTestsCount++;
             if (err.response) {
@@ -291,9 +295,19 @@ class TestomatioPipe {
         // get tests from batch and clear batch
         const testsToSend = this.batch.tests.splice(0);
         debug('📨 Batch upload', testsToSend.length, 'tests');
-        return this.axios
-            .post(`/api/reporter/${this.runId}/testrun`, { api_key: this.apiKey, tests: testsToSend, batch_index: this.batch.batchIndex }, axiosAddTestrunRequestConfig)
-            .catch(err => {
+        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) {
@@ -367,12 +381,16 @@ class TestomatioPipe {
             status_event += '_parallel';
         try {
             if (this.runId && !this.proceed) {
-                await this.axios.put(`/api/reporter/${this.runId}`, {
-                    api_key: this.apiKey,
-                    duration: params.duration,
-                    status_event,
-                    detach: params.detach,
-                    tests: params.tests,
+                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,
+                    }
                 });
                 if (this.runUrl) {
                     console.log(constants_js_1.APP_PREFIX, '📊 Report Saved. Report URL:', picocolors_1.default.magenta(this.runUrl));
@@ -388,17 +406,13 @@ class TestomatioPipe {
             }
             if (this.hasUnmatchedTests) {
                 console.log('');
-                // eslint-disable-next-line max-len
                 console.log(constants_js_1.APP_PREFIX, picocolors_1.default.yellow(picocolors_1.default.bold('⚠️ Some reported tests were not found in Testomat.io project')));
-                // eslint-disable-next-line max-len
                 console.log(constants_js_1.APP_PREFIX, `If you use Testomat.io as a reporter only, please re-run tests using ${picocolors_1.default.bold('TESTOMATIO_CREATE=1')}`);
-                // eslint-disable-next-line max-len
                 console.log(constants_js_1.APP_PREFIX, `But to keep your tests consistent it is recommended to ${picocolors_1.default.bold('import tests first')}`);
                 console.log(constants_js_1.APP_PREFIX, 'If tests were imported but still not matched, assign test IDs to your tests.');
                 console.log(constants_js_1.APP_PREFIX, 'You can do that automatically via command line tools:');
                 console.log(constants_js_1.APP_PREFIX, picocolors_1.default.bold('npx check-tests ... --update-ids'), 'See: https://bit.ly/js-update-ids');
                 console.log(constants_js_1.APP_PREFIX, 'or for Cucumber:');
-                // eslint-disable-next-line max-len
                 console.log(constants_js_1.APP_PREFIX, picocolors_1.default.bold('npx check-cucumber ... --update-ids'), 'See: https://bit.ly/bdd-update-ids');
             }
         }
@@ -420,24 +434,16 @@ function printCreateIssue(err) {
     process.on('exit', () => {
         console.log();
         console.log(constants_js_1.APP_PREFIX, 'There was an error reporting to Testomat.io:');
-        console.log(constants_js_1.APP_PREFIX, 'If you think this is a bug please create an issue: https://github.com/testomatio/reporter/issues/new'); // eslint-disable-line max-len
+        console.log(constants_js_1.APP_PREFIX, 'If you think this is a bug please create an issue: https://github.com/testomatio/reporter/issues/new');
         console.log(constants_js_1.APP_PREFIX, 'Provide this information:');
         console.log('Error:', err.message || err.code);
         if (!err.config)
             return;
         const time = new Date().toUTCString();
-        const { data, url, baseURL, method } = err?.config || {};
+        const { body, url, baseURL, method } = err?.config || {};
         console.log('```js');
-        console.log({ data: data?.replace(/"(tstmt_[^"]+)"/g, 'tstmt_*'), url, baseURL, method, time });
+        console.log({ body: body?.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: {
-    "__#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/services/logger.js

@@ -90,7 +90,6 @@ class Logger {
             }
             else {
                 try {
-                    // eslint-disable-next-line no-unused-expressions
                     this.prettyObjects ? logs.push(JSON.stringify(arg, null, 2)) : logs.push(JSON.stringify(arg));
                 }
                 catch (e) {
@@ -119,7 +118,7 @@ class Logger {
                 current +
                 // strings are splitted by args when use tagged template, thus we add arg after each string
                 // it looks like: `string1 arg1 string2 arg2 string3`
-                (args[index] !== undefined // eslint-disable-line no-nested-ternary
+                (args[index] !== undefined
                     ? typeof args[index] === 'string'
                         ? args[index] // add arg as it is
                         : this.#stringifyLogs(args[index]) // stringify arg