@testomatio/reporter 1.0.12-beta.2 → 1.0.12-beta.4

package/lib/util.js

@@ -104,6 +104,22 @@ const fetchSourceCodeFromStackTrace = (stack = '') => {
     }).join('\n');
 };
 
+const TEST_ID_REGEX = /@T([\w\d]{8})/;
+
+const fetchIdFromCode = (code, opts = {}) => {
+  const comments = code.split('\n').map(l => l.trim()).filter(l => {
+    switch (opts.lang) {
+      case 'ruby':
+      case 'python':
+        return l.startsWith('# ');
+      default:
+        return l.startsWith('// ');
+    }
+  });
+
+  return comments.find(c => c.match(TEST_ID_REGEX))?.match(TEST_ID_REGEX)?.[1];
+}
+
 const fetchSourceCode = (contents, opts = {}) => {
   if (!opts.title && !opts.line) return '';
 
@@ -251,6 +267,7 @@ module.exports = {
   isSameTest,
   fetchSourceCode,
   fetchSourceCodeFromStackTrace,
+  fetchIdFromCode,
   fetchFilesFromStackTrace,
   fileSystem,
   getCurrentDateTime,

package/lib/xmlReader.js

@@ -4,7 +4,7 @@ const chalk = require('chalk');
 const fs = require("fs");
 const { XMLParser } = require("fast-xml-parser");
 const { APP_PREFIX, STATUS } = require('./constants');
-const { fetchFilesFromStackTrace, fetchSourceCode, fetchSourceCodeFromStackTrace } = require('./util');
+const { fetchFilesFromStackTrace, fetchSourceCode, fetchSourceCodeFromStackTrace, fetchIdFromCode } = require('./util');
 const upload = require('./fileUploader');
 const pipesFactory = require('./pipe');
 const adapterFactory = require('./junit-adapter');
@@ -39,8 +39,8 @@ class XmlReader {
     if (!this.adapter) throw new Error('XML adapter for this format not found');
 
     this.opts = opts || {};
-    const store = {}
-    this.pipes = pipesFactory(opts, store);
+    this.store = {}
+    this.pipes = pipesFactory(opts, this.store);
 
     this.parser = new XMLParser(options);
     this.tests = []
@@ -310,6 +310,9 @@ class XmlReader {
         }
         const contents = fs.readFileSync(file).toString();
         t.code = fetchSourceCode(contents, { ...t, lang: this.stats.language })
+        if (t.code) debug('Fetched code for test %s', t.title);
+        t.test_id = fetchIdFromCode(t.code, { lang: this.stats.language } )
+        if (t.test_id) debug('Fetched test id %s for test %s', t.test_id, t.title);
       } catch (err) {
         debug(err)
       }
@@ -353,8 +356,12 @@ class XmlReader {
       let files = [];
       if (test.files?.length) files = test.files.map(f => path.join(process.cwd(), f))
       files = [...files, ...fetchFilesFromStackTrace(test.stack)];
-      console.log(APP_PREFIX, 'Uploading files', files)
-      test.artifacts = await Promise.all(files.map(f => upload.uploadFileByPath(f, this.runId)));
+      
+      if (!files.length) continue;
+
+      const runId = this.runId || this.store.runId || Date.now().toString();
+      test.artifacts = await Promise.all(files.map(f => upload.uploadFileByPath(f, runId)));
+      console.log(APP_PREFIX, `🗄️ Uploaded ${chalk.bold(`${files.length} artifacts`)} for test ${test.title}`);
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testomatio/reporter",
-  "version": "1.0.12-beta.2",
+  "version": "1.0.12-beta.4",
   "description": "Testomatio Reporter Client",
   "main": "./lib/reporter.js",
   "typings": "typings/index.d.ts",