@testomatio/reporter 2.1.0-beta-nightwatch → 2.1.0-beta.2-codeceptjs

package/lib/pipe/bitbucket.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -30,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 axios_1 = __importDefault(require("axios"));
+const gaxios_1 = require("gaxios");
 const picocolors_1 = __importDefault(require("picocolors"));
 const humanize_duration_1 = __importDefault(require("humanize-duration"));
 const lodash_merge_1 = __importDefault(require("lodash.merge"));
@@ -59,6 +69,13 @@ 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) {
@@ -158,18 +175,17 @@ 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_1.default, 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_1.default.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
@@ -188,17 +204,15 @@ class BitbucketPipe {
     updateRun() { }
 }
 exports.BitbucketPipe = BitbucketPipe;
-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;
     }
@@ -213,11 +227,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) {

package/lib/pipe/debug.js

@@ -27,7 +27,21 @@ class DebugPipe {
             this.logFilePath = path_1.default.join(os_1.default.tmpdir(), `testomatio.debug.${Date.now()}.json`);
             debug('Creating debug file:', this.logFilePath);
             fs_1.default.writeFileSync(this.logFilePath, '');
-            console.log(constants_js_1.APP_PREFIX, '🪲. Debug created:');
+            // Create symlink to ensure consistent path to latest debug file
+            const symlinkPath = path_1.default.join(os_1.default.tmpdir(), 'testomatio.debug.latest.json');
+            try {
+                // Remove existing symlink if it exists
+                if (fs_1.default.existsSync(symlinkPath)) {
+                    fs_1.default.unlinkSync(symlinkPath);
+                }
+                // Create new symlink pointing to the timestamped debug file
+                fs_1.default.symlinkSync(this.logFilePath, symlinkPath);
+                debug('Created symlink:', symlinkPath, '->', this.logFilePath);
+            }
+            catch (err) {
+                debug('Failed to create symlink:', err.message);
+            }
+            console.log(constants_js_1.APP_PREFIX, '🪲 Debug file created');
             this.testomatioEnvVars = Object.keys(process.env)
                 .filter(key => key.startsWith('TESTOMATIO_'))
                 .reduce((acc, key) => {
@@ -74,8 +88,12 @@ class DebugPipe {
     async addTest(data) {
         if (!this.isEnabled)
             return;
-        if (!this.batch.isEnabled)
-            this.logToFile({ action: 'addTest', testId: data });
+        if (!this.batch.isEnabled) {
+            const logData = { action: 'addTest', testId: data };
+            if (this.store.runId)
+                logData.runId = this.store.runId;
+            this.logToFile(logData);
+        }
         else
             this.batch.tests.push(data);
         if (!this.batch.intervalFunction)
@@ -88,16 +106,19 @@ class DebugPipe {
         if (!this.batch.tests.length)
             return;
         const testsToSend = this.batch.tests.splice(0);
-        this.logToFile({ action: 'addTestsBatch', tests: testsToSend });
+        const logData = { action: 'addTestsBatch', tests: testsToSend };
+        if (this.store.runId)
+            logData.runId = this.store.runId;
+        this.logToFile(logData);
     }
     async finishRun(params) {
         if (!this.isEnabled)
             return;
-        this.logToFile({ actions: 'finishRun', params });
         await this.batchUpload();
         if (this.batch.intervalFunction)
             clearInterval(this.batch.intervalFunction);
-        console.log(constants_js_1.APP_PREFIX, '🪲. Debug Saved to', this.logFilePath);
+        this.logToFile({ action: 'finishRun', params });
+        console.log(constants_js_1.APP_PREFIX, '🪲 Debug Saved to', this.logFilePath);
     }
     toString() {
         return 'Debug Reporter';

package/lib/pipe/github.d.ts

@@ -23,8 +23,8 @@ declare class GitHubPipe implements Pipe {
     createRun(): Promise<void>;
     addTest(test: any): void;
     finishRun(runParams: any): Promise<void>;
-    octokit: import("@octokit/core").Octokit & {
+    octokit: import("@octokit/core").Octokit & import("@octokit/plugin-rest-endpoint-methods/dist-types/generated/method-types.js").RestEndpointMethods & import("@octokit/plugin-rest-endpoint-methods").Api & {
         paginate: import("@octokit/plugin-paginate-rest").PaginateInterface;
-    } & import("@octokit/plugin-rest-endpoint-methods/dist-types/generated/method-types.js").RestEndpointMethods & import("@octokit/plugin-rest-endpoint-methods/dist-types/types.js").Api;
+    };
     toString(): string;
 }

package/lib/pipe/github.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -8,7 +41,6 @@ const path_1 = __importDefault(require("path"));
 const picocolors_1 = __importDefault(require("picocolors"));
 const humanize_duration_1 = __importDefault(require("humanize-duration"));
 const lodash_merge_1 = __importDefault(require("lodash.merge"));
-const rest_1 = require("@octokit/rest");
 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");
@@ -62,7 +94,8 @@ class GitHubPipe {
             return;
         if (runParams.tests)
             runParams.tests.forEach(t => this.addTest(t));
-        this.octokit = new rest_1.Octokit({
+        const { Octokit } = await Promise.resolve().then(() => __importStar(require('@octokit/rest')));
+        this.octokit = new Octokit({
             auth: this.token,
         });
         const [owner, repo] = (this.repo || '').split('/');
@@ -130,7 +163,6 @@ class GitHubPipe {
         if (this.tests.length > 0) {
             body += '\n<details>\n<summary><h3>🐢 Slowest Tests</h3></summary>\n\n';
             body += this.tests
-                // eslint-disable-next-line no-unsafe-optional-chaining
                 .sort((a, b) => b?.run_time - a?.run_time)
                 .slice(0, 5)
                 .map(t => `* ${(0, pipe_utils_js_1.fullName)(t)} (${(0, humanize_duration_1.default)(parseFloat(t.run_time))})`)

package/lib/pipe/gitlab.d.ts

@@ -14,6 +14,7 @@ declare class GitLabPipe {
     tests: any[];
     token: any;
     hiddenCommentData: string;
+    client: Gaxios;
     prepareRun(): Promise<void>;
     createRun(): Promise<void>;
     addTest(test: any): void;
@@ -21,3 +22,4 @@ 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 axios_1 = __importDefault(require("axios"));
+const gaxios_1 = require("gaxios");
 const picocolors_1 = __importDefault(require("picocolors"));
 const humanize_duration_1 = __importDefault(require("humanize-duration"));
 const lodash_merge_1 = __importDefault(require("lodash.merge"));
@@ -39,6 +39,12 @@ 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)
@@ -119,7 +125,6 @@ class GitLabPipe {
         if (this.tests.length > 0) {
             body += '\n<details>\n<summary><h3>🐢 Slowest Tests</h3></summary>\n\n';
             body += this.tests
-                // eslint-disable-next-line no-unsafe-optional-chaining
                 .sort((a, b) => b?.run_time - a?.run_time)
                 .slice(0, 5)
                 .map(t => `* ${(0, pipe_utils_js_1.fullName)(t)} (${(0, humanize_duration_1.default)(parseFloat(t.run_time))})`)
@@ -127,13 +132,18 @@ class GitLabPipe {
             body += '\n</details>';
         }
         // 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_1.default, 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_1.default.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
             const commentURL = `${this.ENV.CI_PROJECT_URL}/-/merge_requests/${this.ENV.CI_MERGE_REQUEST_IID}#note_${commentID}`;
@@ -150,13 +160,17 @@ 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) {
@@ -169,8 +183,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.`);

package/lib/pipe/html.js

@@ -193,7 +193,6 @@ class HtmlPipe {
           <option value="1">25</option>
           <option value="2">50</option>
         </select>`));
-        /* eslint-disable */
         handlebars_1.default.registerHelper('emptyDataComponent', () => {
             const svgFilePath = path_1.default.join(__dirname, '..', 'template', 'emptyData.svg');
             const svgContent = fs_1.default.readFileSync(svgFilePath, 'utf8');
@@ -207,7 +206,6 @@ class HtmlPipe {
           </div>
           <div>`);
         });
-        /* eslint-enable */
         handlebars_1.default.registerHelper('pageDispleyElements', tests => {
             // We wrapp the lines to the HTML format we need
             const totalTests = JSON.parse(JSON.stringify(tests)
@@ -235,7 +233,6 @@ class HtmlPipe {
             }
             statuses.forEach(status => {
                 for (const option in paginationOptions) {
-                    // eslint-disable-next-line no-prototype-builtins
                     if (paginationOptions.hasOwnProperty(option)) {
                         const pageSize = paginationOptions[option];
                         let filteredItems = totalTests;

package/lib/pipe/index.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/lib/pipe/testomatio.d.ts

@@ -31,7 +31,7 @@ declare class TestomatioPipe implements Pipe {
     groupTitle: any;
     env: string;
     label: string;
-    axios: import("axios").AxiosInstance;
+    client: Gaxios;
     proceed: string;
     jiraId: string;
     runId: any;
@@ -59,7 +59,7 @@ declare class TestomatioPipe implements Pipe {
     /**
      * Adds a test to the batch uploader (or reports a single test if batch uploading is disabled)
      */
-    addTest(data: any): void;
+    addTest(data: any): Promise<void | import("gaxios").GaxiosResponse<any>>;
     /**
      * @param {import('../../types/types.js').RunData} params
      * @returns
@@ -68,3 +68,4 @@ declare class TestomatioPipe implements Pipe {
     toString(): string;
     #private;
 }
+import { Gaxios } from 'gaxios';