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

package/src/bin/uploadArtifacts.js

@@ -5,12 +5,13 @@ import pc from 'picocolors';
 import createDebugMessages from 'debug';
 import TestomatClient from '../client.js';
 import { APP_PREFIX } from '../constants.js';
-import { version } from '../../package.json';
+import { getPackageVersion } from '../utils/utils.js';
 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/client.js

@@ -31,7 +31,6 @@ class Client {
    * Create a Testomat client instance
    * @returns
    */
-  // eslint-disable-next-line
   constructor(params = {}) {
     this.paramsForPipesFactory = params;
     this.pipeStore = {};
@@ -79,7 +78,7 @@ class Client {
     try {
       const filterPipe = this.pipes.find(p => p.constructor.name.toLowerCase() === `${pipe.toLowerCase()}pipe`);
 
-      if (!filterPipe.isEnabled) {
+      if (!filterPipe?.isEnabled) {
         // TODO:for the future for the another pipes
         console.warn(
           APP_PREFIX,

package/src/config.js

@@ -6,10 +6,10 @@ const debug = createDebugMessages('@testomatio/reporter:config');
 /* for possibility to use multiple env files (reading different paths)
 const envFileVars = dotenv.config({ path: '.env' }).parsed; */
 
-if (process.env.TESTOMATIO_API_KEY) {
+if (process.env.TESTOMATIO_API_KEY && !process.env.TESTOMATIO) {
   process.env.TESTOMATIO = process.env.TESTOMATIO_API_KEY;
 }
-if (process.env.TESTOMATIO_TOKEN) {
+if (process.env.TESTOMATIO_TOKEN && !process.env.TESTOMATIO) {
   process.env.TESTOMATIO = process.env.TESTOMATIO_TOKEN;
 }
 

package/src/junit-adapter/csharp.js

@@ -1,3 +1,4 @@
+import path from 'path';
 import Adapter from './adapter.js';
 
 class CSharpAdapter extends Adapter {
@@ -7,10 +8,21 @@ class CSharpAdapter extends Adapter {
     if (example) 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;
+  }
 }
 
 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/debug.js

@@ -25,7 +25,22 @@ export class DebugPipe {
 
       debug('Creating debug file:', this.logFilePath);
       fs.writeFileSync(this.logFilePath, '');
-      console.log(APP_PREFIX, '🪲. Debug created:');
+
+      // Create symlink to ensure consistent path to latest debug file
+      const symlinkPath = path.join(os.tmpdir(), 'testomatio.debug.latest.json');
+      try {
+        // Remove existing symlink if it exists
+        if (fs.existsSync(symlinkPath)) {
+          fs.unlinkSync(symlinkPath);
+        }
+        // Create new symlink pointing to the timestamped debug file
+        fs.symlinkSync(this.logFilePath, symlinkPath);
+        debug('Created symlink:', symlinkPath, '->', this.logFilePath);
+      } catch (err) {
+        debug('Failed to create symlink:', err.message);
+      }
+
+      console.log(APP_PREFIX, '🪲 Debug file created');
       this.testomatioEnvVars = Object.keys(process.env)
         .filter(key => key.startsWith('TESTOMATIO_'))
         .reduce((acc, key) => {
@@ -92,10 +107,10 @@ export class DebugPipe {
 
   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(APP_PREFIX, '🪲. Debug Saved to', this.logFilePath);
+    this.logToFile({ action: 'finishRun', params });
+    console.log(APP_PREFIX, '🪲 Debug Saved to', this.logFilePath);
   }
 
   toString() {

package/src/pipe/github.js

@@ -3,7 +3,6 @@ import path from 'path';
 import pc from 'picocolors';
 import humanizeDuration from 'humanize-duration';
 import merge from 'lodash.merge';
-import { Octokit } from '@octokit/rest';
 import { APP_PREFIX, testomatLogoURL } from '../constants.js';
 import { ansiRegExp, isSameTest } from '../utils/utils.js';
 import { statusEmoji, fullName } from '../utils/pipe_utils.js';
@@ -64,6 +63,7 @@ class GitHubPipe {
     if (!this.issue) return;
 
     if (runParams.tests) runParams.tests.forEach(t => this.addTest(t));
+    const { Octokit } = await import('@octokit/rest');
 
     this.octokit = new Octokit({
       auth: this.token,
@@ -154,7 +154,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 => `* ${fullName(t)} (${humanizeDuration(parseFloat(t.run_time))})`)

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');
   }
@@ -149,7 +155,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 => `* ${fullName(t)} (${humanizeDuration(parseFloat(t.run_time))})`)
@@ -158,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
@@ -192,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);
@@ -212,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.`);
       }

package/src/pipe/html.js

@@ -66,6 +66,8 @@ class HtmlPipe {
     // empty
   }
 
+  async prepareRun() {}
+
   updateRun() {
     // empty
   }
@@ -235,7 +237,6 @@ class HtmlPipe {
         </select>`,
         ),
     );
-    /* eslint-disable */
     handlebars.registerHelper('emptyDataComponent', () => {
       const svgFilePath = path.join(__dirname, '..', 'template', 'emptyData.svg');
       const svgContent = fs.readFileSync(svgFilePath, 'utf8');
@@ -252,13 +253,12 @@ class HtmlPipe {
           <div>`,
       );
     });
-    /* eslint-enable */
     handlebars.registerHelper('pageDispleyElements', tests => {
       // We wrapp the lines to the HTML format we need
       const totalTests = JSON.parse(
         JSON.stringify(tests)
           .replace(/<script>/g, '&lt;script&gt;')
-          .replace(/<\/script>/g, '&lt;/script&gt;'), // eslint-disable-line
+          .replace(/<\/script>/g, '&lt;/script&gt;'),
       );
 
       const paginationOptions = {
@@ -285,7 +285,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;