@testomatio/reporter 1.6.17-beta.1-tls-fix → 1.6.17

package/lib/adapter/webdriver.js

@@ -70,6 +70,7 @@ class WebdriverReporter extends WDIOReporter {
       .map(el => Buffer.from(el.result.value, 'base64'));
 
     await this.client.addTestRun(state, {
+      rid: test.uid,
       manuallyAttachedArtifacts: test.artifacts,
       error,
       logs: test.logs,
@@ -104,6 +105,7 @@ class WebdriverReporter extends WDIOReporter {
     const tags = scenario.tags.map(tag => tag.name);
 
     return this.client.addTestRun(scenarioState, {
+      rid: scenario.uid,
       error: error ? Error(error) : null,
       title,
       test_id: testId,

package/lib/pipe/testomatio.js

@@ -3,7 +3,6 @@ const chalk = require('chalk');
 // Retry interceptor function
 const axiosRetry = require('axios-retry');
 // Default axios instance
-const https = require('https');
 const axios = require('axios');
 const JsonCycle = require('json-cycle');
 
@@ -58,10 +57,6 @@ class TestomatioPipe {
     // Create a new instance of axios with a custom config
     this.axios = axios.create({
       baseURL: `${this.url.trim()}`,
-      httpsAgent: new https.Agent({
-        rejectUnauthorized: true,
-        keepAlive: false  // This is the key setting that forces fresh TLS sessions
-      }),      
       timeout: AXIOS_TIMEOUT,
       proxy: proxy ? {
         host: proxy.hostname,
@@ -353,6 +348,8 @@ class TestomatioPipe {
    * Adds a test to the batch uploader (or reports a single test if batch uploading is disabled)
    */
   addTest(data) {
+    this.isEnabled = this.apiKey ?? this.isEnabled;
+
     if (!this.isEnabled) return;
     if (!this.runId) return;
 
@@ -361,11 +358,15 @@ class TestomatioPipe {
     data.api_key = this.apiKey;
     data.create = this.createNewTests;
 
-    if (!this.batch.isEnabled) this.#uploadSingleTest(data);
+    let uploading = null;
+    if (!this.batch.isEnabled) uploading = this.#uploadSingleTest(data);
     else this.batch.tests.push(data);
 
     // if test is added after run already finished
-    if (!this.batch.intervalFunction) this.#batchUpload();
+    if (!this.batch.intervalFunction) uploading = this.#batchUpload();
+
+    // return promise to be able to wait for it
+    return uploading;
   }
 
   /**

package/lib/uploader.js

@@ -128,7 +128,7 @@ class S3Uploader {
 
       const link = await this.getS3LocationLink(upload);
       this.successfulUploads.push({ path: file.path, size: file.size, link });
-      debug(`📤 Uploaded artifact. File: ${file.path}, size: ${prettyBytes(file.size)}, link: ${link}`);
+      debug(`📤 Uploaded artifact. File: ${file.path}, size: ${prettyBytes(file.size || 0)}, link: ${link}`);
       return link;
     } catch (e) {
       this.failedUploads.push({ path: file.path, size: file.size });
@@ -206,7 +206,8 @@ class S3Uploader {
    * @returns
    */
   async uploadFileByPath(filePath, pathInS3) {
-    // sometimes artifacts uploading started before createRun function completion
+    /* WDIO: some artifacts uploading started before createRun function completion
+    probably, the reason is that run is NOT created in adapter (but via cli) */
     this.isEnabled = this.isEnabled ?? this.checkEnabled();
 
     const [runId, rid] = pathInS3;
@@ -218,7 +219,7 @@ class S3Uploader {
 
     try {
       // file may not exist
-      fileSize = fs.statSync(filePath).size;
+      fileSize = fs.statSync(filePath).size || 0;
       fileSizeInMb = Number((fileSize / (1024 * 1024)).toFixed(2));
     } catch (e) {
       debug(`File ${filePath} does not exist`);
@@ -277,10 +278,14 @@ class S3Uploader {
    * @returns
    */
   async uploadFileAsBuffer(buffer, pathInS3) {
+    /* WDIO: some artifacts uploading started before createRun function completion
+    probably, the reason is that run is NOT created in adapter (but via cli) */
+
+    this.isEnabled = this.isEnabled ?? this.checkEnabled();
     if (!this.isEnabled) return;
 
     let Key = pathInS3.filter(p => !!p).join('/');
-    const ext = this.#getFileExtBase64(buffer);
+    const ext = this.#getFileExtBase64(buffer.toString('base64'));
 
     if (ext) {
       Key = `${Key}.${ext}`;

package/package.json

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

package/lib/adapter/codecept.d.ts

@@ -1,2 +0,0 @@
-export default CodeceptReporter;
-export function CodeceptReporter(config: any): void;

package/lib/adapter/cucumber/current.d.ts

@@ -1,14 +0,0 @@
-export default CucumberReporter;
-export class CucumberReporter extends Formatter {
-    constructor(options: any);
-    failures: any[];
-    cases: any[];
-    client: TestomatClient;
-    status: string;
-    parseEnvelope(envelope: any): void;
-    onTestCaseStarted(testCaseStarted: any): void;
-    onTestCaseFinished(testCaseFinished: any): void;
-    onTestRunFinished(envelope: any): void;
-}
-import { Formatter } from '@cucumber/cucumber';
-import TestomatClient from '../../client.js';

package/lib/adapter/cucumber.d.ts

@@ -1,2 +0,0 @@
-export default CucumberReporter;
-import { CucumberReporter } from './cucumber/current.js';

package/lib/adapter/cypress-plugin/index.d.ts

@@ -1,2 +0,0 @@
-export default testomatioReporter;
-declare function testomatioReporter(on: any): void;

package/lib/adapter/jasmine.d.ts

@@ -1,11 +0,0 @@
-export default JasmineReporter;
-export class JasmineReporter {
-    constructor(options: any);
-    testTimeMap: {};
-    client: TestomatClient;
-    getDuration(test: any): number;
-    specStarted(result: any): void;
-    specDone(result: any): void;
-    jasmineDone(suiteInfo: any, done: any): void;
-}
-import TestomatClient from '../client.js';

package/lib/adapter/jest.d.ts

@@ -1,13 +0,0 @@
-export class JestReporter {
-    constructor(globalConfig: any, options: any);
-    _globalConfig: any;
-    _options: any;
-    client: TestomatClient;
-    onRunStart(): void;
-    onTestStart(testFile: any): void;
-    onTestCaseStart(test: any, testCase: any): void;
-    onTestResult(test: any, testResult: any): void;
-    onRunComplete(contexts: any, results: any): void;
-}
-export default JestReporter;
-import TestomatClient from '../client.js';

package/lib/adapter/mocha.d.ts

@@ -1,2 +0,0 @@
-export default MochaReporter;
-declare function MochaReporter(runner: any, opts: any): void;

package/lib/adapter/nightwatch.d.ts

@@ -1,4 +0,0 @@
-declare namespace _default {
-    function write(results: any, options: any, done: any): Promise<void>;
-}
-export default _default;

package/lib/adapter/nightwatch.js

@@ -1,75 +0,0 @@
-import TestomatClient from '../client.js';
-import { config } from '../config.js';
-import { STATUS } from '../constants';
-import { getTestomatIdFromTestTitle } from '../utils/utils.js';
-const apiKey = config.TESTOMATIO;
-const client = new TestomatClient({ apiKey });
-export default {
-    write: async (results, options, done) => {
-        await client.createRun();
-        const testFiles = results.modules;
-        for (const fileName in testFiles) {
-            // in nightwatch: object containing tests from a single file
-            const testModule = testFiles[fileName];
-            // passed and failed tests (tests with assertions)
-            const completedTests = testModule.completed;
-            // skipped tests (skipped by user or tests without assertions)
-            const skippedTests = testModule.skipped;
-            const tags = testModule.tags || [];
-            // if test file contains multiple suites, the last suite name is used as a name 🤷‍♂️
-            // no other places which contain suite name (even inside test object)
-            const suiteTitle = testModule.name;
-            for (const testTitle in completedTests) {
-                const test = completedTests[testTitle];
-                let status;
-                switch (test.status) {
-                    case 'pass':
-                        status = STATUS.PASSED;
-                        break;
-                    case 'fail':
-                        status = STATUS.FAILED;
-                        break;
-                    // probably not required (because skipped tests are in separate array), but just in case
-                    case 'skip':
-                        status = STATUS.SKIPPED;
-                        console.info('Skipped test is in completed tests array:', test, 'Not expected behavior.');
-                        break;
-                    default:
-                        console.error('Test status processing error:', test.status);
-                }
-                const testId = getTestomatIdFromTestTitle(testTitle);
-                client.addTestRun(status, {
-                    error: { name: test.assertions?.[0]?.name, message: test.assertions?.[0]?.message, stack: test.stackTrace },
-                    file: testModule.modulePath?.replace(process.cwd(), ''),
-                    message: test.assertions?.[0]?.message,
-                    rid: `${testModule.uuid || ''}_${testTitle || ''}`,
-                    stack: test.stackTrace,
-                    suite_title: suiteTitle,
-                    tags,
-                    test_id: testId,
-                    time: test.timeMs,
-                    title: testTitle,
-                });
-            }
-            // just array with skipped tests titles, no any other info
-            for (const testTitle of skippedTests) {
-                client.addTestRun(STATUS.SKIPPED, {
-                    suite_title: suiteTitle,
-                    tags,
-                    rid: `${testModule.uuid || ''}_${testTitle || ''}`,
-                    title: testTitle,
-                });
-            }
-        }
-        /**
-         * @type {'passed' | 'failed' | 'finished'}
-         */
-        let runStatus = 'finished';
-        if (results.failed)
-            runStatus = 'failed';
-        else if (results.passed)
-            runStatus = 'passed';
-        await client.updateRunStatus(runStatus);
-        done();
-    },
-};

package/lib/adapter/playwright.d.ts

@@ -1,14 +0,0 @@
-export default PlaywrightReporter;
-declare class PlaywrightReporter {
-    constructor(config?: {});
-    client: TestomatioClient;
-    uploads: any[];
-    onBegin(config: any, suite: any): void;
-    suite: any;
-    config: any;
-    onTestBegin(testInfo: any): void;
-    onTestEnd(test: any, result: any): void;
-    onEnd(result: any): Promise<void>;
-    #private;
-}
-import TestomatioClient from '../client.js';

package/lib/adapter/vitest.d.ts

@@ -1,35 +0,0 @@
-export default VitestReporter;
-export type VitestTest = any;
-export type VitestTestFile = any;
-export type VitestSuite = any;
-export type VitestTestLogs = any;
-export type ErrorWithDiff = import("../../types/vitest.types.js").ErrorWithDiff;
-export type STATUS = typeof import("../constants.js").STATUS;
-export type TestData = import("../../types/types.js").TestData;
-/**
- * @typedef {import('../../types/types.js').VitestTest} VitestTest
- * @typedef {import('../../types/types.js').VitestTestFile} VitestTestFile
- * @typedef {import('../../types/types.js').VitestSuite} VitestSuite
- * @typedef {import('../../types/types.js').VitestTestLogs} VitestTestLogs
- * @typedef {import('../../types/vitest.types.js').ErrorWithDiff} ErrorWithDiff
- * @typedef {typeof import('../constants.js').STATUS} STATUS
- * @typedef {import('../../types/types.js').TestData} TestData
- */
-export class VitestReporter {
-    constructor(config?: {});
-    client: TestomatioClient;
-    /**
-     * @type {(TestData & {status: string})[]} tests
-     */
-    tests: (TestData & {
-        status: string;
-    })[];
-    onInit(): void;
-    /**
-     * @param {VitestTestFile[] | undefined} files // array with results;
-     * @param {unknown[] | undefined} errors // errors does not contain errors from tests; probably its testrunner errors
-     */
-    onFinished(files: VitestTestFile[] | undefined, errors: unknown[] | undefined): Promise<void>;
-    #private;
-}
-import { Client as TestomatioClient } from '../client.js';

package/lib/adapter/webdriver.d.ts

@@ -1,24 +0,0 @@
-export default WebdriverReporter;
-declare class WebdriverReporter extends WDIOReporter {
-    constructor(options: any);
-    client: TestomatClient;
-    _addTestPromises: any[];
-    _isSynchronising: boolean;
-    /**
-     *
-     * @param {RunnerStats} runData
-     */
-    onRunnerEnd(runData: RunnerStats): Promise<void>;
-    onRunnerStart(): void;
-    onTestStart(test: any): void;
-    onTestEnd(test: any): void;
-    onSuiteEnd(scerario: any): void;
-    addTest(test: any): Promise<void>;
-    /**
-     * @param {import('../../types/types.js').WebdriverIOScenario} scenario
-     */
-    addBddScenario(scenario: import("../../types/types.js").WebdriverIOScenario): Promise<import("../../types/types.js").PipeResult[]>;
-}
-import WDIOReporter from '@wdio/reporter';
-import TestomatClient from '../client.js';
-import { RunnerStats } from '@wdio/reporter';

package/lib/bin/cli.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-export {};

package/lib/bin/reportXml.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-export {};

package/lib/bin/startTest.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-export {};

package/lib/bin/uploadArtifacts.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-export {};

package/lib/client.d.ts

@@ -1,76 +0,0 @@
-export default Client;
-export type TestData = import("../types/types.js").TestData;
-export type PipeResult = import("../types/types.js").PipeResult;
-/**
- * @typedef {import('../types/types.js').TestData} TestData
- * @typedef {import('../types/types.js').PipeResult} PipeResult
- */
-export class Client {
-    /**
-     * Create a Testomat client instance
-     * @returns
-     */
-    constructor(params?: {});
-    paramsForPipesFactory: {};
-    pipeStore: {};
-    runId: `${string}-${string}-${string}-${string}-${string}`;
-    queue: Promise<void>;
-    version: any;
-    executionList: Promise<void>;
-    uploader: S3Uploader;
-    /**
-     * Asynchronously prepares the execution list for running tests through various pipes.
-     * Each pipe in the client is checked for enablement,
-     * and if all pipes are disabled, the function returns a resolved Promise.
-     * Otherwise, it executes the `prepareRun` method for each enabled pipe and collects the results.
-     * The results are then filtered to remove any undefined values.
-     * If no valid results are found, the function returns undefined.
-     * Otherwise, it returns the first non-empty array from the filtered results.
-     *
-     * @param {Object} params - The options for preparing the test execution list.
-     * @param {string} params.pipe - Name of the executed pipe.
-     * @param {string} params.pipeOptions - Filter option.
-     * @returns {Promise<any>} - A Promise that resolves to an
-     * array containing the prepared execution list,
-     * or resolves to undefined if no valid results are found or if all pipes are disabled.
-     */
-    prepareRun(params: {
-        pipe: string;
-        pipeOptions: string;
-    }): Promise<any>;
-    pipes: any[];
-    /**
-     * Used to create a new Test run
-     *
-     * @returns {Promise<any>} - resolves to Run id which should be used to update / add test
-     */
-    createRun(params: any): Promise<any>;
-    /**
-     * Updates test status and its data
-     *
-     * @param {string|undefined} status
-     * @param {TestData} [testData]
-     * @returns {Promise<PipeResult[]>}
-     */
-    addTestRun(status: string | undefined, testData?: TestData): Promise<PipeResult[]>;
-    /**
-     *
-     * Updates the status of the current test run and finishes the run.
-     * @param {'passed' | 'failed' | 'skipped' | 'finished'} status - The status of the current test run.
-     * Must be one of "passed", "failed", or "finished"
-     * @param {boolean} [isParallel] - Whether the current test run was executed in parallel with other tests.
-     * @returns {Promise<any>} - A Promise that resolves when finishes the run.
-     */
-    updateRunStatus(status: "passed" | "failed" | "skipped" | "finished", isParallel?: boolean): Promise<any>;
-    /**
-     * Returns the formatted stack including the stack trace, steps, and logs.
-     * @returns {string}
-     */
-    formatLogs({ error, steps, logs }: {
-        error: any;
-        steps: any;
-        logs: any;
-    }): string;
-    formatError(error: any, message: any): string;
-}
-import { S3Uploader } from './uploader.js';

package/lib/config.d.ts

@@ -1 +0,0 @@
-export const config: NodeJS.ProcessEnv;

package/lib/constants.d.ts

@@ -1,25 +0,0 @@
-export const APP_PREFIX: string;
-export const TESTOMAT_TMP_STORAGE_DIR: string;
-export const CSV_HEADERS: {
-    id: string;
-    title: string;
-}[];
-export namespace STATUS {
-    let PASSED: string;
-    let FAILED: string;
-    let SKIPPED: string;
-    let FINISHED: string;
-}
-export namespace HTML_REPORT {
-    let FOLDER: string;
-    let REPORT_DEFAULT_NAME: string;
-    let TEMPLATE_NAME: string;
-}
-export const AXIOS_TIMEOUT: number;
-export const testomatLogoURL: "https://avatars.githubusercontent.com/u/59105116?s=36&v=4";
-export namespace REPORTER_REQUEST_RETRIES {
-    let retryTimeout: number;
-    let retriesPerRequest: number;
-    let maxTotalRetries: number;
-    let withinTimeSeconds: number;
-}

package/lib/data-storage.d.ts

@@ -1,34 +0,0 @@
-export const dataStorage: DataStorage;
-declare class DataStorage {
-    static "__#11@#instance": any;
-    /**
-     *
-     * @returns {DataStorage}
-     */
-    static getInstance(): DataStorage;
-    context: any;
-    setContext(context: any): void;
-    isFileStorage: boolean;
-    /**
-     * Puts any data to storage (file or global variable).
-     * If file: stores data as text, if global variable – stores as array of data.
-     * @param {'log' | 'artifact' | 'keyvalue'} dataType
-     * @param {*} data anything you want to store (string, object, array, etc)
-     * @param {*} context could be testId or any context (test name, suite name, including their IDs etc)
-     * suite name + test name is used by default
-     * @returns
-     */
-    putData(dataType: "log" | "artifact" | "keyvalue", data: any, context?: any): void;
-    /**
-     * Returns data, stored for specific test/context (or data which was stored without test id specified).
-     * This method will get data from global variable and/or from from file (previosly saved with put method).
-     *
-     * @param {'log' | 'artifact' | 'keyvalue'} dataType
-     * @param {string} context
-     * @returns {any []} array of data (any type), null (if no data found for context) or string (if data type is log)
-     */
-    getData(dataType: "log" | "artifact" | "keyvalue", context: string): any[];
-    #private;
-}
-export function stringToMD5Hash(str: any): string;
-export {};

package/lib/junit-adapter/adapter.d.ts

@@ -1,9 +0,0 @@
-export default Adapter;
-declare class Adapter {
-    constructor(opts: any);
-    opts: any;
-    getFilePath(t: any): any;
-    formatTest(t: any): any;
-    formatStack(t: any): any;
-    formatMessage(t: any): any;
-}

package/lib/junit-adapter/csharp.d.ts

@@ -1,5 +0,0 @@
-export default CSharpAdapter;
-declare class CSharpAdapter extends Adapter {
-    getFilePath(t: any): string;
-}
-import Adapter from './adapter.js';

package/lib/junit-adapter/index.d.ts

@@ -1,3 +0,0 @@
-export default AdapterFactory;
-declare function AdapterFactory(lang: any, opts: any): Adapter;
-import Adapter from './adapter.js';

package/lib/junit-adapter/java.d.ts

@@ -1,5 +0,0 @@
-export default JavaAdapter;
-declare class JavaAdapter extends Adapter {
-    getFilePath(t: any): string;
-}
-import Adapter from './adapter.js';

package/lib/junit-adapter/javascript.d.ts

@@ -1,4 +0,0 @@
-export default JavaScriptAdapter;
-declare class JavaScriptAdapter extends Adapter {
-}
-import Adapter from './adapter.js';

package/lib/junit-adapter/python.d.ts

@@ -1,5 +0,0 @@
-export default PythonAdapter;
-declare class PythonAdapter extends Adapter {
-    getFilePath(t: any): string;
-}
-import Adapter from './adapter.js';

package/lib/junit-adapter/ruby.d.ts

@@ -1,4 +0,0 @@
-export default RubyAdapter;
-declare class RubyAdapter extends Adapter {
-}
-import Adapter from './adapter.js';

package/lib/output.d.ts

@@ -1,11 +0,0 @@
-export default Output;
-declare class Output {
-    constructor(opts?: {});
-    filterFn: any;
-    reset(): void;
-    log: any[];
-    start(): void;
-    push(line: any): void;
-    text(): string;
-    stop(): void;
-}

package/lib/package.json

@@ -1,3 +0,0 @@
-{
-  "type": "commonjs"
-}

package/lib/pipe/bitbucket.d.ts

@@ -1,23 +0,0 @@
-/**
- * @class BitbucketPipe
- * @typedef {import('../../types/types.js').Pipe} Pipe
- * @typedef {import('../../types/types.js').TestData} TestData
- */
-export class BitbucketPipe {
-    constructor(params: any, store?: {});
-    isEnabled: boolean;
-    ENV: NodeJS.ProcessEnv;
-    store: {};
-    tests: any[];
-    token: any;
-    hiddenCommentData: string;
-    cleanLog(log: any): Promise<string>;
-    prepareRun(): Promise<void>;
-    createRun(): Promise<void>;
-    addTest(test: any): void;
-    finishRun(runParams: any): Promise<void>;
-    toString(): string;
-    updateRun(): void;
-}
-export type Pipe = import("../../types/types.js").Pipe;
-export type TestData = import("../../types/types.js").TestData;

package/lib/pipe/csv.d.ts

@@ -1,47 +0,0 @@
-export default CsvPipe;
-export type Pipe = import("../../types/types.js").Pipe;
-export type TestData = import("../../types/types.js").TestData;
-/**
- * @typedef {import('../../types/types.js').Pipe} Pipe
- * @typedef {import('../../types/types.js').TestData} TestData
- * @class CsvPipe
- * @implements {Pipe}
- */
-declare class CsvPipe implements Pipe {
-    constructor(params: any, store: any);
-    store: any;
-    title: any;
-    results: any[];
-    outputDir: string;
-    defaultReportName: string;
-    csvFilename: string;
-    isEnabled: boolean;
-    outputFile: string;
-    prepareRun(): Promise<void>;
-    createRun(): Promise<void>;
-    updateRun(): void;
-    /**
-     * Create a folder that will contain the exported files
-     */
-    checkExportDir(): void;
-    /**
-     * Save data to the csv file.
-     * @param {Object} data - data that will be added to the CSV file.
-     * Example: [{suite_title: "Suite #1", test: "Test-case-1", message: "Test msg"}]
-     * @param {Object} headers - csv file headers. Example: [{ id: 'suite_title', title: 'Suite_title' }]
-     */
-    saveToCsv(data: any, headers: any): Promise<void>;
-    /**
-     * Add test data to the result array for saving. As a result of this function, we get a result object to save.
-     * @param {Object} test - object which includes each test entry.
-     */
-    addTest(test: any): void;
-    /**
-     * @param {{ tests?: TestData[] }} runParams
-     * @returns {Promise<void>}
-     */
-    finishRun(runParams: {
-        tests?: TestData[];
-    }): Promise<void>;
-    toString(): string;
-}