@testomatio/reporter 0.7.5-beta.1 → 0.7.6-beta.1

package/Changelog.md

@@ -1,3 +1,7 @@
+# 0.7.5
+
+* Fixed reporting skipped tests in mocha
+
 # 0.7.4
 
 * Fixed parsing source code in JUnit files

package/lib/adapter/mocha.js

@@ -8,9 +8,9 @@ const { EVENT_RUN_BEGIN, EVENT_RUN_END, EVENT_TEST_FAIL, EVENT_TEST_PASS, EVENT_
 
 function MochaReporter(runner, opts) {
   Mocha.reporters.Base.call(this, runner);
-  let passes = 0, failures = 0, skipped = 0;
+  let passes = 0; let failures = 0; let skipped = 0; // eslint-disable-line no-unused-vars
 
-  const apiKey = opts?.reporterOptions?.apiKey || process.env['TESTOMATIO'];
+  const apiKey = opts?.reporterOptions?.apiKey || process.env.TESTOMATIO;
 
   if (!apiKey) {
     console.log('TESTOMATIO key is empty, ignoring reports');

package/lib/fileUploader.js

@@ -1,4 +1,5 @@
-const AWS = require('aws-sdk');
+const { S3 } = require('@aws-sdk/client-s3');
+const { Upload } = require("@aws-sdk/lib-storage");
 const fs = require('fs');
 const path = require('path');
 const chalk = require('chalk');
@@ -32,6 +33,23 @@ const _getFileExtBase64 = str => {
   );
 };
 
+const _getS3Config = () => {
+  const cfg = {
+    region: S3_REGION,
+    credentials: {
+      accessKeyId: S3_ACCESS_KEY_ID,
+      secretAccessKey: S3_SECRET_ACCESS_KEY,
+      s3ForcePathStyle: S3_FORCE_PATH_STYLE,
+    }
+  };
+
+  if (S3_ENDPOINT) {
+    cfg.endpoint = S3_ENDPOINT;
+  }
+
+  return cfg;
+}
+
 const uploadUsingS3 = async (filePath, runId) => {
   let ContentType;
   let Key;
@@ -42,18 +60,6 @@ const uploadUsingS3 = async (filePath, runId) => {
     Key = filePath.name;
   }
 
-  const config = {
-    region: S3_REGION,
-    accessKeyId: S3_ACCESS_KEY_ID,
-    secretAccessKey: S3_SECRET_ACCESS_KEY,
-    s3ForcePathStyle: S3_FORCE_PATH_STYLE,
-  };
-
-  if (S3_ENDPOINT) {
-    config.endpoint = new AWS.Endpoint(S3_ENDPOINT);
-  }
-
-  const s3 = new AWS.S3(config);
   if (!fs.existsSync(filePath)) {
     console.error(chalk.yellow(`Artifacts file ${filePath} does not exist. Skipping...`));
     return;
@@ -64,18 +70,24 @@ const uploadUsingS3 = async (filePath, runId) => {
   Key = `${runId}/${randomUUID()}-${Key || path.basename(filePath)}`;
   const ACL = TESTOMATIO_PRIVATE_ARTIFACTS ? 'private' : 'public-read';
 
+  const s3 = new S3(_getS3Config());
+
   try {
-    const out = await s3
-      .upload({
+    const out = new Upload({
+      client: s3,
+
+      params: {
         Bucket: S3_BUCKET,
         Key,
         Body: file,
         ContentType,
         ACL,
-      })
-      .promise();
+      }
+    });
+
+    await out.done();
 
-    return out.Location;
+    return out.singleUploadResult.Location;
   } catch (e) {
     console.log(APP_PREFIX, chalk.bold.red(`Failed uploading '${Key}'. Please check S3 credentials`), {
       accessKeyId: S3_ACCESS_KEY_ID,
@@ -100,35 +112,27 @@ const uploadUsingS3 = async (filePath, runId) => {
 };
 
 const uploadUsingS3AsBuffer = async (buffer, fileName, runId) => {
-  const config = {
-    region: S3_REGION,
-    accessKeyId: S3_ACCESS_KEY_ID,
-    secretAccessKey: S3_SECRET_ACCESS_KEY,
-    s3ForcePathStyle: S3_FORCE_PATH_STYLE,
-  };
-
-  if (S3_ENDPOINT) {
-    config.endpoint = new AWS.Endpoint(S3_ENDPOINT);
-  }
-
-  const s3 = new AWS.S3(config);
-
   const ACL = TESTOMATIO_PRIVATE_ARTIFACTS ? 'private' : 'public-read';
 
   const fileExtension = _getFileExtBase64(buffer.toString('base64'));
   const Key = `${runId}/${fileName}${fileExtension}`;
 
+  const s3 = new S3(_getS3Config());
+
   try {
-    const out = await s3
-      .upload({
+    const out = new Upload({
+      client: s3,
+
+      params: {
         Bucket: S3_BUCKET,
         Key,
         Body: buffer,
         ACL,
-      })
-      .promise();
+      }
+    });
+    await out.done();
 
-    return out.Location;
+    return out.singleUploadResult.Location;
   } catch (e) {
     console.log(APP_PREFIX, chalk.bold.red(`Failed uploading '${Key}'. Please check S3 credentials`), {
       accessKeyId: S3_ACCESS_KEY_ID,

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@testomatio/reporter",
-  "version": "0.7.5-beta.1",
+  "version": "0.7.6-beta.1",
   "description": "Testomatio Reporter Client",
   "main": "./lib/reporter.js",
   "repository": "git@github.com:testomatio/reporter.git",
   "author": "Michael Bodnarchuk <davert@testomat.io>,Koushik Mohan <koushikmohan1996@gmail.com>",
   "license": "MIT",
   "dependencies": {
-    "aws-sdk": "^2.1072.0",
+    "@aws-sdk/client-s3": "^3.279.0",
+    "@aws-sdk/lib-storage": "^3.279.0",
     "axios": "^0.25.0",
     "callsite-record": "^4.1.4",
     "chalk": "^4.1.0",