@testomatio/reporter 1.1.0-rc.1 → 1.1.0-rc.2

package/README.md

@@ -65,23 +65,16 @@ yarn add @testomatio/reporter --dev
 
 ### 1️⃣ Attach Reporter to the Test Runner
 
-* #### [Playwright](./docs/frameworks.md#playwright)
-* #### [CodeceptJS](./docs/frameworks.md#CodeceptJS)
-* #### [Cypress](./docs/frameworks.md#Cypress)
-* #### [Jest](./docs/frameworks.md#Jest)
-* #### [Mocha](./docs/frameworks.md#Mocha)
-* #### [WebDriverIO](./docs/frameworks.md#WebDriverIO)
-* #### [TestCafe](./docs/frameworks.md#TestCafe)
-* #### [Detox](./docs/frameworks.md#Detox)
-* #### [Codeception](https://github.com/testomatio/php-reporter)
-* #### [Newman (Postman)](./docs/frameworks.md#Newman)
-* #### [JUnit](./docs/junit.md#junit)
-* #### [NUnit](./docs/junit.md#nunit)
-* #### [PyTest](./docs/junit.md#pytest)
-* #### [PHPUnit](./docs/junit.md#phpunit)
-* #### [Protractor](./docs/frameworks.md#protractor)
-
-or any [other via JUnit](./docs/junit.md) report....
+| | | |
+|--|--|--|
+| [Playwright](./docs/frameworks.md#playwright) | [CodeceptJS](./docs/frameworks.md#CodeceptJS) | [Cypress](./docs/frameworks.md#Cypress) |
+| [Jest](./docs/frameworks.md#Jest) | [Mocha](./docs/frameworks.md#Mocha) | [WebDriverIO](./docs/frameworks.md#WebDriverIO) |
+| [TestCafe](./docs/frameworks.md#TestCafe) | [Detox](./docs/frameworks.md#Detox) | [Codeception](https://github.com/testomatio/php-reporter) |
+| [Newman (Postman)](./docs/frameworks.md#Newman) | [JUnit](./docs/junit.md#junit) | [NUnit](./docs/junit.md#nunit) |
+| [PyTest](./docs/junit.md#pytest) | [PHPUnit](./docs/junit.md#phpunit) | [Protractor](./docs/frameworks.md#protractor) |
+
+
+or **any [other via JUnit](./docs/junit.md)** report....
 
 ### 2️⃣ Configure Reports
 

package/lib/adapter/jest.js

@@ -4,6 +4,7 @@ const { STATUS, TESTOMAT_TMP_STORAGE_DIR } = require('../constants');
 const { parseTest, ansiRegExp, fileSystem } = require('../utils/utils');
 const { services } = require('../services');
 const debug = require('debug')('@testomatio/reporter:adapter-jest');
+const path = require('path');
 
 class JestReporter {
   constructor(globalConfig, options) {
@@ -47,13 +48,11 @@ class JestReporter {
         steps = failureMessages[0];
       }
       const testId = parseTest(title);
-      let suite_title;
-      // this is test without a suite
-      if (result.fullName === result.title) {
-        suite_title = testResult.testFilePath.split('/').pop();
-      } else {
-        suite_title = result.fullName.replace(result.title, '');
-      }
+      
+      // suite titles from most outer to most inner, separated by space
+      let fullSuiteTitle = testResult.ancestorTitles?.join(' ');
+      // if no suite titles, use file name
+      if (!fullSuiteTitle && testResult.testFilePath) fullSuiteTitle = path.basename(testResult.testFilePath);
 
       const logs = getTestLogs(result);
       const artifacts = services.artifacts.get(testResult.fullName);
@@ -65,7 +64,7 @@ class JestReporter {
       if (!this._globalConfig.testNamePattern || deducedStatus !== 'skipped') {
         this.client.addTestRun(deducedStatus, {
           test_id: testId,
-          suite_title,
+          suite_title: fullSuiteTitle,
           error,
           steps,
           title,

package/lib/client.js

@@ -163,9 +163,16 @@ class Client {
       uploadedFiles.push(upload.uploadFileAsBuffer(buffer, fileName, this.uuid));
     }
 
-    const artifacts = await Promise.all(uploadedFiles);
-
-    // global.testomatioArtifacts = [];
+    const artifacts = (await Promise.all(uploadedFiles)).filter(n => !!n);
+
+    if (artifacts.length < uploadedFiles.length) {
+      console.log(
+        APP_PREFIX,
+        chalk.yellow(
+          `Some artifacts were not uploaded. ${artifacts.length}/${uploadedFiles.length} artifacts uploaded.`,
+        ),
+      );
+    }
 
     this.totalUploaded += uploadedFiles.filter(n => n).length;
 

package/lib/data-storage.js

@@ -58,8 +58,6 @@ class DataStorage {
    */
   putData(dataType, data, context = null) {
     if (!dataType || !data) return;
-    const dataDirPath = path.join(TESTOMAT_TMP_STORAGE_DIR, dataType);
-    fileSystem.createDir(dataDirPath);
 
     context = context || this.context || global.testomatioTestTitle || jestHelpers.getIdOfCurrentlyRunningTest();
     if (!context) {
@@ -69,6 +67,8 @@ class DataStorage {
     context = this.#stringToFilename(context);
 
     if (this.isFileStorage) {
+      const dataDirPath = path.join(TESTOMAT_TMP_STORAGE_DIR, dataType);
+      fileSystem.createDir(dataDirPath);
       this.#putDataToFile(dataType, data, context);
     } else {
       this.#putDataToGlobalVar(dataType, data, context);

package/lib/fileUploader.js

@@ -146,8 +146,13 @@ const uploadUsingS3 = async (filePath, runId) => {
       params
     });
 
-    return await getS3LocationLink(out);
-  } 
+    
+    const link = await getS3LocationLink(out);
+    
+    debug(`Succesfully uploaded ${filePath} => ${S3_BUCKET}/${Key} | URL: ${link}`);
+
+    return link;
+  }
   catch (e) {
     debug('S3 file uploading error: ', e);
    
@@ -279,8 +284,6 @@ const getS3LocationLink = async (out) => {
 
   let s3Location = response?.Location;
 
-  debug('Uploaded response.Location', s3Location);
-
   if (!s3Location) {
     // TODO: out: a fallback case  - remove after deeper testing
     s3Location = out?.singleUploadResult?.Location;

package/lib/reporter-functions.js

@@ -19,7 +19,7 @@ function saveArtifact(data, context = null) {
  * @param  {...any} args
  */
 function logMessage(...args) {
-  services.logger.log(...args);
+  services.logger.templateLiteralLog(...args);
 }
 
 /**
@@ -38,18 +38,9 @@ function setKeyValue(keyValue) {
   services.keyValues.put(keyValue);
 }
 
-/**
- *
- * @param {string} context – test id or test title or suite title + test title
- */
-function _setStorageContext(context) {
-  services.setContext(context);
-}
-
 module.exports = {
   artifact: saveArtifact,
   log: logMessage,
   step: addStep,
   keyValue: setKeyValue,
-  _setStorageContext,
 };

package/lib/reporter.js

@@ -1,30 +1,19 @@
-const { services } = require('./services');
 const TestomatClient = require('./client');
 const TRConstants = require('./constants');
 
-const logger = services.logger;
-
-// TODO: should be deprecated, reporter-functions should be used instead
-const log = logger.templateLiteralLog.bind(logger);
-const step = logger.step.bind(logger);
-
 const reporterFunctions = require('./reporter-functions');
 
 module.exports = {
-  // duplications; no difference
-  logger,
-  testomatioLogger: logger,
-
-  log,
-  step,
-  TestomatClient,
-  TRConstants,
-};
+  // TODO: deprecate in future; use log or testomat.log
+  logger: reporterFunctions.log,
+  testomatioLogger: reporterFunctions.log,
 
-module.exports.testomat = {
   artifact: reporterFunctions.artifact,
   log: reporterFunctions.log,
-  step: reporterFunctions.step,
   meta: reporterFunctions.keyValue,
-  _setStorageContext: reporterFunctions._setStorageContext,
+  step: reporterFunctions.step,
+
+  TestomatClient,
+  TRConstants,
 };
+

package/lib/services/artifacts.js

@@ -1,4 +1,4 @@
-const debug = require('debug')('@testomatio/reporter:artifact-storage');
+const debug = require('debug')('@testomatio/reporter:services-artifacts');
 const { dataStorage } = require('../data-storage');
 
 /**

package/lib/services/key-values.js

@@ -1,4 +1,4 @@
-const debug = require('debug')('@testomatio/reporter:key-value-storage');
+const debug = require('debug')('@testomatio/reporter:services-key-value');
 const { dataStorage } = require('../data-storage');
 
 class KeyValueStorage {

package/lib/services/logger.js

@@ -1,5 +1,5 @@
 const chalk = require('chalk');
-const debug = require('debug')('@testomatio/reporter:logger');
+const debug = require('debug')('@testomatio/reporter:services-logger');
 const { dataStorage } = require('../data-storage');
 
 const LOG_METHODS = ['assert', 'debug', 'error', 'info', 'log', 'trace', 'warn'];
@@ -150,11 +150,12 @@ class Logger {
 
     const logs = this.#stringifyLogs(...argsArray);
 
-    // skip logs from testomatio reporter itself
-    if (logs.includes('[TESTOMATIO]')) return;
-
     const colorizedLogs = chalk[LEVELS[level].color](logs);
-    dataStorage.putData('log', colorizedLogs);
+    // do not attach logs from testomatio reporter itself
+    if (!logs.includes('[TESTOMATIO]')) {
+      dataStorage.putData('log', colorizedLogs);
+    }
+
     try {
       // level.toLowerCase() represents method name (log, warn, error, etc)
       this.#originalUserLogger[level.toLowerCase()](colorizedLogs);

package/package.json

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