@testomatio/reporter 1.1.1-file-upload.1 → 1.1.1

package/lib/adapter/playwright.js

@@ -7,6 +7,8 @@ const { APP_PREFIX, STATUS: Status, TESTOMAT_TMP_STORAGE_DIR } = require('../con
 const TestomatioClient = require('../client');
 const { isArtifactsEnabled } = require('../fileUploader');
 const { parseTest, fileSystem } = require('../utils/utils');
+const { services } = require('../services');
+const { dataStorage } = require('../data-storage');
 
 const reportTestPromises = [];
 
@@ -26,6 +28,11 @@ class PlaywrightReporter {
     this.client.createRun();
   }
 
+  onTestBegin(testInfo) {
+    const fullTestTitle = getTestContextName(testInfo);
+    dataStorage.setContext(fullTestTitle);
+  }
+
   onTestEnd(test, result) {
     if (!this.client) return;
 
@@ -35,17 +42,22 @@ class PlaywrightReporter {
 
     const { error, duration } = result;
 
-    const suite_title = test.parent ? test.parent.title : null;
+    const suite_title = test.parent 
+      ? test.parent?.title 
+      : path.basename(test?.location?.file);
 
     const steps = [];
     for (const step of result.steps) {
       appendStep(step, steps);
     }
 
+    const fullTestTitle = getTestContextName(test);
     let logs = '';
     if (result.stderr.length || result.stdout.length) {
       logs = `\n\n${chalk.bold('Logs:')}\n${chalk.red(result.stderr.join(''))}\n${result.stdout.join('')}`;
     }
+    const manuallyAttachedArtifacts = services.artifacts.get(fullTestTitle);
+    const keyValues = services.keyValues.get(fullTestTitle);
 
     const reportTestPromise = this.client
       .addTestRun(checkStatus(result.status), {
@@ -56,7 +68,8 @@ class PlaywrightReporter {
         steps: steps.join('\n'),
         time: duration,
         logs,
-        // TODO: attach artifacts
+        manuallyAttachedArtifacts,
+        meta: keyValues,
       })
       .then(pipes => {
         testId = pipes?.filter(p => p.pipe.includes('Testomatio'))[0]?.result?.data?.test_id;
@@ -153,6 +166,15 @@ function tmpFile(prefix = 'tmp.') {
   return path.join(tmpdir, prefix + crypto.randomBytes(16).toString('hex'));
 }
 
+/**
+ * Returns filename + test title
+ * @param {*} test - testInfo object from Playwright
+ * @returns 
+ */
+function getTestContextName(test) {
+  return `${test._requireFile || ''}_${test.title}`;
+}
+
 function initPlaywrightForStorage() {
   try {
     // @ts-ignore-next-line
@@ -160,8 +182,7 @@ function initPlaywrightForStorage() {
     const { test } = require('@playwright/test');
     // eslint-disable-next-line no-empty-pattern
     test.beforeEach(async ({}, testInfo) => {
-      const fullTestTitle = `${testInfo.file}_${testInfo.title}`;
-      global.testomatioTestTitle = fullTestTitle;
+      global.testomatioTestTitle = `${testInfo.file || ''}_${testInfo.title}`;
     });
   } catch (e) {
     // ignore

package/lib/data-storage.js

@@ -59,7 +59,7 @@ class DataStorage {
   putData(dataType, data, context = null) {
     if (!dataType || !data) return;
 
-    context = context || this.context || global.testomatioTestTitle || jestHelpers.getIdOfCurrentlyRunningTest();
+    context = context || this.context || global.testomatioTestTitle || jestHelpers.getNameOfCurrentlyRunningTest();
     if (!context) {
       debug(`No context provided for "${dataType}" data:`, data);
       return;
@@ -85,7 +85,7 @@ class DataStorage {
    */
   getData(dataType, context) {
     // TODO: think if it could be useful
-    // context = context || this.context || global.testomatioTestTitle || jestHelpers.getIdOfCurrentlyRunningTest();
+    // context = context || this.context || global.testomatioTestTitle || jestHelpers.getNameOfCurrentlyRunningTest();
 
     if (!context) {
       debug(`Trying to get "${dataType}" data without context`);

package/lib/reporter-functions.js

@@ -19,7 +19,7 @@ function saveArtifact(data, context = null) {
  * @param  {...any} args
  */
 function logMessage(...args) {
-  services.logger.templateLiteralLog(...args);
+  services.logger._templateLiteralLog(...args);
 }
 
 /**

package/lib/reporter.js

@@ -1,19 +1,19 @@
 const TestomatClient = require('./client');
 const TRConstants = require('./constants');
+const { services } = require('./services');
 
 const reporterFunctions = require('./reporter-functions');
 
 module.exports = {
   // TODO: deprecate in future; use log or testomat.log
-  logger: reporterFunctions.log,
-  testomatioLogger: reporterFunctions.log,
+  testomatioLogger: services.logger,
 
   artifact: reporterFunctions.artifact,
   log: reporterFunctions.log,
+  logger: services.logger,
   meta: reporterFunctions.keyValue,
   step: reporterFunctions.step,
 
   TestomatClient,
   TRConstants,
 };
-

package/lib/services/logger.js

@@ -44,8 +44,7 @@ class Logger {
   logLevel = process?.env?.LOG_LEVEL?.toUpperCase() || 'ALL';
 
   constructor() {
-    // intercept console by default
-    this.intercept(console);
+    if (!dataStorage.isFileStorage || process.env.TESTOMATIO_INTERCEPT_CONSOLE_LOGS) this.intercept(console);
   }
 
   /**
@@ -106,7 +105,7 @@ class Logger {
    * 2. Standard: log(`text ${someVar}`)
    * 3. Standard with multiple arguments: log('text', someVar)
    */
-  templateLiteralLog(strings, ...args) {
+  _templateLiteralLog(strings, ...args) {
     if (Array.isArray(strings)) strings = strings.filter(item => item !== '').map(item => item.trim());
     if (Array.isArray(args)) args = args.filter(item => item !== '');
 

package/lib/utils/utils.js

@@ -299,7 +299,7 @@ function removeColorCodes(input) {
 }
 
 const jestHelpers = {
-  getIdOfCurrentlyRunningTest: () => {
+  getNameOfCurrentlyRunningTest: () => {
     if (!process.env.JEST_WORKER_ID) return null;
     try {
       // TODO: expect?.getState()?.testPath + ' ' + expect?.getState()?.currentTestName

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testomatio/reporter",
-  "version": "1.1.1-file-upload.1",
+  "version": "1.1.1",
   "description": "Testomatio Reporter Client",
   "main": "./lib/reporter.js",
   "typings": "typings/index.d.ts",
@@ -52,7 +52,7 @@
     "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:storage": "npx mocha tests-storage/artifact-storage.test.js && npx mocha tests-storage/data-storage.test.js && npx mocha tests-storage/logger.test.js && npx mocha tests-storage/reporter-functions.test.js"
+    "test:storage": "npx mocha tests-storage/artifact-storage.test.js && npx mocha tests-storage/data-storage.test.js && TESTOMATIO_INTERCEPT_CONSOLE_LOGS=true npx mocha tests-storage/logger.test.js && npx mocha tests-storage/reporter-functions.test.js"
   },
   "devDependencies": {
     "@cucumber/cucumber": "^9.3.0",