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

package/lib/utils/utils.js

@@ -15,18 +15,29 @@ 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 };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.testRunnerHelper = exports.specificTestInfo = exports.parseSuite = exports.isValidUrl = exports.humanize = exports.getTestomatIdFromTestTitle = exports.getCurrentDateTime = exports.foundedTestLog = exports.fileSystem = exports.fetchFilesFromStackTrace = exports.fetchIdFromOutput = exports.fetchIdFromCode = exports.fetchSourceCodeFromStackTrace = exports.fetchSourceCode = exports.isSameTest = exports.ansiRegExp = void 0;
+exports.validateSuiteId = exports.testRunnerHelper = exports.specificTestInfo = exports.parseSuite = exports.isValidUrl = exports.humanize = exports.getTestomatIdFromTestTitle = exports.getCurrentDateTime = exports.foundedTestLog = exports.fileSystem = exports.fetchFilesFromStackTrace = exports.fetchIdFromOutput = exports.fetchIdFromCode = exports.fetchSourceCodeFromStackTrace = exports.fetchSourceCode = exports.isSameTest = exports.ansiRegExp = exports.SUITE_ID_REGEX = exports.TEST_ID_REGEX = void 0;
+exports.getPackageVersion = getPackageVersion;
 exports.formatStep = formatStep;
 exports.readLatestRunId = readLatestRunId;
 exports.removeColorCodes = removeColorCodes;
@@ -38,7 +49,12 @@ const fs_1 = __importDefault(require("fs"));
 const is_valid_path_1 = __importDefault(require("is-valid-path"));
 const debug_1 = __importDefault(require("debug"));
 const os_1 = __importDefault(require("os"));
+const url_2 = require("url");
 const debug = (0, debug_1.default)('@testomatio/reporter:util');
+// Use __dirname directly since we're compiling to CommonJS
+// prettier-ignore
+// @ts-ignore
+// eslint-disable-next-line max-len
 /**
  * @param {String} testTitle - Test title
  *
@@ -62,11 +78,23 @@ exports.getTestomatIdFromTestTitle = getTestomatIdFromTestTitle;
 const parseSuite = suiteTitle => {
     const captures = suiteTitle.match(/@S[\w\d]{8}/);
     if (captures) {
-        return captures[1];
+        return captures[0];
     }
     return null;
 };
 exports.parseSuite = parseSuite;
+/**
+ * Validates TESTOMATIO_SUITE environment variable format
+ * @param {String} suiteId - suite ID to validate
+ * @returns {String|null} validated suite ID or null if invalid
+ */
+const validateSuiteId = suiteId => {
+    if (!suiteId)
+        return null;
+    const match = suiteId.match(exports.SUITE_ID_REGEX);
+    return match ? match[0] : null;
+};
+exports.validateSuiteId = validateSuiteId;
 const ansiRegExp = () => {
     const pattern = [
         '[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)',
@@ -77,7 +105,6 @@ const ansiRegExp = () => {
 exports.ansiRegExp = ansiRegExp;
 const isValidUrl = s => {
     try {
-        // eslint-disable-next-line no-new
         new url_1.URL(s);
         return true;
     }
@@ -86,13 +113,23 @@ const isValidUrl = s => {
     }
 };
 exports.isValidUrl = isValidUrl;
-const fileMatchRegex = /file:(\/\/?[^:\s]+?\.(png|avi|webm|jpg|html|txt))/gi;
-const fetchFilesFromStackTrace = (stack = '') => {
+const fileMatchRegex = /file:(\/+(?:[A-Za-z]:[\\/]|\/)?[^\s]*?\.(png|avi|webm|jpg|html|txt))/gi;
+const fetchFilesFromStackTrace = (stack = '', checkExists = true) => {
     const files = Array.from(stack.matchAll(fileMatchRegex))
         .map(f => f[1].trim())
-        .map(f => (f.startsWith('//') ? f.substring(1) : f));
+        .map(f => f.replace(/^\/+/, '/').replace(/^\/([A-Za-z]:)/, '$1')) // Remove extra slashes, handle Windows paths
+        .map(f => {
+        // 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 => {
+        if (!checkExists)
+            return true;
         const isFile = fs_1.default.existsSync(f);
         if (!isFile)
             debug('File %s could not be found and uploaded as artifact', f);
@@ -131,7 +168,8 @@ const fetchSourceCodeFromStackTrace = (stack = '') => {
         .join('\n');
 };
 exports.fetchSourceCodeFromStackTrace = fetchSourceCodeFromStackTrace;
-const TEST_ID_REGEX = /@T([\w\d]{8})/;
+exports.TEST_ID_REGEX = /@T([\w\d]{8})/;
+exports.SUITE_ID_REGEX = /@S([\w\d]{8})/;
 const fetchIdFromCode = (code, opts = {}) => {
     const comments = code
         .split('\n')
@@ -145,15 +183,12 @@ const fetchIdFromCode = (code, opts = {}) => {
                 return l.startsWith('// ');
         }
     });
-    return comments.find(c => c.match(TEST_ID_REGEX))?.match(TEST_ID_REGEX)?.[1];
+    return comments.find(c => c.match(exports.TEST_ID_REGEX))?.match(exports.TEST_ID_REGEX)?.[1];
 };
 exports.fetchIdFromCode = fetchIdFromCode;
 const fetchIdFromOutput = output => {
-    const lines = output
-        .split('\n')
-        .map(l => l.trim())
-        .filter(l => l.startsWith('tid://'));
-    return lines.find(c => c.match(TEST_ID_REGEX))?.match(TEST_ID_REGEX)?.[1];
+    const TID_FULL_PATTERN = new RegExp(`tid:\\/\\/.*?(${exports.TEST_ID_REGEX.source})`);
+    return output.match(TID_FULL_PATTERN)?.[2];
 };
 exports.fetchIdFromOutput = fetchIdFromOutput;
 const fetchSourceCode = (contents, opts = {}) => {
@@ -177,6 +212,12 @@ const fetchSourceCode = (contents, opts = {}) => {
             if (lineIndex === -1)
                 lineIndex = lines.findIndex(l => l.includes(`${title}(`));
         }
+        else if (opts.lang === 'csharp') {
+            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));
         }
@@ -324,7 +365,6 @@ const decamelize = text => {
  * @returns
  */
 function removeColorCodes(input) {
-    // eslint-disable-next-line no-control-regex
     return input.replace(/\x1b\[[0-9;]*m/g, '');
 }
 const testRunnerHelper = {
@@ -337,7 +377,6 @@ const testRunnerHelper = {
         try {
             // TODO: expect?.getState()?.testPath + ' ' + expect?.getState()?.currentTestName
             // @ts-expect-error "expect" could only be defined inside Jest environement (forbidden to import it outside)
-            // eslint-disable-next-line no-undef
             return expect?.getState()?.currentTestName;
         }
         catch (e) {
@@ -380,6 +419,13 @@ function formatStep(step, shift = 0) {
     }
     return lines;
 }
+function getPackageVersion() {
+    const packageJsonPath = path_1.default.resolve(__dirname, '../../package.json');
+    const packageJson = JSON.parse(fs_1.default.readFileSync(packageJsonPath, 'utf8'));
+    return packageJson.version;
+}
+
+module.exports.getPackageVersion = getPackageVersion;
 
 module.exports.formatStep = formatStep;
 
@@ -393,6 +439,8 @@ module.exports.getTestomatIdFromTestTitle = getTestomatIdFromTestTitle;
 
 module.exports.parseSuite = parseSuite;
 
+module.exports.validateSuiteId = validateSuiteId;
+
 module.exports.ansiRegExp = ansiRegExp;
 
 module.exports.isValidUrl = isValidUrl;

package/lib/xmlReader.js

@@ -20,7 +20,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_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, } = process.env;
 const options = {
     ignoreDeclaration: true,
     ignoreAttributes: false,
@@ -28,6 +28,7 @@ const options = {
     attributeNamePrefix: '',
     parseTagValue: true,
 };
+const MAX_OUTPUT_LENGTH = parseInt(TESTOMATIO_MAX_STACK_TRACE, 10) || 10000;
 const reduceOptions = {};
 class XmlReader {
     constructor(opts = {}) {
@@ -75,7 +76,7 @@ class XmlReader {
             /(<system-out><!\[CDATA\[)([\s\S]*?)(\]\]><\/system-out>)/g,
         ];
         for (const regex of cutRegexes) {
-            xmlData = xmlData.replace(regex, (_, p1, p2, p3) => `${p1}${p2.substring(0, 5000)}${p3}`);
+            xmlData = xmlData.replace(regex, (_, p1, p2, p3) => `${p1}${p2.substring(0, MAX_OUTPUT_LENGTH)}${p3}`);
         }
         const jsonResult = this.parser.parse(xmlData);
         let jsonSuite;
@@ -185,6 +186,7 @@ class XmlReader {
             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')
@@ -202,7 +204,7 @@ class XmlReader {
         this.tests = results.filter(t => !!t.title);
         return {
             status,
-            create_tests: true,
+            create_tests: !process.env.IGNORE_NEW_TESTS,
             tests_count: parseInt(counters.total, 10),
             passed_count: parseInt(counters.passed, 10),
             skipped_count: parseInt(counters.notExecuted, 10),
@@ -253,6 +255,7 @@ class XmlReader {
                         title,
                         suite_title,
                         run_time,
+                        retry: false,
                     });
                 });
             });
@@ -313,6 +316,8 @@ class XmlReader {
                         this.stats.language = 'js';
                     if (file.endsWith('.ts'))
                         this.stats.language = 'ts';
+                    if (file.endsWith('.cs'))
+                        this.stats.language = 'csharp';
                 }
                 if (!fs_1.default.existsSync(file)) {
                     debug('Failed to open file with the source code', file);
@@ -359,13 +364,13 @@ class XmlReader {
     async uploadArtifacts() {
         for (const test of this.tests.filter(t => !!t.stack)) {
             let files = [];
-            if (test.files?.length)
-                files = test.files.map(f => path_1.default.join(process.cwd(), f));
-            files = [...files, ...(0, utils_js_1.fetchFilesFromStackTrace)(test.stack)];
+            if (!test.files?.length)
+                continue;
+            files = test.files.map(f => (path_1.default.isAbsolute(f) ? f : path_1.default.join(process.cwd(), f)));
             if (!files.length)
                 continue;
             const runId = this.runId || this.store.runId || Date.now().toString();
-            test.artifacts = await Promise.all(files.map(f => this.uploader.uploadFileByPath(f, [runId])));
+            test.artifacts = await Promise.all(files.map(f => this.uploader.uploadFileByPath(f, [runId, path_1.default.basename(f)])));
             console.log(constants_js_1.APP_PREFIX, `🗄️ Uploaded ${picocolors_1.default.bold(`${files.length} artifacts`)} for test ${test.title}`);
         }
     }
@@ -415,14 +420,17 @@ function reduceTestCases(prev, item) {
         testCases = [testCases];
     }
     // suite inside test case
-    if (item['test-suite'] && item['test-suite']['test-case'])
-        testCases.push(...item['test-suite']['test-case']);
+    const testCase = item['test-suite']?.['test-case'];
+    if (testCase) {
+        const nestedCases = Array.isArray(testCase) ? testCase : [testCase];
+        testCases.push(...nestedCases);
+    }
     const suiteOutput = item['system-out'] || item.output || item.log || '';
     const suiteErr = item['system-err'] || item.output || item.log || '';
     testCases
         .filter(t => !!t)
         .forEach(testCaseItem => {
-        const file = testCaseItem.file || item.filepath || '';
+        const file = testCaseItem.file || item.filepath || item.fullname || item.package || '';
         let stack = '';
         let message = '';
         if (testCaseItem.error)
@@ -444,7 +452,7 @@ function reduceTestCases(prev, item) {
         const isParametrized = item.type === 'ParameterizedMethod';
         const preferClassname = reduceOptions.preferClassname || isParametrized;
         // SpecFlow config
-        let { title, tags } = fetchProperties(isParametrized ? item : testCaseItem);
+        let { title, tags, testId } = fetchProperties(isParametrized ? item : testCaseItem);
         let example = null;
         const suiteTitle = preferClassname ? testCaseItem.classname : item.name || testCaseItem.classname;
         title ||= testCaseItem.name || testCaseItem.methodname || testCaseItem.classname;
@@ -454,17 +462,38 @@ function reduceTestCases(prev, item) {
             example = { ...exampleMatches[1].split(',').map(v => v.trim().replace(/[^\w\s-]/g, '')) };
             title = title.replace(/\(.*?\)/, '').trim();
         }
-        // eslint-disable-next-line
         stack = `${testCaseItem['system-out'] || testCaseItem.output || testCaseItem.log || ''}\n\n${stack}\n\n${suiteOutput}\n\n${suiteErr}`.trim();
-        const testId = (0, utils_js_1.fetchIdFromOutput)(stack);
+        if (!testId)
+            testId = (0, utils_js_1.fetchIdFromOutput)(stack);
+        if (tags?.length && !testId) {
+            testId = tags
+                .filter(t => t.startsWith('T'))
+                .map(t => `@${t}`)
+                .find(t => t.match(utils_js_1.TEST_ID_REGEX))
+                ?.slice(2);
+        }
         let status = constants_js_1.STATUS.PASSED.toString();
         if ('failure' in testCaseItem || 'error' in testCaseItem)
             status = constants_js_1.STATUS.FAILED;
         if ('skipped' in testCaseItem)
             status = constants_js_1.STATUS.SKIPPED;
+        if (testCaseItem.result && Object.values(constants_js_1.STATUS).includes(testCaseItem.result.toLowerCase())) {
+            status = testCaseItem.result.toLowerCase();
+        }
         let rid = null;
         if (testCaseItem.id)
             rid = `${ridRunId}-${testCaseItem.id}`;
+        // Extract attachments
+        let files = [];
+        if (testCaseItem.attachments) {
+            const attachments = Array.isArray(testCaseItem.attachments.attachment)
+                ? testCaseItem.attachments.attachment
+                : [testCaseItem.attachments.attachment];
+            files = attachments.filter(a => a && a.filePath).map(a => a.filePath);
+        }
+        // Extract files from stack trace using existing utility
+        const stackFiles = (0, utils_js_1.fetchFilesFromStackTrace)(stack);
+        files = [...new Set([...files, ...stackFiles])]; // Remove duplicates
         prev.push({
             rid,
             file,
@@ -479,7 +508,10 @@ function reduceTestCases(prev, item) {
             run_time: parseFloat(testCaseItem.time || testCaseItem.duration) * 1000,
             status,
             title,
+            root_suite_id: TESTOMATIO_SUITE,
             suite_title: suiteTitle,
+            files,
+            retry: false,
         });
     });
     return prev;
@@ -503,12 +535,18 @@ function fetchProperties(item) {
     let title = '';
     if (!item.properties)
         return {};
-    const prop = [item.properties?.property].flat().find(p => p.name === 'Description');
+    // Handle both single property and array of properties
+    const properties = Array.isArray(item.properties.property)
+        ? item.properties.property
+        : [item.properties.property].filter(Boolean);
+    const prop = properties.find(p => p.name === 'Description');
     if (prop)
         title = prop.value;
-    [item.properties?.property]
-        .flat()
-        .filter(p => p.name === 'Category')
-        .forEach(p => tags.push(p.value));
-    return { title, tags };
+    let testId = properties.find(p => p.name === 'ID')?.value;
+    if (testId?.startsWith('@'))
+        testId = testId.slice(1);
+    if (testId?.startsWith('T'))
+        testId = testId.slice(1);
+    properties.filter(p => p.name === 'Category').forEach(p => tags.push(p.value));
+    return { title, tags, testId };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testomatio/reporter",
-  "version": "2.1.0-beta-nightwatch",
+  "version": "2.1.0-beta.2-codeceptjs",
   "description": "Testomatio Reporter Client",
   "engines": {
     "node": ">=18"
@@ -14,10 +14,9 @@
     "@aws-sdk/client-s3": "^3.279.0",
     "@aws-sdk/lib-storage": "^3.279.0",
     "@cucumber/cucumber": "^10.9.0",
-    "@octokit/rest": "^19.0.5",
+    "@octokit/rest": "^21.1.1",
     "aws-sdk": "^2.1072.0",
-    "axios": "^1.6.2",
-    "axios-retry": "^3.9.1",
+    "gaxios": ">=6.0 || >=7.0.0-rc.4 || <8",
     "callsite-record": "^4.1.4",
     "commander": "^12",
     "cross-spawn": "^7.0.3",
@@ -49,17 +48,23 @@
     "testcafe"
   ],
   "scripts": {
-    "@cucumber/cucumber": "^10.9.0",
     "clear-exportdir": "rm -rf export/",
     "pretty": "npx prettier --check .",
     "pretty:fix": "prettier --write .",
     "lint": "eslint src",
     "lint:fix": "eslint src --fix",
     "format": "npm run lint:fix && npm run pretty:fix",
-    "test": "mocha tests/**",
+    "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: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",
+    "test:codecept:steps": "mocha tests/adapter/codecept_steps_sections.test.js",
+    "install-example-deps": "cd example/playwright && npm install && cd ../codecept && npm install",
     "init": "cd ./tests/adapter/examples/cucumber && npm i",
     "test:adapter": "node node_modules/mocha/bin/mocha './tests/adapter/index.test.js'",
-    "test:pipes": "mocha './tests/pipes/*_test.js'",
     "test:adapter:jest:example": "jest './tests/adapter/examples/jest/index.test.js' --config='./tests/adapter/examples/jest/jest.config.js'",
     "test:adapter:mocha:example": "mocha './tests/adapter/examples/mocha/index.test.js' --config='./tests/adapter/examples/mocha/mocha.config.cjs'",
     "test:adapter:jasmine:example": "jasmine './tests/adapter/examples/jasmine/index.test.js' --reporter=./lib/adapter/jasmine.js",
@@ -68,8 +73,9 @@
     "test:adapter:playwright:example": "npx playwright test --config='./tests/adapter/examples/playwright/playwright.config.ts'",
     "test:adapter:vitest:example": "npx vitest --config='./tests/adapter/examples/vitest/vitest.config.ts'",
     "test:storage": "npx mocha tests-storage/artifact-storage.test.js && npx mocha tests-storage/data-storage.test.js && TESTOMATIO_INTERCEPT_CONSOLE_LOGS=true npx mocha tests-storage/logger.test.js && npx mocha tests-storage/logger-2.test.js && npx mocha tests-storage/reporter-functions.test.js",
-    "//": "builds code from /src (esm) into /lib (commonjs)",
-    "build": "rm -rf ./cjs && tsc --module commonjs && npx tsx build/scripts/edit-js-files.js && npx tsx build/scripts/edit-package-json.js && chmod +x ./build/scripts/copy-tesmplate.sh && ./build/scripts/copy-tesmplate.sh"
+    "build": "rm -rf ./cjs && tsc --module commonjs && npx tsx build/scripts/edit-js-files.js && npx tsx build/scripts/edit-package-json.js && chmod +x ./build/scripts/copy-tesmplate.sh && ./build/scripts/copy-tesmplate.sh",
+    "build:bun": "rm -rf ./cjs && bunx tsc --module commonjs && npx tsx build/scripts/edit-js-files.js && npx tsx build/scripts/edit-package-json.js && chmod +x ./build/scripts/copy-tesmplate.sh && ./build/scripts/copy-tesmplate.sh",
+    "build:watch:bun": "rm -rf ./cjs && bun build ./src/bin/reportXml.js ./src/bin/startTest.js ./src/bin/uploadArtifacts.js --outdir ./cjs --target node --watch --onSuccess \"build/scripts/post-build.js\""
   },
   "devDependencies": {
     "@playwright/test": "^1.49.1",
@@ -81,8 +87,7 @@
     "chai": "^4.3.6",
     "codeceptjs": "^3.6.5",
     "cucumber": "^6.0.7",
-    "eslint": "^8.57.0",
-    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint": "^9.24.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-import": "^2.25.4",
     "jasmine": "^5.2.0",