@testomatio/reporter 2.3.9-beta-bin-fix → 2.3.9

package/lib/xmlReader.js

@@ -11,6 +11,7 @@ const fast_xml_parser_1 = require("fast-xml-parser");
 const constants_js_1 = require("./constants.js");
 const crypto_1 = require("crypto");
 const url_1 = require("url");
+const nunit_parser_js_1 = require("./junit-adapter/nunit-parser.js");
 const utils_js_1 = require("./utils/utils.js");
 const index_js_1 = require("./pipe/index.js");
 const index_js_2 = __importDefault(require("./junit-adapter/index.js"));
@@ -20,7 +21,7 @@ const uploader_js_1 = require("./uploader.js");
 const debug = (0, debug_1.default)('@testomatio/reporter:xml');
 const ridRunId = (0, crypto_1.randomUUID)();
 const TESTOMATIO_URL = process.env.TESTOMATIO_URL || 'https://app.testomat.io';
-const { TESTOMATIO_RUNGROUP_TITLE, TESTOMATIO_SUITE, TESTOMATIO_MAX_STACK_TRACE, TESTOMATIO_TITLE, TESTOMATIO_ENV, TESTOMATIO_RUN, TESTOMATIO_MARK_DETACHED, } = process.env;
+const { TESTOMATIO_RUNGROUP_TITLE, TESTOMATIO_SUITE, TESTOMATIO_MAX_STACK_TRACE, TESTOMATIO_TITLE, TESTOMATIO_ENV, TESTOMATIO_RUN, TESTOMATIO_MARK_DETACHED, TESTOMATIO_LEGACY_NUNIT, } = process.env;
 const options = {
     ignoreDeclaration: true,
     ignoreAttributes: false,
@@ -54,6 +55,10 @@ class XmlReader {
         this.stats = {};
         this.stats.language = opts.lang?.toLowerCase();
         this.uploader = new uploader_js_1.S3Uploader();
+        // Enhanced NUnit parsing - enabled by default for NUnit XML
+        // Can be disabled via opts.enhancedNunit = false or TESTOMATIO_LEGACY_NUNIT=1
+        this.enhancedNunit = !(0, utils_js_1.transformEnvVarToBoolean)(TESTOMATIO_LEGACY_NUNIT);
+        this.groupParameterized = opts.groupParameterized !== false; // Default true, can be disabled
         // @ts-ignore
         const packageJsonPath = path_1.default.resolve(__dirname, '..', 'package.json');
         this.version = JSON.parse(fs_1.default.readFileSync(packageJsonPath).toString()).version;
@@ -102,7 +107,8 @@ class XmlReader {
         return this.processJUnit(jsonSuite);
     }
     processJUnit(jsonSuite) {
-        const { testsuite, name, tests, failures, errors } = jsonSuite;
+        const { testsuite, name, failures, errors } = jsonSuite;
+        const tests = testsuite?.tests || jsonSuite.tests;
         reduceOptions.preferClassname = this.stats.language === 'python';
         const resultTests = processTestSuite(testsuite);
         const hasFailures = resultTests.filter(t => t.status === 'failed').length > 0;
@@ -128,6 +134,13 @@ class XmlReader {
         };
     }
     processNUnit(jsonSuite) {
+        // Use enhanced NUnit parser if enabled and this is actually NUnit XML
+        if (this.enhancedNunit && this.isNUnitXml(jsonSuite)) {
+            debug('Using enhanced NUnit parser');
+            return this.processNUnitEnhanced(jsonSuite);
+        }
+        // Fallback to legacy parser for backward compatibility
+        debug('Using legacy NUnit parser');
         const { result, total, passed, failed, inconclusive, skipped } = jsonSuite;
         reduceOptions.preferClassname = this.stats.language === 'python';
         const resultTests = processTestSuite(jsonSuite['test-suite']);
@@ -142,65 +155,58 @@ class XmlReader {
             tests: resultTests,
         };
     }
+    /**
+     * 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) {
+        // NUnit XML has test-suite elements with type attributes
+        if (jsonSuite['test-suite']) {
+            const testSuite = Array.isArray(jsonSuite['test-suite']) ? jsonSuite['test-suite'][0] : jsonSuite['test-suite'];
+            // Check for NUnit-specific test-suite types
+            return (testSuite &&
+                testSuite.type &&
+                ['Assembly', 'TestSuite', 'TestFixture', 'ParameterizedMethod'].includes(testSuite.type));
+        }
+        return false;
+    }
+    processNUnitEnhanced(jsonSuite) {
+        debug('Processing NUnit XML with enhanced parser');
+        try {
+            const nunitParser = new nunit_parser_js_1.NUnitXmlParser({
+                groupParameterized: this.groupParameterized,
+                ...this.opts,
+            });
+            const result = nunitParser.parseTestRun(jsonSuite);
+            // Add parsed tests to our collection
+            this.tests = this.tests.concat(result.tests);
+            debug(`Enhanced NUnit parser processed ${result.tests.length} tests`);
+            return result;
+        }
+        catch (error) {
+            debug('Enhanced NUnit parser failed, falling back to legacy parser:', error.message);
+            console.warn(`${constants_js_1.APP_PREFIX} Enhanced NUnit parsing failed, using legacy parser: ${error.message}`);
+            // Fallback to legacy parser
+            this.enhancedNunit = false;
+            return this.processNUnit(jsonSuite);
+        }
+    }
     processTRX(jsonSuite) {
         let defs = jsonSuite?.TestRun?.TestDefinitions?.UnitTest;
         if (!Array.isArray(defs))
             defs = [defs].filter(d => !!d);
-        const tests = defs.map(td => {
-            const title = td.name.replace(/\(.*?\)/, '').trim();
-            let example = td.name.match(/\((.*?)\)/);
-            if (example)
-                example = { ...example[1].split(',') };
-            const suite = td.TestMethod.className.split(', ')[0].split('.');
-            const suite_title = suite.pop();
-            return {
-                title,
-                example,
-                file: suite.join('/'),
-                description: td.Description,
-                suite_title,
-                id: td.Execution.id,
-            };
-        }) || [];
+        // Parse test definitions
+        const tests = defs.map(td => this._parseTRXTestDefinition(td));
+        // Parse test results
         let result = jsonSuite?.TestRun?.Results?.UnitTestResult;
         if (!Array.isArray(result))
             result = [result].filter(d => !!d);
-        const results = result.map(td => ({
-            id: td.executionId,
-            // seconds are used in junit reports, but ms are used by testomatio
-            run_time: parseFloat(td.duration) * 1000,
-            status: td.outcome,
-            stack: td.Output.StdOut,
-            files: td?.ResultFiles?.ResultFile?.map(rf => rf.path),
-        }));
-        results.forEach(r => {
-            const test = tests.find(t => t.id === r.id) || {};
-            r.suite_title = test.suite_title;
-            r.title = test.title?.trim();
-            if (test.code)
-                r.code = test.code;
-            if (test.description)
-                r.description = test.description;
-            if (test.example)
-                r.example = test.example;
-            if (test.file)
-                r.file = test.file;
-            r.create = true;
-            r.overwrite = true;
-            if (r.status === 'Passed')
-                r.status = constants_js_1.STATUS.PASSED;
-            if (r.status === 'Failed')
-                r.status = constants_js_1.STATUS.FAILED;
-            if (r.status === 'Skipped')
-                r.status = constants_js_1.STATUS.SKIPPED;
-            delete r.id;
-        });
+        const results = result.map(td => this._parseTRXTestResult(td, tests));
         debug(results);
         const counters = jsonSuite?.TestRun?.ResultSummary?.Counters || {};
         const failed_count = parseInt(counters.failed, 10) + parseInt(counters.error, 10);
-        let status = constants_js_1.STATUS.PASSED.toString();
-        if (failed_count > 0)
-            status = constants_js_1.STATUS.FAILED;
+        const status = failed_count > 0 ? constants_js_1.STATUS.FAILED : constants_js_1.STATUS.PASSED.toString();
         this.tests = results.filter(t => !!t.title);
         return {
             status,
@@ -212,6 +218,64 @@ class XmlReader {
             tests: results,
         };
     }
+    _parseTRXTestDefinition(td) {
+        const title = td.name.replace(/\(.*?\)/, '').trim();
+        const exampleMatch = td.name.match(/\((.*?)\)/);
+        const example = exampleMatch
+            ? {
+                ...exampleMatch[1]
+                    .split(',')
+                    .map(p => p.trim())
+                    .filter(p => p !== ''),
+            }
+            : null;
+        const suite = td.TestMethod.className.split(', ')[0].split('.');
+        const suite_title = suite.pop();
+        // Convert namespace to file path for C#
+        const file = `${suite.join('/')}.cs`;
+        return {
+            title, // Base name without parameters for test import
+            example, // Parameters object for parameterized tests
+            file, // File path with .cs extension
+            description: td.Description,
+            suite_title,
+            id: td.Execution.id,
+        };
+    }
+    _parseTRXTestResult(td, tests) {
+        const test = tests.find(t => t.id === td.executionId) || {};
+        const result = {
+            suite_title: test.suite_title,
+            title: test.title?.trim(),
+            file: test.file,
+            description: test.description,
+            code: test.code,
+            run_time: parseFloat(td.duration) * 1000,
+            stack: td.Output?.StdOut || '',
+            files: td?.ResultFiles?.ResultFile?.map(rf => rf.path),
+            create: true,
+            overwrite: true,
+        };
+        // Add example for parameterized tests
+        if (test.example) {
+            result.example = test.example;
+        }
+        // Map TRX status to Testomat.io status
+        result.status = this._mapTRXStatus(td.outcome);
+        return result;
+    }
+    _mapTRXStatus(outcome) {
+        switch (outcome) {
+            case 'Passed':
+                return constants_js_1.STATUS.PASSED;
+            case 'Failed':
+                return constants_js_1.STATUS.FAILED;
+            case 'Skipped':
+                return constants_js_1.STATUS.SKIPPED;
+            default:
+                return constants_js_1.STATUS.PASSED;
+        }
+    }
     processXUnit(assemblies) {
         const tests = [];
         assemblies = Array.isArray(assemblies.assembly) ? assemblies.assembly : [assemblies.assembly];
@@ -459,7 +523,12 @@ function reduceTestCases(prev, item) {
         tags ||= [];
         const exampleMatches = testCaseItem.name?.match(/\S\((.*?)\)/);
         if (exampleMatches) {
-            example = { ...exampleMatches[1].split(',').map(v => v.trim().replace(/[^\w\s-]/g, '')) };
+            example = {
+                ...exampleMatches[1]
+                    .split(',')
+                    .map(v => v.trim().replace(/[^\w\s-]/g, ''))
+                    .filter(v => v !== ''),
+            };
             title = title.replace(/\(.*?\)/, '').trim();
         }
         stack = `${testCaseItem['system-out'] || testCaseItem.output || testCaseItem.log || ''}\n\n${stack}\n\n${suiteOutput}\n\n${suiteErr}`.trim();

package/package.json

@@ -1,11 +1,13 @@
 {
   "name": "@testomatio/reporter",
-  "version": "2.3.9-beta-bin-fix",
+  "version": "2.3.9",
   "description": "Testomatio Reporter Client",
   "engines": {
     "node": ">=18"
   },
-  "typings": "typings/index.d.ts",
+  "main": "lib/reporter.js",
+  "module": "src/reporter.js",
+  "types": "types/types.d.ts",
   "repository": "git@github.com:testomatio/reporter.git",
   "author": "Michael Bodnarchuk <davert@testomat.io>,Koushik Mohan <koushikmohan1996@gmail.com>",
   "license": "MIT",
@@ -45,7 +47,8 @@
     "bin",
     "lib",
     "src",
-    "testcafe"
+    "testcafe",
+    "types"
   ],
   "scripts": {
     "clear-exportdir": "rm -rf export/",
@@ -57,7 +60,8 @@
     "test": "mocha 'tests/unit/**/*_test.js'",
     "test:playwright": "mocha tests/adapter/playwright.test.js",
     "test:codecept": "mocha tests/adapter/codecept.test.js tests/adapter/codecept_comprehensive.test.js tests/adapter/codecept_steps_sections.test.js",
-    "test:frameworks": "npm run test:playwright && npm run test:codecept",
+    "test:vitest": "mocha tests/adapter/vitest.test.js",
+    "test:frameworks": "npm run test:playwright && npm run test:codecept && npm run test:vitest",
     "test:all": "npm run test && npm run test:frameworks",
     "test:adapters": "mocha tests/adapter/*.test.js",
     "test:codecept:bug948": "mocha tests/adapter/codecept_aftersuite_failure.test.js",

package/src/adapter/codecept.js

@@ -17,12 +17,15 @@ if (!global.codeceptjs) {
 // @ts-ignore
 const { event, recorder, codecept, output } = global.codeceptjs;
 
-const [, MAJOR_VERSION, MINOR_VERSION] = codecept.version().match(/(\d+)\.(\d+)/).map(Number);
+const [, MAJOR_VERSION, MINOR_VERSION] = codecept
+  .version()
+  .match(/(\d+)\.(\d+)/)
+  .map(Number);
 
 // Constants for hook execution order
 const HOOK_EXECUTION_ORDER = {
   PRE_TEST: ['BeforeSuiteHook', 'BeforeHook'],
-  POST_TEST: ['AfterHook', 'AfterSuiteHook']
+  POST_TEST: ['AfterHook', 'AfterSuiteHook'],
 };
 
 // codeceptjs workers are self-contained
@@ -35,7 +38,9 @@ if (MAJOR_VERSION < 3) {
 }
 
 if (MAJOR_VERSION === 3 && MINOR_VERSION < 7) {
-  console.log('🔴 CodeceptJS 3.7+ is supported, please upgrade CodeceptJS or use 1.6 version of `@testomatio/reporter`');
+  console.log(
+    '🔴 CodeceptJS 3.7+ is supported, please upgrade CodeceptJS or use 1.6 version of `@testomatio/reporter`',
+  );
 }
 
 function CodeceptReporter(config) {
@@ -57,18 +62,18 @@ function CodeceptReporter(config) {
     say: output.say,
   };
 
-  output.debug = function(msg) {
+  output.debug = function (msg) {
     originalOutput.debug(msg);
     dataStorage.putData('log', repeat(this?.stepShift || 0) + pc.cyan(msg.toString()));
   };
 
-  output.say = function(message, color = 'cyan') {
+  output.say = function (message, color = 'cyan') {
     originalOutput.say(message, color);
     const sayMsg = repeat(this?.stepShift || 0) + `  ${pc.bold(pc[color](message))}`;
     dataStorage.putData('log', sayMsg);
   };
 
-  output.log = function(msg) {
+  output.log = function (msg) {
     originalOutput.log(msg);
     dataStorage.putData('log', repeat(this?.stepShift || 0) + pc.gray(msg));
   };
@@ -108,7 +113,7 @@ function CodeceptReporter(config) {
   });
 
   // Hook event listeners
-  event.dispatcher.on(event.hook.started, (hook) => {
+  event.dispatcher.on(event.hook.started, hook => {
     output.stepShift = 2;
     currentHook = hook.name;
     let title = hook.hookName;
@@ -126,7 +131,6 @@ function CodeceptReporter(config) {
     services.setContext(null);
   });
 
-
   // mark as failed all tests inside the failed hook
   event.dispatcher.on(event.hook.failed, hook => {
     if (hook.name !== 'BeforeSuiteHook') return;
@@ -148,7 +152,6 @@ function CodeceptReporter(config) {
     }
   });
 
-
   event.dispatcher.on(event.suite.before, suite => {
     dataStorage.setContext(suite.fullTitle());
   });
@@ -167,7 +170,7 @@ function CodeceptReporter(config) {
     testTimeMap[test.uid] = Date.now();
   });
 
-  event.dispatcher.on(event.all.result, async (result) => {
+  event.dispatcher.on(event.all.result, async result => {
     debug('waiting for all tests to be reported');
     // all tests were reported and we can upload videos
     await Promise.all(reportTestPromises);
@@ -327,7 +330,7 @@ function captureHookStep(step, currentHook, hookSteps) {
     status: step.status,
     startTime,
     endTime,
-    helperMethod: step.helperMethod
+    helperMethod: step.helperMethod,
   });
   hookSteps.set(currentHook, hookStepsArray);
 }
@@ -422,13 +425,12 @@ function processTestSteps(steps, hierarchy) {
   }
 }
 
-
 function createSectionStep(metaStep) {
   return {
     category: 'user',
     title: metaStep.toString(), // Use built-in toString method
     duration: metaStep.duration || 0, // Use built-in duration
-    steps: []
+    steps: [],
   };
 }
 
@@ -439,7 +441,7 @@ function createHookSection(hookName, steps) {
     category: 'hook',
     title: formatHookName(hookName),
     duration: 0,
-    steps: []
+    steps: [],
   };
 
   for (const step of steps) {
@@ -457,7 +459,6 @@ function formatHookName(hookName) {
   return hookName.replace(/Hook$/, '');
 }
 
-
 // Format CodeceptJS step using its built-in methods
 function formatCodeceptStep(step) {
   if (!step) return null;
@@ -469,14 +470,14 @@ function formatCodeceptStep(step) {
   const formattedStep = {
     category,
     title,
-    duration
+    duration,
   };
 
   // Add error if step failed
   if (step.status === 'failed' && step.err) {
     formattedStep.error = {
       message: step.err.message || 'Step failed',
-      stack: step.err.stack || ''
+      stack: step.err.stack || '',
     };
   }
 
@@ -500,10 +501,9 @@ function formatHookStep(step) {
   return {
     category: 'hook',
     title,
-    duration: step.duration || 0
+    duration: step.duration || 0,
   };
 }
 
-
 export { CodeceptReporter };
 export default CodeceptReporter;

package/src/adapter/mocha.js

@@ -84,7 +84,7 @@ function MochaReporter(runner, opts) {
     const artifacts = services.artifacts.get(test.fullTitle());
     const keyValues = services.keyValues.get(test.fullTitle());
     const links = services.links.get(test.fullTitle());
-    
+
     client.addTestRun(STATUS.SKIPPED, {
       title: getTestName(test),
       suite_title: getSuiteTitle(test),

package/src/adapter/playwright.js

@@ -254,7 +254,7 @@ function generateTmpFilepath(filename = '') {
  */
 function extractTags(test) {
   const tagsSet = new Set();
-  
+
   // Extract tags from test title (@tag format)
   const titleTagsMatch = test.title.match(/@\w+/g);
   if (titleTagsMatch) {
@@ -262,7 +262,7 @@ function extractTags(test) {
       tagsSet.add(tag.replace('@', '').toLowerCase());
     });
   }
-  
+
   // Extract tags from test.tags (Playwright built-in tags)
   if (test.tags && Array.isArray(test.tags)) {
     test.tags.forEach(tag => {

package/src/bin/cli.js

@@ -35,14 +35,20 @@ program
 program
   .command('start')
   .description('Start a new run and return its ID')
-  .action(async () => {
+  .option('--kind <type>', 'Specify run type: automated, manual, or mixed')
+  .action(async opts => {
     cleanLatestRunId();
 
     console.log('Starting a new Run on Testomat.io...');
     const apiKey = process.env['INPUT_TESTOMATIO-KEY'] || config.TESTOMATIO;
     const client = new TestomatClient({ apiKey });
 
-    client.createRun().then(() => {
+    const createRunParams = {};
+    if (opts.kind) {
+      createRunParams.kind = opts.kind;
+    }
+
+    client.createRun(createRunParams).then(() => {
       console.log(process.env.runId);
       process.exit(0);
     });
@@ -75,6 +81,7 @@ program
   .description('Run tests with the specified command')
   .argument('<command>', 'Test runner command')
   .option('--filter <filter>', 'Additional execution filter')
+  .option('--kind <type>', 'Specify run type: automated, manual, or mixed')
   .action(async (command, opts) => {
     const apiKey = process.env['INPUT_TESTOMATIO-KEY'] || config.TESTOMATIO;
     const title = process.env.TESTOMATIO_TITLE;
@@ -120,8 +127,13 @@ program
       });
     };
 
+    const createRunParams = {};
+    if (opts.kind) {
+      createRunParams.kind = opts.kind;
+    }
+
     if (apiKey) {
-      await client.createRun().then(runTests);
+      await client.createRun(createRunParams).then(runTests);
     } else {
       await runTests();
     }
@@ -158,7 +170,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')) {
+    if (!pattern.endsWith('.xml') && !pattern.includes('*')) {
       pattern += '.xml';
     }
     let { javaTests, lang } = opts;

package/src/bin/reportXml.js

@@ -23,7 +23,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')) {
+    if (!pattern.endsWith('.xml') && !pattern.includes('*')) {
       pattern += '.xml';
     }
     let { javaTests, lang } = opts;
@@ -34,7 +34,10 @@ program
     }
     lang = lang?.toLowerCase();
     if (javaTests === true || (lang === 'java' && !javaTests)) javaTests = 'src/test/java';
-    const runReader = new XmlReader({ javaTests, lang });
+    const runReader = new XmlReader({
+      javaTests,
+      lang,
+    });
     const files = glob.sync(pattern, { cwd: opts.dir || process.cwd() });
     if (!files.length) {
       console.log(APP_PREFIX, `Report can't be created. No XML files found 😥`);