@testomatio/reporter 2.3.7-beta.3-xml-import → 2.3.7-beta.5-stack-artifacts

package/README.md

@@ -13,7 +13,7 @@ Testomat.io Reporter (this npm package) supports:
 - 🔎 [Stack traces](./docs/stacktrace.md) and error messages
 - 🐙 [GitHub](./docs/pipes/github.md), [GitLab](./docs/pipes/gitlab.md) & [Bitbucket](./docs/pipes/bitbucket.md) integration
 - 🚅 Realtime reports
-- 🗃️ Other test frameworks supported via [JUnit XML](./docs/junit.md) with [XML import configuration](./docs/xml-imports.md)
+- 🗃️ Other test frameworks supported via [JUNit XML](./docs/junit.md)
 - 🚶‍♀️ Steps _(work in progress)_
 - 📄 [Logger](./docs/logger.md) _(work in progress, supports Jest for now)_
 - ☁️ Custom properties and metadata _(work in progress)_

package/lib/bin/cli.js

@@ -145,7 +145,7 @@ program
     .option('--lang <lang>', 'Language used (python, ruby, java)')
     .option('--timelimit <time>', 'default time limit in seconds to kill a stuck process')
     .action(async (pattern, opts) => {
-    if (!pattern.endsWith('.xml') && !pattern.includes('*')) {
+    if (!pattern.endsWith('.xml')) {
         pattern += '.xml';
     }
     let { javaTests, lang } = opts;

package/lib/bin/reportXml.js

@@ -25,7 +25,7 @@ program
     .option('--timelimit <time>', 'default time limit in seconds to kill a stuck process')
     .option('--env-file <envfile>', 'Load environment variables from env file')
     .action(async (pattern, opts) => {
-    if (!pattern.endsWith('.xml') && !pattern.includes('*')) {
+    if (!pattern.endsWith('.xml')) {
         pattern += '.xml';
     }
     let { javaTests, lang } = opts;
@@ -37,10 +37,7 @@ program
     lang = lang?.toLowerCase();
     if (javaTests === true || (lang === 'java' && !javaTests))
         javaTests = 'src/test/java';
-    const runReader = new xmlReader_js_1.default({
-        javaTests,
-        lang,
-    });
+    const runReader = new xmlReader_js_1.default({ javaTests, lang });
     const files = glob_1.glob.sync(pattern, { cwd: opts.dir || process.cwd() });
     if (!files.length) {
         console.log(constants_js_1.APP_PREFIX, `Report can't be created. No XML files found 😥`);

package/lib/client.js

@@ -70,8 +70,8 @@ class Client {
         this.pipeStore = {};
         this.runId = '';
         this.queue = Promise.resolve();
-        // Get package.json path - use a simple approach that works in both environments
-        const pathToPackageJSON = path_1.default.join(process.cwd(), 'package.json');
+        // @ts-ignore this line will be removed in compiled code, because __dirname is defined in commonjs
+        const pathToPackageJSON = path_1.default.join(__dirname, '../package.json');
         try {
             this.version = JSON.parse(fs_1.default.readFileSync(pathToPackageJSON).toString()).version;
             console.log(constants_js_1.APP_PREFIX, `Testomatio Reporter v${this.version}`);
@@ -329,11 +329,7 @@ class Client {
      */
     formatLogs({ error, steps, logs }) {
         error = error?.trim();
-        logs = logs
-            ?.trim()
-            .split('\n')
-            .map(l => (0, utils_js_1.truncate)(l))
-            .join('\n');
+        logs = logs?.trim().split('\n').map(l => (0, utils_js_1.truncate)(l)).join('\n');
         if (Array.isArray(steps)) {
             steps = steps
                 .map(step => (0, utils_js_1.formatStep)(step))

package/lib/junit-adapter/csharp.d.ts

@@ -1,4 +1,5 @@
 export default CSharpAdapter;
 declare class CSharpAdapter extends Adapter {
+    getFilePath(t: any): string;
 }
 import Adapter from './adapter.js';

package/lib/junit-adapter/csharp.js

@@ -7,57 +7,24 @@ const path_1 = __importDefault(require("path"));
 const adapter_js_1 = __importDefault(require("./adapter.js"));
 class CSharpAdapter extends adapter_js_1.default {
     formatTest(t) {
-        // Extract example from title if not already present
-        if (!t.example) {
-            const exampleMatch = t.title.match(/\((.*?)\)/);
-            if (exampleMatch) {
-                // Extract parameters as object with numeric keys for API
-                const params = exampleMatch[1].split(',').map(param => param.trim());
-                t.example = {};
-                params.forEach((param, index) => {
-                    t.example[index] = param;
-                });
-            }
-        }
-        // Remove parameters from title to avoid duplicates in Test Suite
-        // The example field will be used for grouping on import
-        t.title = t.title.replace(/\(.*?\)/, '').trim();
+        const title = t.title.replace(/\(.*?\)/, '').trim();
+        const example = t.title.match(/\((.*?)\)/);
+        if (example)
+            t.example = { ...example[1].split(',') };
         const suite = t.suite_title.split('.');
         t.suite_title = suite.pop();
         t.file = namespaceToFileName(t.file);
+        t.title = title.trim();
         return t;
     }
     getFilePath(t) {
-        if (!t.file)
-            return null;
-        // Normalize path separators for cross-platform compatibility
-        let filePath = t.file.replace(/\\/g, '/');
-        // If file already has .cs extension, use it directly
-        if (filePath.endsWith('.cs')) {
-            // Make relative path if it's absolute
-            if (path_1.default.isAbsolute(filePath)) {
-                // Try to find project-relative path
-                const cwd = process.cwd().replace(/\\/g, '/');
-                if (filePath.startsWith(cwd)) {
-                    filePath = path_1.default.relative(cwd, filePath).replace(/\\/g, '/');
-                }
-            }
-            return filePath;
-        }
-        // Convert namespace path to file path
-        const fileName = namespaceToFileName(filePath);
+        const fileName = namespaceToFileName(t.file);
         return fileName;
     }
 }
 module.exports = CSharpAdapter;
 function namespaceToFileName(fileName) {
-    if (!fileName)
-        return '';
-    // If already a .cs file path, clean it up
-    if (fileName.endsWith('.cs')) {
-        return fileName.replace(/\\/g, '/');
-    }
     const fileParts = fileName.split('.');
     fileParts[fileParts.length - 1] = fileParts[fileParts.length - 1]?.replace(/\$.*/, '');
-    return `${fileParts.join('/')}.cs`;
+    return `${fileParts.join(path_1.default.sep)}.cs`;
 }

package/lib/pipe/debug.js

@@ -18,7 +18,7 @@ class DebugPipe {
         this.isEnabled = !!process.env.TESTOMATIO_DEBUG || !!process.env.DEBUG;
         if (this.isEnabled) {
             this.batch = {
-                isEnabled: this.params.isBatchEnabled ?? (process.env.TESTOMATIO_DISABLE_BATCH_UPLOAD ? false : true),
+                isEnabled: this.params.isBatchEnabled ?? !process.env.TESTOMATIO_DISABLE_BATCH_UPLOAD ?? true,
                 intervalFunction: null,
                 intervalTime: 5000,
                 tests: [],

package/lib/pipe/testomatio.js

@@ -23,7 +23,7 @@ if (process.env.TESTOMATIO_RUN)
 class TestomatioPipe {
     constructor(params, store) {
         this.batch = {
-            isEnabled: params?.isBatchEnabled ?? (process.env.TESTOMATIO_DISABLE_BATCH_UPLOAD ? false : true),
+            isEnabled: params?.isBatchEnabled ?? !process.env.TESTOMATIO_DISABLE_BATCH_UPLOAD ?? true,
             intervalFunction: null, // will be created in createRun by setInterval function
             intervalTime: 5000, // how often tests are sent
             tests: [], // array of tests in batch
@@ -60,7 +60,7 @@ class TestomatioPipe {
                 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 => {
+                shouldRetry: (error) => {
                     if (!error.response)
                         return false;
                     switch (error.response?.status) {
@@ -73,8 +73,8 @@ class TestomatioPipe {
                             break;
                     }
                     return error.response?.status >= 401; // Retry on 401+ and 5xx
-                },
-            },
+                }
+            }
         });
         this.isEnabled = true;
         // do not finish this run (for parallel testing)
@@ -193,7 +193,7 @@ class TestomatioPipe {
                 method: 'PUT',
                 url: `/api/reporter/${this.runId}`,
                 data: runParams,
-                responseType: 'json',
+                responseType: 'json'
             });
             if (resp.data.artifacts)
                 (0, pipe_utils_js_1.setS3Credentials)(resp.data.artifacts);
@@ -206,7 +206,7 @@ class TestomatioPipe {
                 url: '/api/reporter',
                 data: runParams,
                 maxContentLength: Infinity,
-                responseType: 'json',
+                responseType: 'json'
             });
             this.runId = resp.data.uid;
             this.runUrl = `${this.url}/${resp.data.url.split('/').splice(3).join('/')}`;
@@ -259,17 +259,15 @@ class TestomatioPipe {
         this.#formatData(data);
         const json = json_cycle_1.default.stringify(data);
         debug('Adding test', json);
-        return this.client
-            .request({
+        return this.client.request({
             method: 'POST',
             url: `/api/reporter/${this.runId}/testrun`,
             data: json,
             headers: {
                 'Content-Type': 'application/json',
             },
-            maxContentLength: Infinity,
-        })
-            .catch(err => {
+            maxContentLength: Infinity
+        }).catch(err => {
             this.requestFailures++;
             this.notReportedTestsCount++;
             if (err.response) {
@@ -314,21 +312,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.client
-            .request({
+        return this.client.request({
             method: 'POST',
             url: `/api/reporter/${this.runId}/testrun`,
             data: {
                 api_key: this.apiKey,
                 tests: testsToSend,
-                batch_index: this.batch.batchIndex,
+                batch_index: this.batch.batchIndex
             },
             headers: {
                 'Content-Type': 'application/json',
             },
-            maxContentLength: Infinity,
-        })
-            .catch(err => {
+            maxContentLength: Infinity
+        }).catch(err => {
             this.requestFailures++;
             this.notReportedTestsCount += testsToSend.length;
             if (err.response) {
@@ -412,7 +408,7 @@ class TestomatioPipe {
                         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));

package/lib/uploader.js

@@ -170,10 +170,6 @@ class S3Uploader {
         if (typeof filePath === 'string' && !path_1.default.isAbsolute(filePath)) {
             filePath = path_1.default.join(process.cwd(), filePath);
         }
-        // Normalize path separators for cross-platform compatibility
-        if (typeof filePath === 'string') {
-            filePath = filePath.replace(/\\/g, '/');
-        }
         const data = { rid, file: filePath, uploaded };
         const jsonLine = `${JSON.stringify(data)}\n`;
         fs_1.default.appendFileSync(tempFilePath, jsonLine);

package/lib/utils/utils.js

@@ -122,8 +122,12 @@ const fetchFilesFromStackTrace = (stack = '', checkExists = true) => {
         .map(f => f[1].trim())
         .map(f => f.replace(/^\/+/, '/').replace(/^\/([A-Za-z]:)/, '$1')) // Remove extra slashes, handle Windows paths
         .map(f => {
-        // Normalize path separators for cross-platform compatibility
-        return f.replace(/\\/g, '/');
+        // Convert Windows paths to Linux paths for testing purposes
+        if (f.match(/^[A-Za-z]:[\\\/]/)) {
+            // Convert Windows path to Linux equivalent for test scenarios
+            return f.replace(/^[A-Za-z]:[\\\/]/, '/').replace(/\\/g, '/');
+        }
+        return f;
     });
     debug('Found files in stack trace: ', files);
     return files.filter(f => {
@@ -170,8 +174,6 @@ exports.fetchSourceCodeFromStackTrace = fetchSourceCodeFromStackTrace;
 exports.TEST_ID_REGEX = /@T([\w\d]{8})/;
 exports.SUITE_ID_REGEX = /@S([\w\d]{8})/;
 const fetchIdFromCode = (code, opts = {}) => {
-    if (!code)
-        return null;
     const comments = code
         .split('\n')
         .map(l => l.trim())
@@ -214,58 +216,10 @@ const fetchSourceCode = (contents, opts = {}) => {
                 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}(`));
-            if (methodLineIndex === -1) {
-                methodLineIndex = lines.findIndex(l => l.includes(`public async Task ${title}(`));
-            }
-            if (methodLineIndex === -1) {
-                methodLineIndex = lines.findIndex(l => l.includes(`${title}(`));
-            }
-            // If found, scan upwards to find [TestCase], [Test] attributes and XML comments
-            if (methodLineIndex !== -1) {
-                lineIndex = methodLineIndex;
-                // Scan upwards to find the start of attributes and comments
-                for (let i = methodLineIndex - 1; i >= 0; i--) {
-                    const trimmedLine = lines[i].trim();
-                    // Include [TestCase], [Test], and other attributes
-                    if (trimmedLine.startsWith('[')) {
-                        lineIndex = i;
-                        continue;
-                    }
-                    // Include XML documentation comments
-                    if (trimmedLine.startsWith('///')) {
-                        lineIndex = i;
-                        continue;
-                    }
-                    // Stop at empty lines (with some tolerance)
-                    if (trimmedLine === '') {
-                        // Check if next non-empty line is an attribute or comment
-                        let hasMoreAttributes = false;
-                        for (let j = i - 1; j >= 0; j--) {
-                            const nextTrimmed = lines[j].trim();
-                            if (nextTrimmed === '')
-                                continue;
-                            if (nextTrimmed.startsWith('[') || nextTrimmed.startsWith('///')) {
-                                hasMoreAttributes = true;
-                                lineIndex = j;
-                            }
-                            break;
-                        }
-                        if (!hasMoreAttributes)
-                            break;
-                        continue;
-                    }
-                    // Stop at other method declarations or class-level elements
-                    if (trimmedLine.includes('public ') ||
-                        trimmedLine.includes('private ') ||
-                        trimmedLine.includes('protected ') ||
-                        trimmedLine.includes('internal ')) {
-                        if (!trimmedLine.startsWith('['))
-                            break;
-                    }
-                }
-            }
+            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));
@@ -274,28 +228,11 @@ const fetchSourceCode = (contents, opts = {}) => {
     if (opts.prepend) {
         lineIndex -= opts.prepend;
     }
-    if (lineIndex !== -1 && lineIndex !== undefined) {
+    if (lineIndex) {
         const result = [];
-        let braceDepth = 0; // Track brace depth for C# methods
-        let methodStartFound = false; // Flag to indicate we've found the method opening brace
         for (let i = lineIndex; i < lineIndex + limit; i++) {
             if (lines[i] === undefined)
                 continue;
-            // Track brace depth for C# to stop after method closes
-            if (opts.lang === 'csharp') {
-                const line = lines[i];
-                // Count opening and closing braces
-                const openBraces = (line.match(/\{/g) || []).length;
-                const closeBraces = (line.match(/\}/g) || []).length;
-                if (openBraces > 0)
-                    methodStartFound = true;
-                braceDepth += openBraces - closeBraces;
-                // If we've started the method and depth returns to 0, method is complete
-                if (methodStartFound && braceDepth === 0 && closeBraces > 0) {
-                    result.push(lines[i]);
-                    break;
-                }
-            }
             if (i > lineIndex + 2 && !opts.prepend) {
                 // annotation
                 if (opts.lang === 'php' && lines[i].trim().startsWith('#['))
@@ -334,22 +271,6 @@ const fetchSourceCode = (contents, opts = {}) => {
                     break;
                 if (opts.lang === 'java' && lines[i].includes(' class '))
                     break;
-                // For C#, additional checks if brace tracking didn't stop us
-                if (opts.lang === 'csharp') {
-                    const trimmed = lines[i].trim();
-                    // Stop at attribute that marks beginning of next test
-                    if (trimmed.match(/^\[(Test|TestCase|Theory|Fact)/))
-                        break;
-                    // Stop at XML documentation comments that belong to next method
-                    if (trimmed.startsWith('///'))
-                        break;
-                    // Stop at another method declaration
-                    if (trimmed.match(/^\s*(public|private|protected|internal)\s+(\w+|async\s+\w+)\s+\w+\s*\(/))
-                        break;
-                    // Stop at class declaration
-                    if (trimmed.includes(' class ') && trimmed.includes('public'))
-                        break;
-                }
             }
             result.push(lines[i]);
         }

package/lib/xmlReader.d.ts

@@ -19,11 +19,25 @@ declare class XmlReader {
     tests: any[];
     stats: {};
     uploader: S3Uploader;
-    enhancedNunit: boolean;
-    groupParameterized: boolean;
     version: any;
     connectAdapter(): import("./junit-adapter/adapter.js").default;
-    parse(fileName: any): any;
+    parse(fileName: any): {
+        status: string;
+        create_tests: boolean;
+        tests_count: number;
+        passed_count: number;
+        skipped_count: number;
+        failed_count: number;
+        tests: any;
+    } | {
+        status: any;
+        create_tests: boolean;
+        tests_count: number;
+        passed_count: number;
+        failed_count: number;
+        skipped_count: number;
+        tests: any[];
+    };
     processJUnit(jsonSuite: any): {
         create_tests: boolean;
         duration: number;
@@ -35,14 +49,15 @@ declare class XmlReader {
         tests: any[];
         tests_count: number;
     };
-    processNUnit(jsonSuite: any): any;
-    /**
-     * Check if the XML is actually NUnit format (has test-suite hierarchy)
-     * @param {Object} jsonSuite - Parsed XML suite object
-     * @returns {boolean} - True if this is NUnit XML format
-     */
-    isNUnitXml(jsonSuite: any): boolean;
-    processNUnitEnhanced(jsonSuite: any): any;
+    processNUnit(jsonSuite: any): {
+        status: any;
+        create_tests: boolean;
+        tests_count: number;
+        passed_count: number;
+        failed_count: number;
+        skipped_count: number;
+        tests: any[];
+    };
     processTRX(jsonSuite: any): {
         status: string;
         create_tests: boolean;
@@ -52,27 +67,6 @@ declare class XmlReader {
         failed_count: number;
         tests: any;
     };
-    _parseTRXTestDefinition(td: any): {
-        title: any;
-        example: any;
-        file: string;
-        description: any;
-        suite_title: any;
-        id: any;
-    };
-    _parseTRXTestResult(td: any, tests: any): {
-        suite_title: any;
-        title: any;
-        file: any;
-        description: any;
-        code: any;
-        run_time: number;
-        stack: any;
-        files: any;
-        create: boolean;
-        overwrite: boolean;
-    };
-    _mapTRXStatus(outcome: any): string;
     processXUnit(assemblies: any): {
         status: string;
         create_tests: boolean;