@testomatio/reporter 2.7.4-beta.allure-1 → 2.7.5

package/src/bin/cli.js

@@ -6,7 +6,6 @@ import { glob } from 'glob';
 import createDebugMessages from 'debug';
 import TestomatClient from '../client.js';
 import XmlReader from '../xmlReader.js';
-import AllureReader from '../allureReader.js';
 import { APP_PREFIX, STATUS } from '../constants.js';
 import { cleanLatestRunId, getPackageVersion, applyFilter } from '../utils/utils.js';
 import { config } from '../config.js';
@@ -265,40 +264,6 @@ program
     if (timeoutTimer) clearTimeout(timeoutTimer);
   });
 
-program
-  .command('allure')
-  .description('Parse Allure result files and upload to Testomat.io')
-  .argument('<pattern>', 'Allure result directory pattern')
-  .option('-d, --dir <dir>', 'Project directory')
-  .option('--timelimit <time>', 'default time limit in seconds to kill a stuck process')
-  .option('--with-package', 'Keep full package path in file names (default: strip package prefix)')
-  .action(async (pattern, opts) => {
-    const runReader = new AllureReader({ withPackage: opts.withPackage });
-
-    let timeoutTimer;
-    if (opts.timelimit) {
-      timeoutTimer = setTimeout(
-        () => {
-          console.log(
-            `⚠️  Reached timeout of ${opts.timelimit}s. Exiting... (Exit code is 0 to not fail the pipeline)`,
-          );
-          process.exit(0);
-        },
-        parseInt(opts.timelimit, 10) * 1000,
-      );
-    }
-
-    try {
-      await runReader.parse(pattern);
-      await runReader.createRun();
-      await runReader.uploadData();
-    } catch (err) {
-      console.log(APP_PREFIX, 'Error uploading Allure results:', err);
-    }
-
-    if (timeoutTimer) clearTimeout(timeoutTimer);
-  });
-
 program
   .command('upload-artifacts')
   .description('Upload artifacts to Testomat.io')

package/src/client.js

@@ -360,10 +360,11 @@ class Client {
    *
    * Updates the status of the current test run and finishes the run.
    * @param {'passed' | 'failed' | 'skipped' | 'finished'} status - The status of the current test run.
+   * @param {Partial<import('../types/types.js').RunData>} [params] - Additional run params (e.g. duration).
    * Must be one of "passed", "failed", or "finished"
    * @returns {Promise<any>} - A Promise that resolves when finishes the run.
    */
-  async updateRunStatus(status) {
+  async updateRunStatus(status, params = {}) {
     this.pipes ||= await pipesFactory(this.paramsForPipesFactory || {}, this.pipeStore);
     this.runId ||= readLatestRunId();
 
@@ -371,7 +372,7 @@ class Client {
     // all pipes disabled, skipping
     if (!this.pipes?.filter(p => p.isEnabled).length) return Promise.resolve();
 
-    const runParams = { status };
+    const runParams = { ...params, status };
 
     this.queue = this.queue
       .then(() => Promise.all(this.pipes.map(p => p.finishRun(runParams))))

package/src/junit-adapter/index.js

@@ -4,7 +4,6 @@ import JavaAdapter from './java.js';
 import PythonAdapter from './python.js';
 import RubyAdapter from './ruby.js';
 import CSharpAdapter from './csharp.js';
-import KotlinAdapter from './kotlin.js';
 
 function AdapterFactory(lang, opts) {
   if (lang === 'java') {
@@ -22,9 +21,6 @@ function AdapterFactory(lang, opts) {
   if (lang === 'c#' || lang === 'csharp') {
     return new CSharpAdapter(opts);
   }
-  if (lang === 'kotlin') {
-    return new KotlinAdapter(opts);
-  }
 
   return new Adapter(opts);
 }

package/src/pipe/bitbucket.js

@@ -78,6 +78,20 @@ export class BitbucketPipe {
 
   async finishRun(runParams) {
     if (!this.isEnabled) return;
+    if (!this.ENV.BITBUCKET_PR_ID) {
+      log.warn(
+        pc.yellow('Bitbucket'),
+        'Skipping PR comment: BITBUCKET_PR_ID is not set. Run this pipe in a Bitbucket pull-requests pipeline.',
+      );
+      return;
+    }
+    if (!this.ENV.BITBUCKET_WORKSPACE || !this.ENV.BITBUCKET_REPO_SLUG) {
+      log.warn(
+        pc.yellow('Bitbucket'),
+        'Skipping PR comment: BITBUCKET_WORKSPACE or BITBUCKET_REPO_SLUG is missing.',
+      );
+      return;
+    }
 
     if (runParams.tests) runParams.tests.forEach(t => this.addTest(t));
 
@@ -196,12 +210,20 @@ export class BitbucketPipe {
 
       log.info(pc.yellow('Bitbucket'), `Report created: ${pc.magenta(commentURL)}`);
     } catch (err) {
+      const isForbiddenError = `${err}`.includes('Forbidden') || `${err}`.includes('403');
+      const scopeHint =
+        isForbiddenError
+          ? '\nHint: use a token that can write PR comments '
+            + '(recommended: Repository Access Token with Pull requests: Write '
+            + 'and Repository: Read) and run inside a pull-requests pipeline '
+            + 'where BITBUCKET_PR_ID is available.'
+          : '';
       console.error(
         APP_PREFIX,
         pc.yellow('Bitbucket'),
         `Couldn't create Bitbucket report\n${err}.
       Request URL: ${commentsRequestURL}
-      Request data: ${body}`,
+      Request data: ${body}${scopeHint}`,
       );
     }
   }

package/src/pipe/html.js

@@ -230,8 +230,10 @@ class HtmlPipe {
       ];
 
       test.artifactsUploaded = allPossibleArtifacts.some(artifact => {
-        const link = artifact?.link || artifact?.path;
-        return link && (link.startsWith('http://') || link.startsWith('https://')) && !link.startsWith('file://');
+        let link = artifact?.link || artifact?.path;
+        if (!link) return false;
+        if (typeof link !== 'string') link = String(link);
+        return link.startsWith('http://') || link.startsWith('https://');
       });
 
       normalizeRetries(test);
@@ -1083,6 +1085,18 @@ function normalizeArtifacts(test) {
   return allArtifacts
     .map(artifact => {
       if (typeof artifact === 'string') {
+        if (/^https?:\/\//i.test(artifact)) {
+          const base = path.basename(new URL(artifact).pathname) || artifact;
+
+          return {
+            name: base,
+            title: base,
+            path: artifact,
+            fsPath: null,
+            relativePath: artifact,
+          };
+        }
+
         const abs = path.isAbsolute(artifact) ? artifact : path.resolve(process.cwd(), artifact);
         const href = artifact.startsWith('file://') ? artifact : fileUrl(abs, { resolve: true });
         const base = path.basename(abs);
@@ -1099,9 +1113,14 @@ function normalizeArtifacts(test) {
       if (artifact?.path) {
         const raw = String(artifact.path);
         const isFileUrl = raw.startsWith('file://');
-        const abs = isFileUrl ? null : path.isAbsolute(raw) ? raw : path.resolve(process.cwd(), raw);
-        const href = isFileUrl ? raw : fileUrl(abs, { resolve: true });
-        const base = abs ? path.basename(abs) : artifact.name || artifact.title || 'attachment';
+        const isHttpUrl = /^https?:\/\//i.test(raw);
+        const abs = isFileUrl || isHttpUrl ? null : path.isAbsolute(raw) ? raw : path.resolve(process.cwd(), raw);
+        const href = isFileUrl || isHttpUrl ? raw : fileUrl(abs, { resolve: true });
+        const base = abs
+          ? path.basename(abs)
+          : isHttpUrl
+            ? path.basename(new URL(raw).pathname) || artifact.name || artifact.title || 'attachment'
+            : artifact.name || artifact.title || 'attachment';
 
         return {
           ...artifact,

package/src/template/testomatio.hbs

@@ -741,6 +741,18 @@
             min-width: 0;
         }
 
+        .step-header {
+            display: flex;
+            align-items: center;
+            gap: 12px;
+            width: 100%;
+        }
+
+        .step-main {
+            flex: 1;
+            min-width: 0;
+        }
+
         .step-text {
             font-size: 14px;
             color: var(--gray-700);
@@ -755,6 +767,35 @@
             margin-top: 4px;
         }
 
+        .step-toggle {
+            width: 24px;
+            height: 24px;
+            border: none;
+            border-radius: 6px;
+            background: var(--gray-100);
+            color: var(--gray-600);
+            display: inline-flex;
+            align-items: center;
+            justify-content: center;
+            cursor: pointer;
+            flex-shrink: 0;
+            transition: var(--transition);
+            margin-top: 2px;
+        }
+
+        .step-toggle:hover {
+            background: var(--gray-200);
+            color: var(--gray-700);
+        }
+
+        .step-toggle.collapsed i {
+            transform: rotate(-90deg);
+        }
+
+        .step-toggle i {
+            transition: transform 0.2s ease;
+        }
+
         .step-status {
             width: 8px;
             height: 8px;
@@ -790,6 +831,10 @@
             padding-left: 0;
         }
 
+        .step-children.collapsed {
+            display: none;
+        }
+
         .step-children::before {
             content: '';
             position: absolute;
@@ -867,6 +912,30 @@
             border-left-color: var(--info-color);
         }
 
+        .message-block.passed {
+            border-left-color: var(--success-color);
+        }
+
+        .message-block.skipped,
+        .message-block.todo {
+            border-left-color: var(--warning-color);
+        }
+
+        .message-block.failed {
+            border-left-color: var(--danger-color);
+        }
+
+        .step-attachments {
+            display: grid;
+            grid-template-columns: repeat(auto-fit, minmax(160px, 1fr));
+            gap: 12px;
+            margin-top: 12px;
+        }
+
+        .step-attachments .attachment-item {
+            min-height: 120px;
+        }
+
         .metadata-grid {
             display: grid;
             grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
@@ -2377,6 +2446,11 @@
             const isTodo = statusClass === 'todo';
             const isSkippedOrTodo = statusClass === 'skipped' || statusClass === 'todo';
             const displayTime = isSkippedOrTodo ? '-' : formatDuration(test.run_time || 0);
+            const hasMessage = hasMeaningfulMessage(test.message);
+            const initialTab = getInitialTestTab({ isTodo, hasMessage, hasSteps: test.stepsArray?.length || test.steps });
+            const initialMessageClass = initialTab === 'message' ? ' active' : '';
+            const initialStepsClass = initialTab === 'steps' ? ' active' : '';
+            const initialInfoClass = initialTab === 'info' ? ' active' : '';
 
             testItem.innerHTML = `
                 <div class='test-header' onclick='toggleTest(this)'>
@@ -2411,14 +2485,14 @@
                 <div class='test-content'>
                     <div class='test-tabs'>
                         ${isTodo ? `
-                            <button class='test-tab active' onclick='showTestTab(this, \"info\")'>
+                            <button class='test-tab${initialInfoClass}' onclick='showTestTab(this, \"info\")'>
                                 <i class='fas fa-info-circle'></i> Info
                             </button>
                         ` : `
-                            <button class='test-tab active' onclick='showTestTab(this, \"steps\")'>
+                            <button class='test-tab${initialStepsClass}' onclick='showTestTab(this, \"steps\")'>
                                 <i class='fas fa-list-ol'></i> Steps
                             </button>
-                            <button class='test-tab' onclick='showTestTab(this, \"message\")'>
+                            <button class='test-tab${initialMessageClass}' onclick='showTestTab(this, \"message\")'>
                                 <i class='fas fa-comment-dots'></i> Message
                             </button>
                             ${hasStack ? `<button class='test-tab' onclick='showTestTab(this, \"stack\")'>
@@ -2439,7 +2513,7 @@
                         `}
                     </div>
                     ${isTodo ? `
-                        <div class='test-tab-content active' data-tab='info'>
+                        <div class='test-tab-content${initialInfoClass}' data-tab='info'>
                             <div class='todo-info'>
                                 <div class='todo-title'>
                                     <i class='fas fa-list-ul'></i>
@@ -2456,7 +2530,7 @@
                             </div>
                         </div>
                     ` : `
-                        <div class='test-tab-content active' data-tab='steps'>
+                        <div class='test-tab-content${initialStepsClass}' data-tab='steps'>
                             <div class='steps-container' id='steps-${index}'>
                                 ${(() => {
                                     const hasStepsArray = test.stepsArray && Array.isArray(test.stepsArray) && test.stepsArray.length > 0;
@@ -2476,7 +2550,7 @@
                                 })()}
                             </div>
                         </div>
-                        <div class='test-tab-content' data-tab='message'>
+                        <div class='test-tab-content${initialMessageClass}' data-tab='message'>
                             <div class='message-block ${statusClass}'>
                                 <strong>${statusClass.toUpperCase()}:</strong><br>
                                 ${test.message || 'No message available'}
@@ -2542,6 +2616,16 @@
             }
         }
 
+        function hasMeaningfulMessage(message) {
+            return typeof message === 'string' && message.trim().length > 0 && message !== 'No message available';
+        }
+
+        function getInitialTestTab({ isTodo, hasMessage }) {
+            if (isTodo) return 'info';
+            if (hasMessage) return 'message';
+            return 'steps';
+        }
+
         function parseStepsToHtml(stepsText) {
             if (!stepsText || stepsText === 'No steps recorded') {
                 return `<div class="step-item">
@@ -2629,25 +2713,33 @@
                     const status = step.status || 'passed';
                     const duration = step.duration || 0;
                     const category = step.category || '';
+                    const hasArtifacts = Array.isArray(step.artifacts) && step.artifacts.length > 0;
 
                     html += `
                         <div class="step-item step-level-${depth}" data-step-id="${stepId}">
-                            <div class="step-number">${stepNumber}</div>
                             <div class="step-content">
-                                <p class="step-text">${step.title || 'Untitled step'}</p>
-                                ${category && category !== 'user' ? `<div class="step-category">${category}</div>` : ''}
-                                <div class="step-time">
-                                    Step ${stepNumber}
-                                    ${duration > 0 ? `<span class="step-duration"><i class="fas fa-clock"></i> ${formatDuration(duration)}</span>` : ''}
+                                <div class="step-header">
+                                    <div class="step-number">${stepNumber}</div>
+                                    <div class="step-main">
+                                        <p class="step-text">${step.title || 'Untitled step'}</p>
+                                        ${category && category !== 'user' ? `<div class="step-category">${category}</div>` : ''}
+                                        ${duration > 0 ? `<div class="step-time"><span class="step-duration"><i class="fas fa-clock"></i> ${formatDuration(duration)}</span></div>` : ''}
+                                        ${hasArtifacts ? `<div class="step-attachments">${createAttachmentItems(step.artifacts)}</div>` : ''}
+                                    </div>
+                                    ${hasChildren ? `
+                                        <button class="step-toggle" type="button" aria-expanded="true" onclick="toggleStepChildren(this)">
+                                            <i class="fas fa-chevron-down"></i>
+                                        </button>
+                                    ` : ''}
+                                    <div class="step-status ${status}"></div>
                                 </div>
                             </div>
-                            <div class="step-status ${status}"></div>
                         </div>
                     `;
 
                     if (hasChildren) {
                         html += `
-                            <div class="step-children">
+                            <div class="step-children" data-parent-step-id="${stepId}">
                                 ${renderStepsTree(step.steps, depth + 1)}
                             </div>
                         `;
@@ -2673,19 +2765,38 @@
         function createStepHtml(text, number, status = null, category = null) {
             const statusClass = status || 'passed';
             const categoryText = category && category !== 'user' ? `<div class="step-category">${category}</div>` : '';
-            const durationIcon = status ? `<div class="step-duration"><i class="fas fa-clock"></i> auto</div>` : '';
+            const durationIcon = status ? `<div class="step-time"><span class="step-duration"><i class="fas fa-clock"></i> auto</span></div>` : '';
 
             return `<div class="step-item">
-                <div class="step-number">${number}</div>
                 <div class="step-content">
-                    <p class="step-text">${text}</p>
-                    ${categoryText}
-                    <div class="step-time">Step ${number}${durationIcon}</div>
+                    <div class="step-header">
+                        <div class="step-number">${number}</div>
+                        <div class="step-main">
+                            <p class="step-text">${text}</p>
+                            ${categoryText}
+                            ${durationIcon}
+                        </div>
+                        <div class="step-status ${statusClass}"></div>
+                    </div>
                 </div>
-                <div class="step-status ${statusClass}"></div>
             </div>`;
         }
 
+        function toggleStepChildren(button) {
+            const stepItem = button.closest('.step-item');
+            if (!stepItem) return;
+
+            const stepId = stepItem.getAttribute('data-step-id');
+            if (!stepId) return;
+
+            const children = stepItem.parentElement.querySelector(`.step-children[data-parent-step-id="${stepId}"]`);
+            if (!children) return;
+
+            const collapsed = children.classList.toggle('collapsed');
+            button.classList.toggle('collapsed', collapsed);
+            button.setAttribute('aria-expanded', collapsed ? 'false' : 'true');
+        }
+
         function createRetryAttempts(retries) {
             const attempts = Array.isArray(retries?.attempts) ? retries.attempts : [];
             if (!attempts.length) return '';

package/src/utils/utils.js

@@ -289,11 +289,6 @@ const fetchSourceCode = (contents, opts = {}) => {
       if (lineIndex === -1) lineIndex = lines.findIndex(l => l.includes(`@DisplayName("${title}`));
       if (lineIndex === -1) lineIndex = lines.findIndex(l => l.includes(`public void ${title}`));
       if (lineIndex === -1) lineIndex = lines.findIndex(l => l.includes(`${title}(`));
-    } else if (opts.lang === 'kotlin') {
-      lineIndex = lines.findIndex(l => l.includes(`fun test${title}`));
-      if (lineIndex === -1) lineIndex = lines.findIndex(l => l.includes(`@DisplayName("${title}`));
-      if (lineIndex === -1) lineIndex = lines.findIndex(l => l.includes(`fun ${title}`));
-      if (lineIndex === -1) lineIndex = lines.findIndex(l => l.includes(`${title}(`));
     } else if (opts.lang === 'csharp') {
       // Find the method declaration line
       let methodLineIndex = lines.findIndex(l => l.includes(`public void ${title}(`));

package/src/xmlReader.js

@@ -769,17 +769,20 @@ function reduceTestCases(prev, item) {
 
 function processTestSuite(testsuite) {
   if (!testsuite) return [];
-  if (testsuite.testsuite) return processTestSuite(testsuite.testsuite);
+  if (testsuite.testsuite && !testsuite.testcase) return processTestSuite(testsuite.testsuite);
   if (testsuite['test-suite'] && !testsuite['test-case']) return processTestSuite(testsuite['test-suite']);
 
   let suites = testsuite;
-  if (!Array.isArray(testsuite)) {
-    suites = [testsuite];
-  }
+  if (!Array.isArray(testsuite)) suites = [testsuite];
 
-  const subSuites = suites.filter(s => s['test-suite'] && !testsuite['test-case']);
+  const subSuites = suites.filter(
+    s => (s['test-suite'] || s.testsuite) && !(s['test-case'] || s.testcase),
+  );
 
-  return [...subSuites.map(s => processTestSuite(s['test-suite'])), ...suites.reduce(reduceTestCases, [])].flat();
+  return [
+    ...suites.reduce(reduceTestCases, []),
+    ...subSuites.map(s => processTestSuite(s['test-suite'] || s.testsuite)),
+  ].flat();
 }
 
 function fetchProperties(item) {

package/lib/allureReader.d.ts

@@ -1,65 +0,0 @@
-export default AllureReader;
-declare class AllureReader {
-    constructor(opts?: {});
-    requestParams: {
-        apiKey: any;
-        url: any;
-        title: string;
-        env: string;
-        group_title: string;
-        isBatchEnabled: boolean;
-    };
-    runId: any;
-    opts: {};
-    withPackage: any;
-    store: {};
-    pipesPromise: Promise<any[]>;
-    _tests: any[];
-    stats: {};
-    suites: {};
-    uploader: S3Uploader;
-    version: any;
-    set tests(value: any[]);
-    get tests(): any[];
-    createRun(): Promise<any[]>;
-    pipes: any;
-    parse(resultsPattern: any): {};
-    parseContainerFiles(containerFiles: any): void;
-    processAllureResult(result: any, resultsDir: any): {
-        rid: any;
-        title: any;
-        status: any;
-        suite_title: any;
-        file: string;
-        run_time: number;
-        steps: any;
-        message: any;
-        stack: any;
-        meta: {};
-        links: {
-            label: string;
-        }[];
-        artifacts: any[];
-        create: boolean;
-        overwrite: boolean;
-    };
-    mapStatus(status: any): any;
-    extractSuiteTitle(result: any): any;
-    stripNamespace(suiteName: any): any;
-    extractFile(result: any): string;
-    getFileExtension(result: any): any;
-    extractMeta(result: any): {};
-    extractLinks(result: any): {
-        label: string;
-    }[];
-    convertSteps(steps: any, depth?: number): any;
-    calculateRunTime(item: any): number;
-    convertParameters(parameters: any): {};
-    combineRetryAttempts(attempts: any): any;
-    calculateStats(): {};
-    fetchSourceCode(): void;
-    getLanguage(): any;
-    uploadArtifacts(): Promise<void>;
-    uploadData(): Promise<any[]>;
-}
-import { S3Uploader } from './uploader.js';