@testomatio/reporter 1.2.0-beta → 1.2.1-beta

package/lib/adapter/jest.js

@@ -12,6 +12,7 @@ class JestReporter {
   }
 
   static getIdOfCurrentlyRunningTest() {
+    if (!process.env.JEST_WORKER_ID) return null;
     // @ts-expect-error "expect" could only be defined inside Jest environement (forbidden to import it outside)
     return parseTest(expect?.getState()?.currentTestName) || null; // eslint-disable-line
   }

package/lib/client.js

@@ -12,7 +12,7 @@ const logger = require('./logger');
 /**
  * @typedef {import('../types').TestData} TestData
  * @typedef {import('../types').RunStatus} RunStatus
- * @typedef {import('../types').PipeResult} PipeResult  
+ * @typedef {import('../types').PipeResult} PipeResult
  */
 
 class Client {
@@ -105,6 +105,7 @@ class Client {
 
     const testLogs = logger.getLogs(test_id);
     debug(`Test logs for ${test_id}:\n`, testLogs);
+    if (stack) stack += '\n\n';
     stack += testLogs;
 
     if (Array.isArray(storeArtifacts) && storeArtifacts.length) {

package/lib/dataStorage.js

@@ -29,8 +29,8 @@ class DataStorage {
       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;
+    this.runningEnvironment = this.getRunningEnviroment();
+    if (this.runningEnvironment === 'jest') this.isFileStorage = true;
 
     if (this.isFileStorage) {
       this.dataDirPath = path.join(TESTOMAT_TMP_STORAGE.mainDir, this.dataDirName);
@@ -52,8 +52,12 @@ class DataStorage {
    */
   getRunningEnviroment() {
     if (process.env.JEST_WORKER_ID) return 'jest';
-    // @ts-expect-error mocha could be undefined, its ok
-    if (typeof mocha !== 'undefined') return 'mocha';
+    try {
+      // @ts-expect-error mocha is defined only in mocha environment
+      if (typeof mocha !== 'undefined') return 'mocha';
+    } catch (e) {
+      // ignore
+    }
     return undefined;
   }
 
@@ -64,6 +68,8 @@ class DataStorage {
    * @returns
    */
   putData(data, context = null) {
+    // this.isFileStorage = !global.testomatioDataStore;
+
     let testId = null;
     if (typeof context === 'string') {
       testId = context;
@@ -73,7 +79,7 @@ class DataStorage {
     }
 
     // try to get testId for Jest
-    testId = testId ?? JestReporter.getIdOfCurrentlyRunningTest();
+    if (this.runningEnvironment === 'jest') testId = testId ?? JestReporter.getIdOfCurrentlyRunningTest();
 
     // if testId is not provided, data is be saved to `{dataType}_other` file;
     if (!testId) testId = 'other';
@@ -101,7 +107,9 @@ class DataStorage {
       // testId = context...
     }
 
-    if (!testId) testId = 'other';
+    if (!testId) {
+      debug(`Cannot get test id from passed context:\n}`, context);
+    }
 
     if (this.isFileStorage) {
       return this._getDataFromFile(testId);

package/lib/logger.js

@@ -42,26 +42,6 @@ class Logger {
     }
   }
 
-  /**
-   * 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}`
@@ -293,9 +273,6 @@ 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: parse passed arguments as {level: 'str', message: 'str'} because some loggers use such syntax;
 // upd: did not face such loggers, but still could be useful
 
-// TODO: in case of unset _originalUserLogger, logger.{method} will not provide console output,
-// need to add some logger by default

package/package.json

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