@testomatio/reporter 1.1.1-beta.1.fix-logger → 1.1.1-file-upload.1

package/README.md

@@ -65,13 +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....
+
+or **any [other via JUnit](./docs/junit.md)** report....
 
 ### 2️⃣ Configure Reports
 

package/lib/adapter/playwright.js

@@ -17,11 +17,12 @@ class PlaywrightReporter {
     this.uploads = [];
   }
 
-  onBegin(_config, suite) {
+  onBegin(config, suite) {
     // clean data storage
     fileSystem.clearDir(TESTOMAT_TMP_STORAGE_DIR);
     if (!this.client) return;
     this.suite = suite;
+    this.config = config;
     this.client.createRun();
   }
 
@@ -73,7 +74,24 @@ class PlaywrightReporter {
     reportTestPromises.push(reportTestPromise);
   }
 
-  async onEnd(result) {
+
+  #getArtifactPath(artifact) {
+    if (artifact.path) {
+      if (path.isAbsolute(artifact.path)) return artifact.path;
+
+      return path.join(this.config.outputDir || this.config.projects[0].outputDir, artifact.path);         
+    }
+
+    if (artifact.body) {
+      const fileName = tmpFile();
+      fs.writeFileSync(fileName, artifact.body);
+      return fileName;
+    }
+
+    return null;
+  }
+
+  async onEnd(result, config) {
     if (!this.client) return;
 
     await Promise.all(reportTestPromises);
@@ -87,11 +105,7 @@ class PlaywrightReporter {
         const { title, testId, suite_title } = upload;
 
         const files = upload.files.map(attachment => {
-          if (attachment.body) {
-            const fileName = tmpFile();
-            fs.writeFileSync(fileName, attachment.body);
-          }
-          return { path: attachment.path, title, type: attachment.contentType };
+          return { path: this.#getArtifactPath(attachment), title, type: attachment.contentType };
         });
 
         promises.push(
@@ -151,7 +165,7 @@ function initPlaywrightForStorage() {
     });
   } catch (e) {
     // ignore
-  }
+  }  
 }
 
 module.exports = PlaywrightReporter;

package/lib/client.js

@@ -27,6 +27,7 @@ class Client {
     this.pipes = pipesFactory(params, store);
     this.queue = Promise.resolve();
     this.totalUploaded = 0;
+    this.failedToUpload = 0;
     this.version = JSON.parse(fs.readFileSync(join(__dirname, '..', 'package.json')).toString()).version;
     this.executionList = Promise.resolve();
 
@@ -163,11 +164,14 @@ class Client {
       uploadedFiles.push(upload.uploadFileAsBuffer(buffer, fileName, this.uuid));
     }
 
-    const artifacts = await Promise.all(uploadedFiles);
+    const artifacts = (await Promise.all(uploadedFiles)).filter(n => !!n);
 
-    // global.testomatioArtifacts = [];
+    if (artifacts.length < uploadedFiles.length) {
+      const failedUploading = uploadedFiles.length - artifacts.length;
+      this.failedToUpload += failedUploading;
+    }
 
-    this.totalUploaded += uploadedFiles.filter(n => n).length;
+    this.totalUploaded += artifacts.length;
 
     const data = {
       files,
@@ -233,6 +237,16 @@ class Client {
               process.env.TESTOMATIO_PRIVATE_ARTIFACTS ? 'privately' : chalk.bold('publicly')
             } uploaded to S3 bucket`,
           );
+
+          if (this.failedToUpload > 0) {
+            console.log(
+              APP_PREFIX,
+              chalk.yellow(
+                `Some artifacts were not uploaded. ${this.failedToUpload} artifacts could not be uploaded. Run tests with DEBUG="@testomatio/reporter:file-uploader" to see details"`,
+              ),
+            );
+          }
+    
         }
       })
       .catch(err => console.log(APP_PREFIX, err));
@@ -295,6 +309,7 @@ class Client {
 
 function isNotInternalFrame(frame) {
   return (
+    frame.getFileName() &&
     frame.getFileName().includes(sep) &&
     !frame.getFileName().includes('node_modules') &&
     !frame.getFileName().includes('internal')

package/lib/fileUploader.js

@@ -11,7 +11,6 @@ const readFile = util.promisify(fs.readFile);
 const stat = util.promisify(fs.stat);
 const chalk = require('chalk');
 const { randomUUID } = require('crypto');
-const memoize = require('lodash.memoize');
 
 const { APP_PREFIX } = require('./constants');
 
@@ -146,8 +145,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 +283,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;
@@ -295,8 +297,8 @@ const getS3LocationLink = async (out) => {
 };
 
 module.exports = {
-  uploadFileByPath: memoize(uploadFileByPath),
-  uploadFileAsBuffer: memoize(uploadFileAsBuffer),
+  uploadFileByPath,
+  uploadFileAsBuffer,
   isArtifactsEnabled,
   resetConfig,
 };

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
-  testomatioLogger: services.logger,
+  logger: reporterFunctions.log,
+  testomatioLogger: reporterFunctions.log,
 
   artifact: reporterFunctions.artifact,
   log: reporterFunctions.log,
-  logger: services.logger,
   meta: reporterFunctions.keyValue,
   step: reporterFunctions.step,
 
   TestomatClient,
   TRConstants,
 };
+

package/lib/services/logger.js

@@ -44,7 +44,8 @@ class Logger {
   logLevel = process?.env?.LOG_LEVEL?.toUpperCase() || 'ALL';
 
   constructor() {
-    if (!dataStorage.isFileStorage || process.env.TESTOMATIO_INTERCEPT_CONSOLE_LOGS) this.intercept(console);
+    // intercept console by default
+    this.intercept(console);
   }
 
   /**
@@ -105,7 +106,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testomatio/reporter",
-  "version": "1.1.1-beta.1.fix-logger",
+  "version": "1.1.1-file-upload.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 && TESTOMATIO_INTERCEPT_CONSOLE_LOGS=true 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 && npx mocha tests-storage/logger.test.js && npx mocha tests-storage/reporter-functions.test.js"
   },
   "devDependencies": {
     "@cucumber/cucumber": "^9.3.0",