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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testomatio/reporter",
-  "version": "1.1.0-beta",
+  "version": "1.1.0-beta-2",
   "description": "Testomatio Reporter Client",
   "main": "./lib/reporter.js",
   "typings": "typings/index.d.ts",
@@ -20,13 +20,14 @@
     "debug": "^4.3.4",
     "dotenv": "^16.0.1",
     "fast-xml-parser": "^4.0.8",
-    "glob": "^8.0.3",
+    "glob": "^10.3",
     "has-flag": "^5.0.1",
     "humanize-duration": "^3.27.3",
     "is-valid-path": "^0.1.1",
     "json-cycle": "^1.3.0",
     "lodash.memoize": "^4.1.2",
     "lodash.merge": "^4.6.2",
+    "minimatch": "^9.0.3",
     "uuid": "^9.0.0"
   },
   "files": [
@@ -41,21 +42,22 @@
     "lint:fix": "eslint lib --fix",
     "test": "mocha tests/**",
     "init": "cd ./tests/adapter/examples/cucumber && npm i",
-    "test:unit": "mocha tests",
     "test:adapter": "mocha './tests/adapter/index.test.js'",
     "test:pipes": "mocha './tests/pipes/*_test.js'",
     "test:adapter:jest:example": "jest './tests/adapter/examples/jest/index.test.js' --config='./tests/adapter/examples/jest/jest.config.js'",
     "test:adapter:mocha:example": "mocha './tests/adapter/examples/mocha/index.test.js' --config='./tests/adapter/examples/mocha/mocha.config.js'",
     "test:adapter:jasmine:example": "./tests/adapter/examples/jasmine/passReporterOpts.sh && jasmine './tests/adapter/examples/jasmine/index.test.js' --reporter=./../../../lib/adapter/jasmine.js",
     "test:adapter:codecept:example": "codeceptjs run --config='./tests/adapter/examples/codecept/codecept.conf.js'",
-    "test:adapter:cucumber:example": "cd ./tests/adapter/examples/cucumber && npx cucumber-js"
+    "test:adapter:cucumber:example": "cd ./tests/adapter/examples/cucumber && npx cucumber-js",
+    "test:storage": "npx mocha ./tests-storage/**"
   },
   "devDependencies": {
-    "@cucumber/cucumber": "^8.6.0",
+    "@cucumber/cucumber": "^9.3.0",
     "@redocly/cli": "^1.0.0-beta.125",
     "@wdio/reporter": "^7.16.13",
     "chai": "^4.3.6",
-    "codeceptjs": "^3.2.3",
+    "codeceptjs": "latest",
+    "cucumber": "^6.0.7",
     "eslint": "^8.7.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^8.3.0",
@@ -64,6 +66,7 @@
     "jest": "^27.4.7",
     "mocha": "^9.2.0",
     "mock-http-server": "^1.4.5",
+    "pino": "^8.15.0",
     "prettier": "2.5.1",
     "puppeteer": "^13.1.2"
   },

package/lib/_ArtifactStorageOld.js

@@ -1,141 +0,0 @@
-const debug = require('debug')('@testomatio/reporter:storage');
-const { join, resolve } = require('path');
-const fs = require('fs');
-const os = require('os');
-const uuid = require('uuid');
-const { TESTOMAT_ARTIFACT_SUFFIX } = require('./constants');
-const { specificTestInfo } = require('./util');
-
-class ArtifactStorage {
-
-  constructor(params) {
-    this._tmpPrefix = "tsmt_reporter";
-    this.isFile = false;
-    this.isMemory = true;
-    this.storage = params?.toFile;
-
-    if (this.storage) {
-      // this is fine to use when you start saving artifacts;
-      // but when you need to retrieve them, you will not know if there is "isFile" param,
-      // because you need to create a new instance of ArtifactStorage inside client
-      // so the solution is make it opposite to isMemory (which will be retrieved from global)
-      this.isFile = true;
-      this.isMemory = false;
-      this.tmpDirFullpath = this.createTestomatTmpDir(this._tmpPrefix);
-      debug('SAVE to tmp folder mode enabled!');
-    }
-  }
-
-  static async storeToFile(tmpDirName, artifact, testSuffix = "test") {
-    // this assumes to use multiple files for each test. do we really want this?
-    const suffix = TESTOMAT_ARTIFACT_SUFFIX + uuid.v4() + testSuffix;
-    const dirpath = join(os.tmpdir(), tmpDirName);
-    // why json?
-    const filepath = resolve(dirpath, `${suffix}.json`);
-
-    return fs.promises.appendFile(filepath, JSON.stringify(artifact));
-  }
-
-  static async artifact(artifact, context) {
-    // TODO: mode for different pre-hooks. As variant - "all-tests" || "only_fail"
-    // const mode = process.env.TESTOMAT_ARTIFACTS || "only_fail";
-
-    // you save the artifact without specifying its source - test id
-    if (Array.isArray(global.testomatioArtifacts)) {
-      debug("Saving artifacts to global storage");
-
-      global.testomatioArtifacts.push(artifact);
-    }
-
-    if (global?.testomatioArtifacts === undefined) {
-      const tmpDirNames = ArtifactStorage.tmpTestomatDirNames();
-
-      const testSuffix = specificTestInfo(context.test);
-
-      if (Array.isArray(tmpDirNames) && tmpDirNames.length) {
-        debug("Saving artifacts to memory tmp folder");
-
-        return ArtifactStorage.storeToFile(tmpDirNames[tmpDirNames.length - 1], artifact, testSuffix);
-      }
-    }
-  }
-
-  async artifactByTestName(test) {
-    const list = [];
-
-    if (this.isFile && this.tmpDirFullpath) {
-      const files = fs.readdirSync(this.tmpDirFullpath);
-
-      for (const file of files) {
-        if (file.includes(test)) {
-          const buff = await fs.promises.readFile(`${this.tmpDirFullpath  }/${  file}`);
-
-          list.push(JSON.parse(buff.toString()));
-        }
-      }
-    }
-
-    return list;
-  }
-
-  // returns all the content from all files; do we really need it?
-  async tmpContents() {
-    const contents = [];
-
-    if (this.isFile && this.tmpDirFullpath) {
-      const files = fs.readdirSync(this.tmpDirFullpath);
-
-      for (const file of files) {
-        const buff = await fs.promises.readFile(`${this.tmpDirFullpath  }/${  file}`);
-        const content = buff.toString();
-
-        contents.push(content);
-      }
-    }
-
-    return contents;
-  }
-
-  createTestomatTmpDir(clientPrefix) {
-    return fs.mkdtempSync(join(os.tmpdir(), clientPrefix));
-  }
-
-  clearTmpDirByName(name) {
-    const tmpDirPath = join(os.tmpdir(), name);
-
-    if (fs.existsSync(tmpDirPath)) {
-      fs.rmSync(tmpDirPath, { recursive: true });
-      debug(` Testomat tmpDir = ${tmpDirPath} was deleted successfully!`);
-
-      
-    }
-  }
-
-  // no need to use multiple dirs; we can implement it later if required
-  static tmpTestomatDirNames() {
-    const subname = this._tmpPrefix || "tsmt_reporter";
-
-    return fs.readdirSync(os.tmpdir(), { withFileTypes: true })
-      .filter((item) => item.isDirectory())
-      .map((item) => item.name)
-      .filter((name) => name.includes(subname));
-  }
-
-  cleanup() {
-    // when you do a cleanup, I know nothing about isFile param
-    if (this.isFile && this.tmpDirFullpath) {
-      const tmpDirNames = ArtifactStorage.tmpTestomatDirNames();
-
-      if (Array.isArray(tmpDirNames) && tmpDirNames.length) {
-        for (const name of tmpDirNames) {
-          this.clearTmpDirByName(name);
-        }
-      }
-    }
-    else {
-      debug("The tmp folder has not been created! Nothing to delete");
-    }
-  }
-}
-
-module.exports = ArtifactStorage;

package/lib/artifactStorage.js

@@ -1,25 +0,0 @@
-// const debug = require('debug')('@testomatio/reporter:logger');
-const { DataStorage } = require('./dataStorage');
-
-class ArtifactStorage {
-  constructor(params = {}) {
-    this.dataStorage = new DataStorage('artifact', params);
-
-    // singleton
-    if (!ArtifactStorage.instance) {
-      ArtifactStorage.instance = this;
-    }
-  }
-
-  save(data, context = null) {
-    this.dataStorage.putData(data, context);
-  }
-
-  get(context) {
-    this.dataStorage.getData(context);
-  }
-}
-
-ArtifactStorage.instance = null;
-
-module.exports = new ArtifactStorage();

package/lib/dataStorage.js

@@ -1,172 +0,0 @@
-const debug = require('debug')('@testomatio/reporter:storage');
-const fs = require('fs');
-const path = require('path');
-const os = require('os');
-const { join } = require('path');
-const JestReporter = require('./adapter/jest');
-const { TESTOMAT_TMP_STORAGE } = require('./constants');
-const { fileSystem } = require('./util');
-
-class DataStorage {
-  /**
-   * Creates data storage instance for specific data type.
-   * Stores data to global variable or to file depending on what is applicable for current test runner.
-   * dataType: 'log' | 'artifact' | ...
-   * @param {*} dataType storage type (like 'log', 'artifact'); could be any string, used only to define file path
-   * @param {*} params
-   */
-  constructor(dataType, params = {}) {
-    if (!dataType) throw new Error('Data type is required when creating data storage');
-    this.dataType = dataType || 'data';
-    this.dataDirName = `${dataType}s`;
-    this.isFileStorage = params?.isFileStorage ?? !global.testomatioDataStore;
-
-    /*
-      FYI:
-      If this storage instance is used within test runner, it works fine.
-      But if, for example, we create storage instance inside the testomatio client (to get stored data),
-      the environment could be different (not already a test runner env).
-      Thus, checking environment is only reasonable when you put data to starage 
-      and potentially useless when get data from storage
-    */
-    const runningEnvironment = this.getRunningEnviroment();
-    if (runningEnvironment === 'jest') this.isFileStorage = true;
-
-    if (this.isFileStorage) {
-      this.dataDirPath = path.join(TESTOMAT_TMP_STORAGE.mainDir, this.dataDirName);
-      fileSystem.createDir(this.dataDirPath);
-    }
-
-    debug(`Data storage mode: ${this.isFileStorage ? 'file' : 'memory'}`);
-  }
-
-  // TODO: implement
-  getTestIdFromContext(context) { // eslint-disable-line
-    // eslint-disable-line
-    // return testId;
-  }
-
-  /**
-   * Try to define the running environment. Not 100% reliable and used as additional check
-   * @returns jest | mocha | ...
-   */
-  getRunningEnviroment() {
-    if (process.env.JEST_WORKER_ID) return 'jest';
-    // @ts-expect-error mocha could be undefined, its ok
-    if (typeof mocha !== 'undefined') return 'mocha';
-    return undefined;
-  }
-
-  /**
-   * Puts any data to storage (file or global variable)
-   * @param {*} data anything you want to store
-   * @param {*} context could be testId or any context (test, suite, etc) which is used to define testId
-   * @returns
-   */
-  putData(data, context = null) {
-    let testId = null;
-    if (typeof context === 'string') {
-      testId = context;
-    } else {
-      // TODO: derive testId from context
-      // testId = context...
-    }
-
-    // try to get testId for Jest
-    testId = testId ?? JestReporter.getIdOfCurrentlyRunningTest();
-
-    // if testId is not provided, data is be saved to `{dataType}_other` file;
-    if (!testId) testId = 'other';
-
-    if (this.isFileStorage) {
-      this._putDataToFile(data, testId);
-    } else {
-      this._putDataToGlobalVar(data, testId);
-    }
-  }
-
-  /**
-   * Returns data, stored for specific testId (or data which was stored without test id specified)
-   *
-   * (Don't try to guess the execution environment (e.g. test runner) inside this method, it could be any)
-   * @param {*} context could be testId or any context (test, suite, etc) which is used to define testId
-   * @returns
-   */
-  getData(context) {
-    let testId = null;
-    if (typeof context === 'string') {
-      testId = context;
-    } else {
-      // TODO: derive testId from context
-      // testId = context...
-    }
-
-    if (!testId) testId = 'other';
-
-    if (this.isFileStorage) {
-      return this._getDataFromFile(testId);
-    }
-    if (global?.testomatioDataStore) {
-      return this._getDataFromGlobalVar(testId);
-    }
-    debug(`No ${this.dataType} data for test id ${testId} in both file and global variable`);
-    return null;
-  }
-
-  _getDataFromGlobalVar(testId) {
-    try {
-      if (global?.testomatioDataStore[this.dataDirName]) {
-        const testData = global.testomatioDataStore[this.dataDirName][testId];
-        debug(`Data for test id ${testId}:\n${testData}`);
-        return testData;
-      }
-      debug(`No ${this.dataType} data for test id ${testId}`);
-      return null;
-    } catch (e) {
-      // there could be no data, ignore
-    }
-  }
-
-  _getDataFromFile(testId) {
-    try {
-      const filepath = join(TESTOMAT_TMP_STORAGE.mainDir, `${this.dataType}_${testId}`);
-      if (fs.existsSync(filepath)) {
-        const testData = fs.readFileSync(filepath, 'utf-8');
-        debug(`Data for test id ${testId}:\n${testData}`);
-        return testData;
-      }
-      debug(`No ${this.dataType} data for test id ${testId}`);
-      return null;
-    } catch (e) {
-      // there could be no data, ignore
-    }
-    return null;
-  }
-
-  _putDataToGlobalVar(data, testId) {
-    debug('Saving data to global variable for test', testId, ':\n', data, '\n');
-    global.testomatioDataStore[this.dataDirName] = {};
-    global.testomatioDataStore[this.dataDirName][testId] = data;
-  }
-
-  _putDataToFile(data, testId) {
-    if (typeof data !== 'string') data = JSON.stringify(data);
-    const filename = `${this.dataType}_${testId}`;
-    const filepath = join(TESTOMAT_TMP_STORAGE.mainDir, filename);
-    debug('Saving data to file for test', testId, 'to', filepath, ':\n', data, '\n');
-
-    // TODO: handle multiple invocations of JSON.stringify.
-    // UPD: not actual because decided not to use it - it created extra wrapping quotes "" and // (escaped slashes)
-    fs.appendFileSync(filepath, data + os.EOL, 'utf-8');
-  }
-}
-
-module.exports.DataStorage = DataStorage;
-
-// TODO: consider using fs promises instead of writeSync/appendFileSync to
-// prevent blocking and improve performance (probably queue usage will be required)
-
-// TODO: rewrite client - everything regarding storing artifacts
-// TODO: try to define adapter inside client
-// TODO: use .env
-// TODO: ability to intercept multiple loggers

package/lib/logger.js

@@ -1,221 +0,0 @@
-const debug = require('debug')('@testomatio/reporter:logger');
-const { DataStorage } = require('./dataStorage');
-
-const LOG_METHODS = ['assert', 'debug', 'error', 'info', 'log', 'trace', 'warn'];
-
-/**
- * Logger allows to:
- * 1. Intercept logs from user logger (console.log, etc) and store them.
- * 2. Output logs to console (actually, logger functionality).
- * 3. Varied syntax.
- */
-class Logger {
-  // _originalUserLogger used to output logs to console by the user logger
-  // _loggerToIntercept intercepted and reassigned immediately when added
-
-  constructor(params = {}) {
-    this.dataStorage = new DataStorage('log', params);
-
-    // commented because prefer to use "intercept" method
-    // if (params?.logger) this._loggerToIntercept = params.logger;
-
-    this.intercept(this._loggerToIntercept);
-
-    // singleton
-    if (!Logger.instance) {
-      Logger.instance = this;
-    }
-  }
-
-  /**
-   * Returns the string (logs) and the context
-   * This is required because loggers take multiple arguments
-   * @param  {...any} args
-   */
-  /*
-    TODO: its difficult to distinguish context from log artument if its not a string,
-    e.g. user can use something like console.log('some log', { key: 'value' });
-    consider not to use this method at all and don't expect context from user inside default log methods;
-    instead, use custom method like $`some log` and parse it
-  */
-  // _getLogStringAndContextFromArgs(...args) {
-  //   let context = '';
-  //   if (args.length > 1 && typeof args[args.length - 1] !== 'string') {
-  //     context = args.pop();
-  //   }
-  //   const logs = args.join(' ');
-  //   return { logs, context };
-  // }
-
-  /**
-   * Tagget template literal. Allows to use different syntaxes:
-   * 1. Tagget template: $`text ${someVar}`
-   * 2. Standard: $(`text ${someVar}`)
-   * 3. Standard with multiple arguments: $('text', someVar)
-   */
-  _log(strings, ...args) {
-    let logs;
-    // this block means tagged template is used (syntax like $`text ${someVar}`)
-    if (Array.isArray(strings) && strings.length === args.length + 1) {
-      logs = strings.reduce(
-        (result, current, index) =>
-          result +
-          current +
-          // strings are splitted by args when use tagged template, thus we add arg after each string
-          // it looks like: `string1 arg1 string2 arg2 string3`
-          (args[index] !== undefined // eslint-disable-line no-nested-ternary
-            ? typeof args[index] === 'string'
-              ? // add arg as it is
-                args[index]
-              : // stringify arg
-                this._strinfifyLogs(args[index])
-            : // add space if no arg after string
-              ' '),
-        // initial accumulator value
-        '',
-      );
-    } else {
-      // this block means arguments syntax is used (syntax like $('text', someVar))
-      logs = this._strinfifyLogs(strings, ...args);
-    }
-    this.dataStorage.putData(logs);
-  }
-
-  /**
-   *
-   * @param {*} context testId or test context from test runner
-   * @returns
-   */
-  getLogs(context) {
-    return this.dataStorage.getData(context);
-  }
-
-  _strinfifyLogs(...args) {
-    const logs = [];
-    // stringify everything except strings
-    for (const arg of args) {
-      if (typeof arg === 'string') {
-        logs.push(arg);
-      } else {
-        logs.push(JSON.stringify(arg));
-      }
-    }
-    return logs.join(' ');
-  }
-
-  assert(...args) {
-    const logs = this._strinfifyLogs(...args);
-    this.dataStorage.putData(logs);
-    try {
-      this._originalUserLogger.log(`Assertion result: `, ...args);
-    } catch (e) {
-      // method could be unexisting, ignore error
-    }
-  }
-
-  debug(...args) {
-    const logs = this._strinfifyLogs(...args);
-    this.dataStorage.putData(logs);
-    try {
-      this._originalUserLogger.debug(...args);
-    } catch (e) {
-      // method could be unexisting, ignore error
-    }
-  }
-
-  error(...args) {
-    const logs = this._strinfifyLogs(...args);
-    this.dataStorage.putData(logs);
-    try {
-      this._originalUserLogger.error(...args);
-    } catch (e) {
-      // method could be unexisting, ignore error
-    }
-  }
-
-  info(...args) {
-    const logs = this._strinfifyLogs(...args);
-    this.dataStorage.putData(logs);
-    try {
-      this._originalUserLogger.info(...args);
-    } catch (e) {
-      // method could be unexisting, ignore error
-    }
-  }
-
-  log(...args) {
-    const logs = this._strinfifyLogs(...args);
-    this.dataStorage.putData(logs);
-    try {
-      this._originalUserLogger.log(...args);
-    } catch (e) {
-      // method could be unexisting, ignore error
-    }
-  }
-
-  trace(...args) {
-    const logs = this._strinfifyLogs(...args);
-    this.dataStorage.putData(logs);
-    try {
-      this._originalUserLogger.trace(...args);
-    } catch (e) {
-      // method could be unexisting, ignore error
-    }
-  }
-
-  warn(...args) {
-    const logs = this._strinfifyLogs(...args);
-    this.dataStorage.putData(logs);
-    try {
-      this._originalUserLogger.warn(...args);
-    } catch (e) {
-      // method could be unexisting, ignore error
-    }
-  }
-
-  /**
-   * Intercepts user logger messages.
-   * When call this method, Logger start to control the user logger,
-   * but almost nothing is changed for user ragarding the console output (like log level set by user)
-   * (until multiple loggers are intercepted,
-   * in this case only the last intercepted logger will be used as user console output).
-   * @param {*} userLogger
-   */
-  intercept(userLogger) {
-    if (!userLogger) return;
-    debug(`Intercepting user logger`);
-
-    // save original user logger to use it for logging (last intercepted will be used for console output)
-    this._originalUserLogger = { ...userLogger };
-    this._loggerToIntercept = userLogger;
-
-    /* 
-    override user logger (any, e.g. console) methods to intercept log messages
-    this._loggerToIntercept = this; could be used, but decided to override only output methods
-    */
-    for (const method of LOG_METHODS) {
-      /*
-      decided to comment next code line because its better to create method even if it does not exist in user logger;
-      on method invocation, we will store the data anyway and catch block will prevent potential errors
-      */
-      // if (!this._loggerToIntercept[method]) continue;
-      this._loggerToIntercept[method] = (...args) => this[method](...args);
-    }
-  }
-}
-
-Logger.instance = null;
-
-// module.exports.Logger = Logger;
-module.exports = new Logger();
-
-// TODO: consider using fs promises instead of writeSync/appendFileSync to prevent blocking and improve performance
-// TODO: try to use method generator *
-// TODO: understand captureStackTrace in output (check on .error) (NOT SUCH IMPORTANT)
-// TODO: handle log levels to colorize logs later on UI
-// TODO: parse passed arguments as {level: 'str', message: 'str'} because some loggers use such syntax
-// TODO: add setLevel method - allows skip messages with the lower level
-// TODO: in case of unset _originalUserLogger, logger.{method} will not provide console output,
-// need to add some logger by default
-
-// TODO step method (blue color)