@testomatio/reporter 0.7.3 → 0.8.0-beta.2

package/Changelog.md

@@ -1,5 +1,6 @@
 # 0.7.3
 
+* CodeceptJS: Upload all traces and videos from artifacts
 * Fixed reporting skipped test in XML
 * added `--timelimit` option to `report-xml` command line
 

package/lib/adapter/codecept.js

@@ -148,7 +148,11 @@ function CodeceptReporter(config) {
     const files = [];
     if (artifacts.screenshot) files.push({ path: artifacts.screenshot, type: 'image/png' });
     // todo: video must be uploaded later....
-    if (artifacts.video) videos.push({ testId: id, title, path: artifacts.video, type: 'video/webm' });
+
+    for (const aid in artifacts) {
+      if (aid.startsWith('video')) videos.push({ testId: id, title, path: artifacts[aid], type: 'video/webm' }); 
+      if (aid.startsWith('trace')) files.push({ testId: id, title, path: artifacts[aid], type: 'application/zip' }); 
+    }
 
     client.addTestRun(testId, TRConstants.FAILED, {
       ...stripExampleFromTitle(title),

package/lib/client.js

@@ -1,19 +1,13 @@
 const axios = require('axios');
-const JsonCycle = require('json-cycle');
 const createCallsiteRecord = require('callsite-record');
 const { sep, join } = require('path');
 const fs = require('fs');
 const chalk = require('chalk');
 const upload = require('./fileUploader');
-const { isValidUrl } = require('./util');
 const { PASSED, FAILED, FINISHED, APP_PREFIX } = require('./constants');
+const pipesFactory = require('./pipe');
+const { TESTOMATIO_ENV } = process.env;
 
-const TESTOMAT_URL = process.env.TESTOMATIO_URL || 'https://app.testomat.io';
-const { TESTOMATIO_RUNGROUP_TITLE, TESTOMATIO_ENV, TESTOMATIO_RUN } = process.env;
-
-if (TESTOMATIO_RUN) {
-  process.env.runId = TESTOMATIO_RUN;
-}
 
 class TestomatClient {
   /**
@@ -24,11 +18,10 @@ class TestomatClient {
   constructor(params) {
     this.apiKey = params.apiKey || process.env.TESTOMATIO;
     this.title = params.title || process.env.TESTOMATIO_TITLE;
-    this.createNewTests = !!process.env.TESTOMATIO_CREATE;
-    this.proceed = process.env.TESTOMATIO_PROCEED;
     this.env  = TESTOMATIO_ENV;
     this.parallel = params.parallel;
-    this.runId = process.env.runId;
+    const store = {}
+    this.pipes = pipesFactory(params, store);
     this.queue = Promise.resolve();
     this.axios = axios.create();
     this.totalUploaded = 0;
@@ -42,46 +35,15 @@ class TestomatClient {
    */
   createRun() {
     const { runId } = process.env;
-    if (!this.apiKey) throw new Error("No API key is set, can't create run");
     const runParams = {
-      api_key: this.apiKey.trim(),
       title: this.title,
       parallel: this.parallel,
       env: this.env,
-      group_title: TESTOMATIO_RUNGROUP_TITLE,
     };
 
     global.testomatioArtifacts = [];
 
-    if (!isValidUrl(TESTOMAT_URL.trim())) {
-      console.log(
-        APP_PREFIX,
-        chalk.red(`Error creating report on Testomat.io, report url '${TESTOMAT_URL}' is invalid`),
-      );
-      return;
-    }
-
-    if (runId) {
-      this.runId = runId;
-      this.queue = this.queue.then(() => axios.put(`${TESTOMAT_URL.trim()}/api/reporter/${runId}`, runParams));
-      return Promise.resolve(runId);
-    }
-
-    this.queue = this.queue
-      .then(() =>
-        this.axios.post(`${TESTOMAT_URL.trim()}/api/reporter`, runParams).then(resp => {
-          this.runId = resp.data.uid;
-          this.runUrl = `${TESTOMAT_URL}/${resp.data.url.split('/').splice(3).join('/')}`;
-          console.log(APP_PREFIX, '📊 Report created. Report ID:', this.runId, chalk.gray(`v${this.version}`));
-          process.env.runId = this.runId;
-        }),
-      )
-      .catch(() => {
-        console.log(
-          APP_PREFIX,
-          'Error creating report Testomat.io, please check if your API key is valid. Skipping report',
-        );
-      });
+    this.queue = this.queue.then(() => Promise.all(this.pipes.map(p => p.createRun(runParams))));
 
     return this.queue;
   }
@@ -120,73 +82,42 @@ class TestomatClient {
       stack = this.formatSteps(stack, steps);
     }
 
-    if (this.runId) {
-      if (Array.isArray(global.testomatioArtifacts)) {
-        files.push(...global.testomatioArtifacts);
-        global.testomatioArtifacts = [];
-      }
-
-      for (const file of files) {
-        uploadedFiles.push(upload.uploadFileByPath(file, this.runId));
-      }
+    if (Array.isArray(global.testomatioArtifacts)) {
+      files.push(...global.testomatioArtifacts);
+      global.testomatioArtifacts = [];
+    }
 
-      for (const [idx, buffer] of filesBuffers.entries()) {
-        const fileName = `${idx + 1}-${title.replace(/\s+/g, '-')}`;
+    for (const file of files) {
+      uploadedFiles.push(upload.uploadFileByPath(file, this.runId));
+    }
 
-        uploadedFiles.push(upload.uploadFileAsBuffer(buffer, fileName, this.runId));
-      }
+    for (const [idx, buffer] of filesBuffers.entries()) {
+      const fileName = `${idx + 1}-${title.replace(/\s+/g, '-')}`;
+      uploadedFiles.push(upload.uploadFileAsBuffer(buffer, fileName, this.runId));
     }
 
-    this.queue = this.queue
-      .then(async () => {
-        if (!this.runId) return;
+    const artifacts = await Promise.all(uploadedFiles)
 
-        global.testomatioArtifacts = [];
+    global.testomatioArtifacts = [];
 
-        this.totalUploaded += uploadedFiles.filter(n => n).length;
+    this.totalUploaded += uploadedFiles.filter(n => n).length;
 
-        const json = JsonCycle.stringify({
-          api_key: this.apiKey,
-          create: this.createNewTests,
-          files,
-          steps,
-          status,
-          stack,
-          example,
-          title,
-          suite_title,
-          suite_id,
-          test_id,
-          message,
-          run_time: time,
-          artifacts: await Promise.all(uploadedFiles),
-        });
-        return this.axios.post(`${TESTOMAT_URL}/api/reporter/${this.runId}/testrun`, json, {
-          maxContentLength: Infinity,
-          maxBodyLength: Infinity,
-          headers: {
-            // Overwrite Axios's automatically set Content-Type
-            'Content-Type': 'application/json',
-          },
-        });
-      })
-      .catch(err => {
-        if (err.response) {
-          if (err.response.status >= 400) {
-            const data = err.response.data || { message: '' };
-            console.log(
-              APP_PREFIX,
-              chalk.blue(title),
-              `Report couldn't be processed: (${err.response.status}) ${data.message}`,
-            );
-            return;
-          }
-          console.log(APP_PREFIX, chalk.blue(title), `Report couldn't be processed: ${err.response.data.message}`);
-        } else {
-          console.log(APP_PREFIX, chalk.blue(title), "Report couldn't be processed", err);
-        }
-      });
+    const data = {
+      files,
+      steps,
+      status,
+      stack,
+      example,
+      title,      
+      suite_title,
+      suite_id,
+      test_id,
+      message,
+      run_time: parseFloat(time),
+      artifacts,
+    };
 
+    this.queue = this.queue.then(() => Promise.all(this.pipes.map(p => p.addTest(data))));
     return this.queue;
   }
 
@@ -196,41 +127,23 @@ class TestomatClient {
    * @returns {Promise}
    */
   updateRunStatus(status, isParallel) {
-    this.queue = this.queue
-      .then(async () => {
-        if (this.runId && !this.proceed) {
-          let statusEvent;
-          if (status === FINISHED) statusEvent = 'finish';
-          if (status === PASSED) statusEvent = 'pass';
-          if (status === FAILED) statusEvent = 'fail';
-          if (isParallel) statusEvent += '_parallel';
-          await this.axios.put(`${TESTOMAT_URL}/api/reporter/${this.runId}`, {
-            api_key: this.apiKey,
-            status_event: statusEvent,
-            status,
-          });
-          if (this.runUrl) {
-            console.log(APP_PREFIX, '📊 Report Saved. Report URL:', chalk.magenta(this.runUrl));
-          }
+    let statusEvent;
+    if (status === FINISHED) statusEvent = 'finish';
+    if (status === PASSED) statusEvent = 'pass';
+    if (status === FAILED) statusEvent = 'fail';
+    if (isParallel) statusEvent += '_parallel';
+    const runParams = { status, statusEvent }
 
-          if (upload.isArtifactsEnabled && this.totalUploaded > 0) {
-            console.log(
-              APP_PREFIX,
-              `🗄️  Total ${this.totalUploaded} artifacts ${
-                process.env.TESTOMATIO_PRIVATE_ARTIFACTS ? 'privately' : chalk.bold('publicly')
-              } uploaded to S3 bucket  `,
-            );
-          }
-        }
-        if (this.runUrl && this.proceed) {
-          const notFinishedMessage = chalk.yellow.bold('Run was not finished because of $TESTOMATIO_PROCEED');
-          console.log(APP_PREFIX, `📊 ${notFinishedMessage}. Report URL: ${chalk.magenta(this.runUrl)}`);
-          console.log(APP_PREFIX, `🛬 Run to finish it: TESTOMATIO_RUN=${this.runId} npx start-test-run --finish`);
-        }
-      })
-      .catch(err => {
-        console.log(APP_PREFIX, 'Error updating status, skipping...', err);
-      });
+    this.queue = this.queue.then(() => Promise.all(this.pipes.map(p => p.finishRun(runParams))));
+
+    if (upload.isArtifactsEnabled && this.totalUploaded > 0) {
+      console.log(
+        APP_PREFIX,
+        `🗄️  Total ${this.totalUploaded} artifacts ${
+          process.env.TESTOMATIO_PRIVATE_ARTIFACTS ? 'privately' : chalk.bold('publicly')
+        } uploaded to S3 bucket  `,
+      );
+    }
     return this.queue;
   }
 

package/lib/junit-adapter/index.js

@@ -0,0 +1,27 @@
+const Adapter = require('./adapter');
+const JavaScriptAdapter = require('./javascript');
+const JavaAdapter = require('./java');
+const PythonAdapter = require('./python');
+const RubyAdapter = require('./ruby');
+const CSharpAdapter = require('./csharp');
+
+
+module.exports = function (lang, opts) {
+  if (!lang) return new Adapter(opts);
+
+  if (lang === 'java') {
+    return new JavaAdapter(opts);
+  }
+  if (lang === 'js') {
+    return new JavaScriptAdapter(opts);
+  }
+  if (lang === 'python') {
+    return new PythonAdapter(opts);
+  }
+  if (lang === 'ruby') {
+    return new RubyAdapter(opts);
+  }
+  if (lang === 'c#' || lang === 'csharp') {
+    return new CSharpAdapter(opts);
+  }
+}

package/lib/pipe/github.js

@@ -0,0 +1,163 @@
+const chalk = require('chalk');
+const { Octokit } = require("@octokit/rest");
+const { APP_PREFIX } = require('../constants');
+const { ansiRegExp, isSameTest } = require('../util');
+const merge = require('lodash.merge');
+
+
+class GitHubPipe {
+
+  isEnabled = false;
+
+  constructor(params, store = {}) {
+    this.store = store;
+    this.tests = []
+    this.token = params.GH_PAT || process.env.GH_PAT;
+    this.ref = process.env.GITHUB_REF
+    this.repo = process.env.GITHUB_ACTION_REPOSITORY
+    if (!this.token || !this.ref || !this.repo) return;
+    this.isEnabled = true;
+    this.issue = this.ref.match(/refs\/pull\/(\d+)\/merge/)[1]    
+    this.start = new Date();
+  }
+  
+  async createRun() {}
+
+  updateRun() {}
+
+  addTest(test) {
+    if (!this.isEnabled) return;
+
+    const index = this.tests.findIndex(t => isSameTest(t, test))    
+    // update if they were already added
+    if (index >= 0) {
+      this.tests[index] = merge(this.tests[index], test);
+      return;
+    }
+
+    this.tests.push(test)
+  }
+
+  async finishRun(runParams) {
+    if (!this.isEnabled) return;
+
+    if (runParams.tests) runParams.tests.forEach(t => this.addTest(t));
+    
+
+    this.octokit = new Octokit({
+      auth: this.token,
+    });
+
+    const [owner, repo] = this.repo.split('/');
+    if (!(owner || repo)) return;
+
+    // ... create a comment on GitHub
+    const passedCount = this.tests.filter(t => t.status === 'passed').length;
+    const failedCount = this.tests.filter(t => t.status === 'failed').length;
+    const skippedCount = this.tests.filter(t => t.status === 'skipped').length;
+
+    let summary = `
+### Run Report
+
+|  | ${statusEmoji(runParams.status)} ${runParams.status.toUpperCase()} ${statusEmoji(runParams.status)} |
+| --- | --- |        
+| Tests | ✔️  **${this.tests.length}** tests run  |
+| Summary | ${statusEmoji('failed')} **${failedCount}** failed; ${statusEmoji('passed')} **${passedCount}** passed; **${statusEmoji('skipped')}** ${skippedCount} skipped |
+| Duration | 🕐  **${parseFloat(this.tests.reduce((a, t) => a + (t.run_time || 0), 0)).toFixed(2)}**ms |
+`
+    if (this.store.runUrl) {
+      summary += `| Testomat.io Report | 📊 [Run #${this.store.runId}](${this.store.runUrl})  | `;
+    }
+    if (process.env.GITHUB_WORKFLOW) {
+      summary += `| Workflow | 🗂️  ${process.env.GITHUB_WORKFLOW} | `;
+    }
+    if (process.env.RUNNER_OS) {
+      summary += `| Operating System | 🖥️ \`${process.env.RUNNER_OS}\` ${process.env.RUNNER_ARCH || ''} | `;
+    }
+    if (process.env.GITHUB_HEAD_REF) {
+      summary += `| Branch | 🌳  \`${process.env.GITHUB_HEAD_REF}\` | `;
+    }
+    if (process.env.GITHUB_RUN_ATTEMPT) {
+      summary += `| Run Attempt | 🌒  \`${process.env.GITHUB_RUN_ATTEMPT}\` | `;
+    }
+    if (process.env.GITHUB_RUN_ID) {
+      summary += `| Build Log | ✒️  ${process.env.GITHUB_SERVER_URL || 'https://github.com'}/${this.repo}/actions/runs/${process.env.GITHUB_RUN_ID} | `;
+    }
+
+
+    const failures = this.tests.filter(t => t.status === 'failed').slice(0, 20).map(t => {
+      let text = `#### ${statusEmoji('failed')} ${fullName(t)} `;
+      text += "\n\n"
+      if (t.message) text += "> " + t.message.replace(/[^\x20-\x7E]/g, '').replace(ansiRegExp(), '').trim() + "\n"
+      if (t.stack) text += "```diff\n" + t.stack.replace(ansiRegExp(), '').trim() + "\n```\n";
+      
+      if (t.artifacts && t.artifacts.length && !process.env.TESTOMATIO_PRIVATE_ARTIFACTS) {
+        t.artifacts.filter(f => f.endsWith('.png')).forEach(f => {
+          if (f.endsWith('.png')) return text+= `![](${f})\n`    
+        });
+      }
+
+      text += "\n---\n"
+
+      return text;
+    })
+    
+    let body = summary;
+
+    if (failures.length) {
+      body += `<details>\n<summary>### 🟥 Failures (${failures.length})</summary>\n${failures.join('\n')} </details>`;
+    }
+
+    if (failures.length > 20) {
+      body += "\n> Notice\n> Only first 20 failures shown*"
+    }
+
+    if (this.tests.length > 0) {
+      body += "\n### 🐢 Slowest Tests\n\n"
+      body += this.tests.sort((a, b) => b?.run_time - a?.run_time).slice(0, 5).map(t => {
+        return `* ${fullName(t)} (${parseFloat(t.run_time).toFixed(2)}ms)`
+      }).join('\n')
+    }
+
+    try {
+      const resp = await this.octokit.rest.issues.createComment({
+        owner,
+        repo,
+        issue_number: this.issue,
+        body,
+      });
+  
+      const url = resp.data?.html_url;
+      this.store.githubUrl = url;
+  
+      console.log(
+        APP_PREFIX,
+        chalk.yellow('GitHub'),
+        `Report created: ${chalk.magenta(url)}`,
+      );
+    } catch (err) {
+      console.log(
+        APP_PREFIX,
+        chalk.yellow('GitHub'),
+        `Couldn't create GitHub report ${err}`,
+      );
+    }
+  }
+}
+
+function statusEmoji(status) {
+  if (status === 'passed') return '🟢';
+  if (status === 'failed') return '🔴';
+  if (status === 'skipped') return '🟡';
+  return ''
+}
+
+function fullName(t) {
+  let line = '';
+  if (t.suite_title) line = `${t.suite_title}: `; 
+  line += `**${t.title}**`  
+  if (t.example) line += ` \`[${Object.values(t.example)}]\``;
+  return line;
+}
+
+module.exports = GitHubPipe;

package/lib/pipe/index.js

@@ -0,0 +1,45 @@
+const fs = require('fs');
+const path = require('path');
+const { APP_PREFIX } = require('../constants');
+const TestomatioPipe = require('./testomatio');
+const GitHubPipe = require('./github');
+
+module.exports = function(params, opts) {
+  const extraPipes = [];
+
+  // Add extra pipes into package.json file:
+  // "testomatio": {
+  //   "pipes": ["my-module-pipe", "./local/js/file/pipe"] 
+  // }
+
+  const packageJsonFile = path.join(process.cwd(), 'package.json');
+  if (fs.existsSync(packageJsonFile)) {
+    const package = fs.readFileSync(packageJsonFile);
+    const pipeDefs = package?.testomatio?.pipes || [];
+    
+    for (const pipeDef of pipeDefs) {
+      let pipeClass;
+      try {
+        pipeClass = require(pipeDef);
+      } catch (err) {
+        console.log(APP_PREFIX, `Can't load module Testomatio pipe module from ${pipeDef}`);
+        continue;
+      }
+
+      try {
+        extraPipes.push(new pipeClass(params, opts))
+      } catch (err) {
+        console.log(APP_PREFIX, `Can't instantiate Testomatio for ${pipeDef}`, err);
+        continue;
+      }
+    }
+  }
+  
+
+  const defaultPipes = [
+    new TestomatioPipe(params, opts),
+    new GitHubPipe(params, opts),    
+  ];
+
+  return [...defaultPipes, ...extraPipes];
+}

package/lib/pipe/testomatio.js

@@ -0,0 +1,128 @@
+const chalk = require('chalk');
+const axios = require('axios');
+const JsonCycle = require('json-cycle');
+const { TESTOMATIO_RUNGROUP_TITLE, TESTOMATIO_RUN } = process.env;
+const { APP_PREFIX } = require('../constants');
+const { isValidUrl } = require('../util');
+
+if (TESTOMATIO_RUN) {
+  process.env.runId = TESTOMATIO_RUN;
+}
+
+class TestomatioPipe {
+  isEnabled = false;
+
+  constructor(params, store = {}) {    
+    this.url = params.testomatioUrl || process.env.TESTOMATIO_URL || 'https://app.testomat.io';
+    this.apiKey = params.apiKey || process.env.TESTOMATIO;
+    if (!this.apiKey) {
+      return;
+    }
+    this.store = store;
+    this.title = params.title || process.env.TESTOMATIO_TITLE;
+    this.axios = axios.create();
+    this.isEnabled = true;
+    this.proceed = process.env.TESTOMATIO_PROCEED;
+    this.runId = params.runId || process.env.runId;
+    this.createNewTests = !!process.env.TESTOMATIO_CREATE;
+
+
+    if (!isValidUrl(this.url.trim())) {
+      this.isEnabled = false;
+      console.log(
+        APP_PREFIX,
+        chalk.red(`Error creating report on Testomat.io, report url '${this.url}' is invalid`),
+      );
+      return;
+    }
+  }
+
+  async createRun(runParams) {
+    if (!this.isEnabled) return;
+
+    runParams.api_key = this.apiKey.trim();
+    runParams.group_title = TESTOMATIO_RUNGROUP_TITLE;
+    
+    if (this.runId) {
+      return this.axios.put(`${this.url.trim()}/api/reporter/${this.runId}`, runParams)  
+    }
+    
+    try {
+      const resp = await this.axios.post(`${this.url.trim()}/api/reporter`, runParams, {
+        maxContentLength: Infinity,
+        maxBodyLength: Infinity,
+      })
+      this.runId = resp.data.uid;
+      this.runUrl = `${this.url}/${resp.data.url.split('/').splice(3).join('/')}`;
+      this.store.runUrl = this.runUrl;
+      this.store.runId = this.runId;      
+      console.log(APP_PREFIX, '📊 Report created. Report ID:', this.runId, chalk.gray(`v${this.version}`));
+      process.env.runId = this.runId;
+    } catch (err) {
+      console.log(
+        APP_PREFIX,
+        'Error creating Testomat.io report, please check if your API key is valid. Skipping report',
+      );
+    }
+  }
+
+  async addTest(data) {
+    if (!this.isEnabled) return;
+    if (!this.runId) return;
+    data.api_key = this.apiKey;
+    data.create = this.createNewTests;
+    const json = JsonCycle.stringify(data);
+
+    try {
+      return await this.axios.post(`${this.url}/api/reporter/${this.runId}/testrun`, json, {
+        maxContentLength: Infinity,
+        maxBodyLength: Infinity,
+        headers: {
+          // Overwrite Axios's automatically set Content-Type
+          'Content-Type': 'application/json',
+        },
+      });
+    } catch (err) {
+      if (err.response) {
+        if (err.response.status >= 400) {
+          const data = err.response.data || { message: '' };
+          console.log(
+            APP_PREFIX,
+            chalk.blue(this.title),
+            `Report couldn't be processed: (${err.response.status}) ${data.message}`,
+          );
+          return;
+        }
+        console.log(APP_PREFIX, chalk.blue(this.title), `Report couldn't be processed: ${err.response.data.message}`);
+      } else {
+        console.log(APP_PREFIX, chalk.blue(this.title), "Report couldn't be processed", err);
+      }
+    }
+
+  }
+
+  async finishRun(params) {
+    if (!this.isEnabled) return;
+    try {
+      if (this.runId && !this.proceed) {
+        await this.axios.put(`${this.url}/api/reporter/${this.runId}`, {
+          api_key: this.apiKey,
+          status_event: params.statusEvent,
+          status: params.status,
+        });
+        if (this.runUrl) {
+          console.log(APP_PREFIX, '📊 Report Saved. Report URL:', chalk.magenta(this.runUrl));
+        }
+      }
+      if (this.runUrl && this.proceed) {
+        const notFinishedMessage = chalk.yellow.bold('Run was not finished because of $TESTOMATIO_PROCEED');
+        console.log(APP_PREFIX, `📊 ${notFinishedMessage}. Report URL: ${chalk.magenta(this.runUrl)}`);
+        console.log(APP_PREFIX, `🛬 Run to finish it: TESTOMATIO_RUN=${this.runId} npx start-test-run --finish`);
+      }
+    } catch (err) {
+      console.log(APP_PREFIX, 'Error updating status, skipping...', err);
+    }
+  }  
+}
+
+module.exports = TestomatioPipe;

package/lib/util.js

@@ -135,13 +135,17 @@ const fetchSourceCode = (contents, opts = {}) => {
     }
     return result.join('\n');
   }
+}
 
+const isSameTest = (test, t) => {
+  return t.title == test.title && t.suite_title == test.suite_title && Object.values(t.example) == Object.values(test.example) && t.test_id == test.test_id;
 }
 
 module.exports = {
   parseTest,
   parseSuite,
   ansiRegExp,
+  isSameTest,
   isValidUrl,
   fetchSourceCode,
   fetchSourceCodeFromStackTrace,

package/lib/xmlReader.js

@@ -1,19 +1,14 @@
 const path = require("path");
-const axios = require('axios');
 const chalk = require('chalk');
 const fs = require("fs");
 
 // const util = require("util"); // you can see a result
 const { XMLParser } = require("fast-xml-parser");
-const { APP_PREFIX, PASSED, FAILED, SKIPPED } = require('./constants');
-const { isValidUrl, fetchFilesFromStackTrace, fetchSourceCode, fetchSourceCodeFromStackTrace } = require('./util');
+const { PASSED, FAILED, SKIPPED } = require('./constants');
+const { fetchFilesFromStackTrace, fetchSourceCode, fetchSourceCodeFromStackTrace } = require('./util');
 const upload = require('./fileUploader');
-const Adapter = require('./junit-adapter/adapter');
-const JavaScriptAdapter = require('./junit-adapter/javascript');
-const JavaAdapter = require('./junit-adapter/java');
-const PythonAdapter = require('./junit-adapter/python');
-const RubyAdapter = require('./junit-adapter/ruby');
-const CSharpAdapter = require('./junit-adapter/csharp');
+const pipesFactory = require('./pipe');
+const adapterFactory = require('./junit-adapter');
 
 const TESTOMATIO_URL = process.env.TESTOMATIO_URL || "https://app.testomat.io";
 const TESTOMATIO = process.env.TESTOMATIO; // key?
@@ -40,9 +35,11 @@ class XmlReader {
       group_title: TESTOMATIO_RUNGROUP_TITLE,
     };
     this.runId = opts.runId || TESTOMATIO_RUN;
-    this.adapter = new Adapter(opts)
+    this.adapter = adapterFactory(null, opts)
     this.opts = opts;
-    this.axios = axios.create();
+    const store = {}
+    this.pipes = pipesFactory(opts, store);
+
     this.parser = new XMLParser(options);
     this.tests = []
     this.stats = {}
@@ -51,21 +48,8 @@ class XmlReader {
   }
 
   connectAdapter() {
-    if (this.opts.javaTests || this.stats.language === 'java') {
-      this.adapter = new JavaAdapter(this.opts);
-    }
-    if (this.stats.language === 'js') {
-      this.adapter = new JavaScriptAdapter(this.opts);
-    }
-    if (this.stats.language === 'python') {
-      this.adapter = new PythonAdapter(this.opts);
-    }
-    if (this.stats.language === 'ruby') {
-      this.adapter = new RubyAdapter(this.opts);
-    }
-    if (this.stats.language === 'c#' || this.stats.language === 'csharp') {
-      this.adapter = new CSharpAdapter(this.opts);
-    }
+    if (this.opts.javaTests) return adapterFactory('java', this.opts);
+    return adapterFactory(this.stats.language, this.opts);
   }
 
   parse(fileName) {       
@@ -149,7 +133,7 @@ class XmlReader {
 
     const results = jsonSuite?.TestRun?.Results?.UnitTestResult?.map(td => ({ 
       id: td.executionId, 
-      run_time: td.duration,
+      run_time: parseFloat(td.duration),
       status: td.outcome, 
       stack: td.Output.StdOut  
     }));
@@ -276,7 +260,6 @@ class XmlReader {
   }
 
   async uploadArtifacts() {
-    if (!this.runId) return;
     for (const test of this.tests.filter(t => !!t.stack)) {
       const files = fetchFilesFromStackTrace(test.stack);
       test.artifacts = await Promise.all(files.map(f => upload.uploadFileByPath(f, this.runId)));
@@ -284,8 +267,6 @@ class XmlReader {
   }
 
   async createRun() {
-    if (this.runId) return;
-
     const runParams = {
       api_key: this.requestParams.apiKey,
       title: this.requestParams.title,
@@ -295,30 +276,7 @@ class XmlReader {
 
     if (process.env.DEBUG) console.log("Run", runParams);
 
-    try {
-      const resp = await this.axios.post(this.url, runParams, {
-        maxContentLength: Infinity,
-        maxBodyLength: Infinity,
-        headers: {
-          // Overwrite Axios's automatically set Content-Type
-          'Content-Type': 'application/json',
-        }
-      });
-      if (resp.status >= 400) {
-        const data = resp.data || { message: '' };
-        console.log(
-          APP_PREFIX,
-          `Report couldn't be processed: (${resp.status}) ${data.message}`,
-        );
-        return;
-      }
-      this.runId = resp.data.uid;
-      this.runUrl = `${TESTOMATIO_URL}/${resp.data.url.split('/').splice(3).join('/')}`;
-    } catch(err) {
-      if (process.env.DEBUG) console.log(err)
-      const data = err?.response?.data || { message: '' };
-      console.log(APP_PREFIX, 'Error creating run, skipping...', err?.response?.statusText, data);
-    }
+    return Promise.all(this.pipes.map(p => p.createRun(runParams)));
   }
 
   async uploadData() {
@@ -336,56 +294,14 @@ class XmlReader {
       })
     }
 
-    const dataString = JSON.stringify({
+    const dataString = {
       ...this.stats,
       api_key: this.requestParams.apiKey,
       status_event: 'finish',
       tests: this.tests,
-    });
-
-    try {
-      const resp = await this.axios.put(`${this.url}/${this.runId}`, dataString, {
-        maxContentLength: Infinity,
-        maxBodyLength: Infinity,
-        headers: {
-          // Overwrite Axios's automatically set Content-Type
-          'Content-Type': 'application/json',
-        }
-      });
-
-      if (resp.status >= 400) {
-        const data = resp.data || { message: '' };
-        console.log(
-          APP_PREFIX,
-          `Report couldn't be processed: (${resp.status}) ${data.message}`,
-        );
-        return;
-      }
-
-      if (this.runUrl) {
-        console.log(APP_PREFIX, '📊 Report Saved. Report URL:', chalk.magenta(this.runUrl));
-      }
-      process.env.runId = this.runId;
-      return resp;
-    } catch (err) {
-      // if (process.env.DEBUG) console.log(err.response)
-      const data = err.response.data || { message: '' };
-      console.log(APP_PREFIX, 'Error uploading, skipping...', err.response.statusText, data);
-      return err.response;
-    }
-
-  }
-
-  get url() {
-    if (!isValidUrl(this.requestParams.url)) {
-      console.log(
-        APP_PREFIX,
-        chalk.red(`Error creating report on Testomat.io, report url '${this.requestParams.url}' is invalid`),
-      );
-      return;
-    }
+    };
 
-    return `${this.requestParams.url}/api/reporter`;
+    return Promise.all(this.pipes.map(p => p.finishRun(dataString)));
   }
 }
 
@@ -426,7 +342,7 @@ function reduceTestCases(prev, item) {
       stack,
       message,
       line: testCaseItem.lineno,
-      run_time: testCaseItem.time || testCaseItem.duration,
+      run_time: parseFloat(testCaseItem.time || testCaseItem.duration),
       status,
       title: testCaseItem.name,
       suite_title: reduceOptions.preferClassname ? testCaseItem.classname : (item.name || testCaseItem.classname),
@@ -449,4 +365,3 @@ function processTestSuite(testsuite) {
 
   return res;
 }
-

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@testomatio/reporter",
-  "version": "0.7.3",
+  "version": "0.8.0-beta.2",
   "description": "Testomatio Reporter Client",
   "main": "./lib/reporter.js",
   "repository": "git@github.com:testomatio/reporter.git",
   "author": "Michael Bodnarchuk <davert@testomat.io>,Koushik Mohan <koushikmohan1996@gmail.com>",
   "license": "MIT",
   "dependencies": {
+    "@octokit/rest": "^19.0.5",
     "aws-sdk": "^2.1072.0",
     "axios": "^0.25.0",
     "callsite-record": "^4.1.4",