@testomatio/reporter 0.8.0-beta.20 → 0.8.0-beta.30

package/lib/xmlReader.js

@@ -1,3 +1,4 @@
+const debug = require('debug')('@testomatio/reporter:xml');
 const path = require("path");
 const chalk = require('chalk');
 const fs = require("fs");
@@ -119,7 +120,10 @@ class XmlReader {
   }  
 
   processTRX(jsonSuite) {
-    const tests = jsonSuite?.TestRun?.TestDefinitions?.UnitTest?.map(td => {
+    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(',')};
@@ -134,15 +138,20 @@ class XmlReader {
       }
     }) || [];
 
-    const results = jsonSuite?.TestRun?.Results?.UnitTestResult?.map(td => ({ 
+    let result = jsonSuite?.TestRun?.Results?.UnitTestResult;
+    if (!Array.isArray(result)) result = [result].filter(d => !!d);
+
+    const results = result.map(td => ({ 
       id: td.executionId, 
       run_time: parseFloat(td.duration),
       status: td.outcome, 
-      stack: td.Output.StdOut  
+      stack: td.Output.StdOut,
+      files: td?.ResultFiles?.ResultFile?.map(rf => rf.path)
     }));
 
+    
     results.forEach(r => {
-      const test = tests.find(t => t.id === r.id) || {};
+      const test = tests.find(t => t.id === r.id) || { };
       r.suite_title = test.suite_title;
       r.title = test.title?.trim();
       if (test.example) r.example = test.example;
@@ -153,6 +162,8 @@ class XmlReader {
       if (r.status === 'Skipped') r.status = SKIPPED;
       delete r.id;
     });
+
+    debug(results);
     
     const counters = jsonSuite?.TestRun?.ResultSummary?.Counters || {};
 
@@ -161,7 +172,7 @@ class XmlReader {
     let status = PASSED;
     if (failed_count > 0) status = FAILED;
 
-    this.tests = results;
+    this.tests = results.filter(t => !!t.title);
 
     return {
       status,
@@ -212,9 +223,7 @@ class XmlReader {
         const contents = fs.readFileSync(file).toString();
         t.code = fetchSourceCode(contents, { ...t, lang: this.stats.language })
       } catch (err) {
-        if (process.env.DEBUG) {
-            console.log(err)
-        }
+        debug(err)
       }
     });
   }
@@ -264,7 +273,8 @@ class XmlReader {
 
   async uploadArtifacts() {
     for (const test of this.tests.filter(t => !!t.stack)) {
-      const files = fetchFilesFromStackTrace(test.stack);
+      const files = [...test.files.map(f => path.join(process.cwd(), f)), ...fetchFilesFromStackTrace(test.stack)];
+      debug('Uploading files', files)
       test.artifacts = await Promise.all(files.map(f => upload.uploadFileByPath(f, this.runId)));
     }
   }
@@ -277,7 +287,7 @@ class XmlReader {
       group_title: this.requestParams.group_title,
     };    
 
-    if (process.env.DEBUG) console.log("Run", runParams);
+    debug("Run", runParams);
 
     return Promise.all(this.pipes.map(p => p.createRun(runParams)));
   }
@@ -290,12 +300,12 @@ class XmlReader {
     this.formatErrors();
     this.formatTests();
 
-    if (process.env.DEBUG) {
-      console.log({
-        ...this.stats,
-        tests: this.tests,
-      })
-    }
+    debug(
+      'Uploading data',
+      {
+      ...this.stats,
+      tests: this.tests,
+    })
 
     const dataString = {
       ...this.stats,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testomatio/reporter",
-  "version": "0.8.0-beta.20",
+  "version": "0.8.0-beta.30",
   "description": "Testomatio Reporter Client",
   "main": "./lib/reporter.js",
   "repository": "git@github.com:testomatio/reporter.git",
@@ -9,6 +9,8 @@
   "dependencies": {
     "@octokit/rest": "^19.0.5",
     "aws-sdk": "^2.1072.0",
+    "@aws-sdk/client-s3": "^3.279.0",
+    "@aws-sdk/lib-storage": "^3.279.0",
     "axios": "^0.25.0",
     "callsite-record": "^4.1.4",
     "chalk": "^4.1.0",
@@ -16,7 +18,6 @@
     "dotenv": "^16.0.1",
     "fast-xml-parser": "^4.0.8",
     "glob": "^8.0.3",
-    "got": "^11.8.3",
     "has-flag": "^5.0.1",
     "humanize-duration": "^3.27.3",
     "is-valid-path": "^0.1.1",

package/testcafe/index.js

@@ -1,61 +0,0 @@
-const TestomatClient = require('@testomatio/reporter/lib/client');
-const TRConstants = require('@testomatio/reporter/lib/constants');
-const util = require('@testomatio/reporter/lib/util');
-
-module.exports = () => {
-  const apiKey = process.env.TESTOMATIO;
-  let failed = false;
-
-  if (apiKey === '' || apiKey === undefined) {
-    throw new Error('Testomat.io API key cannot be empty');
-  }
-  const client = new TestomatClient({ apiKey });
-
-  return {
-    reportTaskStart(startTime, userAgents) {
-      console.log('TestCafe started with: ', userAgents);
-      client.createRun();
-    },
-
-    reportFixtureStart(name) {
-      console.log(`Suite : ${name}`);
-    },
-
-    reportTestDone(name, testRunInfo) {
-      let status = TRConstants.PASSED;
-      let message = '';
-
-      if (testRunInfo.skipped) {
-        status = TRConstants.SKIPPED;
-      }
-      if (testRunInfo.errs.length) {
-        status = TRConstants.FAILED;
-        message = this.renderErrors(testRunInfo.errs);
-        failed = true;
-      }
-      console.log(` - ${name} : ${status}`);
-      client.addTestRun(util.parseTest(name), status, {
-        error: testRunInfo.errs.length ? testRunInfo.errs[0] : null,
-        message,
-        title: name,
-        time: testRunInfo.durationMs,
-      });
-    },
-
-    renderErrors(errors) {
-      let errorMessage = '';
-      errors.forEach((error, id) => {
-        errorMessage = `${errorMessage}${this.formatError(error, `${id + 1} `)}\n`;
-      });
-
-      console.log(errorMessage);
-      return errorMessage.replace(util.ansiRegExp(), '');
-    },
-
-    reportTaskDone() {
-      const status = failed ? TRConstants.FAILED : TRConstants.PASSED;
-      console.log(`Status : ${status}`);
-      client.updateRunStatus(status);
-    },
-  };
-};