@testomatio/reporter 1.1.0-beta-2 → 1.2.0-beta-1

package/lib/utils/utils.js

@@ -290,19 +290,6 @@ function removeColorCodes(input) {
   return input.replace(/\x1b\[[0-9;]*m/g, '');
 }
 
-const jestHelpers = {
-  getIdOfCurrentlyRunningTest: () => {
-    if (!process.env.JEST_WORKER_ID) return null;
-    try {
-      // @ts-expect-error "expect" could only be defined inside Jest environement (forbidden to import it outside)
-      // eslint-disable-next-line no-undef
-      if (expect && expect?.getState()?.currentTestName) return parseTest(expect?.getState()?.currentTestName);
-    } catch (e) {
-      return null;
-    }
-  },
-};
-
 module.exports = {
   isSameTest,
   fetchSourceCode,
@@ -312,7 +299,6 @@ module.exports = {
   fetchFilesFromStackTrace,
   fileSystem,
   getCurrentDateTime,
-  jestHelpers,
   specificTestInfo,
   isValidUrl,
   ansiRegExp,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testomatio/reporter",
-  "version": "1.1.0-beta-2",
+  "version": "1.2.0-beta-1",
   "description": "Testomatio Reporter Client",
   "main": "./lib/reporter.js",
   "typings": "typings/index.d.ts",
@@ -21,6 +21,7 @@
     "dotenv": "^16.0.1",
     "fast-xml-parser": "^4.0.8",
     "glob": "^10.3",
+    "handlebars": "^4.7.8",
     "has-flag": "^5.0.1",
     "humanize-duration": "^3.27.3",
     "is-valid-path": "^0.1.1",

package/lib/reporter-functions.js

@@ -1,43 +0,0 @@
-const logger = require('./storages/logger');
-const artifactStorage = require('./storages/artifact-storage');
-const keyValueStorage = require('./storages/key-value-storage');
-
-/**
- * Stores path to file as artifact and uploads it to the S3 storage
- * @param {string | {path: string, type: string, name: string}} data - path to file or object with path, type and name
- */
-function saveArtifact(data, context = null) {
-  if (!data) return;
-  artifactStorage.put(data, context);
-}
-
-/**
- * Attach log message(s) to the test report
- * @param  {...any} args
- */
-function logMessage(...args) {
-  logger.log(...args);
-}
-
-/**
- * Similar to "log" function but marks message in report as a step
- * @param {*} message 
- */
-function addStep(message) {
-  logger.step(message);
-}
-
-/**
- * Add key-value pair(s) to the test report
- * @param {*} keyValue 
- */
-function setKeyValue(keyValue) {
-  keyValueStorage.put(keyValue);
-}
-
-module.exports = {
-  artifact: saveArtifact,
-  log: logMessage,
-  step: addStep,
-  keyValue: setKeyValue,
-};

package/lib/storages/artifact-storage.js

@@ -1,70 +0,0 @@
-const debug = require('debug')('@testomatio/reporter:artifact-storage');
-const DataStorage = require('./data-storage');
-
-/**
- * Artifact storage is supposed to store file paths
- */
-class ArtifactStorage {
-
-  // there is autocompletion for the class methods if implemented singleton this way
-  constructor() {
-    this.dataStorage = new DataStorage('artifact');
-    
-    // singleton
-    if (!ArtifactStorage.instance) {
-      ArtifactStorage.instance = this;
-    }
-  }
-
-  // singleton
-  static getInstance() {
-    if (!ArtifactStorage.instance) {
-      ArtifactStorage.instance = new ArtifactStorage();
-    }
-
-    return ArtifactStorage.instance;
-  }
-
-  /**
-   * Stores path to file as artifact and uploads it to the S3 storage
-   * @param {string | {path: string, type: string, name: string}} data - path to file or object with path, type and name
-   * @param {*} context testId or test title
-   */
-  put(data, context = null) {
-    if (!data) return;
-    debug('Save artifact:', data);
-    this.dataStorage.putData(data, context);
-  }
-
-  /**
-   * Returns list of artifacts to upload
-   * @param {*} context testId or test context from test runner
-   * @returns {string | {path: string, type: string, name: string}[]}
-   */
-  get(context) {
-    if (!context) return null;
-
-    // array of any data
-    let artifacts = this.dataStorage.getData(context);
-    if (!artifacts || !artifacts.length) return null;
-
-    artifacts = artifacts.map(artifactData => {
-      // artifact could be an object ({type, path, name} props) or string
-      let artifact;
-      try {
-        artifact = JSON.parse(artifactData);
-      } catch (e) {
-        artifact = artifactData;
-      }
-      return artifact;
-    });
-    artifacts = artifacts.filter(artifact => !!artifact);
-    return artifacts.length ? artifacts : null;
-  }
-}
-
-ArtifactStorage.instance = null;
-
-// const artifactStorage = ArtifactStorage.getInstance();
-const artifactStorage = new ArtifactStorage();
-module.exports = artifactStorage;

package/lib/storages/key-value-storage.js

@@ -1,58 +0,0 @@
-const debug = require('debug')('@testomatio/reporter:key-value-storage');
-const DataStorage = require('./data-storage');
-
-class KeyValueStorage {
-  constructor() {
-    this.dataStorage = new DataStorage('keyvalue');
-
-    // singleton
-    if (!KeyValueStorage.instance) {
-      KeyValueStorage.instance = this;
-    }
-  }
-
-  /**
-   * Stores key-value pair and passes it to reporter
-   * @param {{key: string}} keyValue - key-value pair(s) as object
-   * @param {*} context testId or test title
-   */
-  put(keyValue, context = null) {
-    if (!keyValue) return;
-    this.dataStorage.putData(keyValue, context);
-  }
-
-  #isKeyValueObject(smth) {
-    return smth && typeof smth === 'object' && !Array.isArray(smth) && smth !== null;
-  }
-
-  /**
-   * Returns key-values pairs for the test as object
-   * @param {*} context testId or test context from test runner
-   * @returns {Object} key-values pairs as object
-   */
-  get(context) {
-    if (!context) return null;
-
-    const keyValuesList = this.dataStorage.getData(context);
-    if (!keyValuesList || !keyValuesList?.length) return null;
-
-    const keyValues = {};
-    for (const keyValue of keyValuesList) {
-      if (this.#isKeyValueObject(keyValue)) {
-        Object.assign(keyValues, keyValue);
-      } else if (typeof keyValue === 'string') {
-        try {
-          Object.assign(keyValues, JSON.parse(keyValue));
-        } catch (e) {
-          debug(`Error parsing key-values for test ${context}`, keyValue);
-        }
-      }
-    }
-
-    return Object.keys(keyValues).length ? keyValues : null;
-  }
-}
-
-KeyValueStorage.instance = null;
-
-module.exports = new KeyValueStorage();