@dev-blinq/cucumber-js 1.0.134-dev → 1.0.134

package/lib/formatter/helpers/constants.d.ts

@@ -22,6 +22,12 @@ export declare const STAGE: {
     RUNS: string;
     STORAGE: string;
 };
+export declare const CUSTOM: {
+    SSO: string;
+    WORKSPACE: string;
+    RUNS: string;
+    STORAGE: string;
+};
 export declare const SERVICES_URI: {
     SSO: string;
     WORKSPACE: string;

package/lib/formatter/helpers/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ActionEvents = exports.SERVICES_URI = exports.STAGE = exports.PROD = exports.DEV = exports.LOCAL = void 0;
+exports.ActionEvents = exports.SERVICES_URI = exports.CUSTOM = exports.STAGE = exports.PROD = exports.DEV = exports.LOCAL = void 0;
 exports.LOCAL = {
     SSO: 'http://localhost:5000/api/auth',
     WORKSPACE: 'http://localhost:6000/api/workspace',
@@ -11,7 +11,7 @@ exports.DEV = {
     SSO: 'https://dev.api.blinq.io/api/auth',
     WORKSPACE: 'https://dev.api.blinq.io/api/workspace',
     RUNS: 'https://dev.api.blinq.io/api/runs',
-    STORAGE: 'http://localhost:5050/api/storage',
+    STORAGE: 'https://dev.api.blinq.io/api/storage',
 };
 exports.PROD = {
     SSO: 'https://api.blinq.io/api/auth',
@@ -25,13 +25,23 @@ exports.STAGE = {
     RUNS: 'https://stage.api.blinq.io/api/runs',
     STORAGE: 'https://stage.api.blinq.io/api/storage',
 };
+exports.CUSTOM = {
+    SSO: `${process.env.NODE_ENV_BLINQ}/api/auth`,
+    WORKSPACE: `${process.env.NODE_ENV_BLINQ}/api/workspace`,
+    RUNS: `${process.env.NODE_ENV_BLINQ}/api/runs`,
+    STORAGE: `${process.env.NODE_ENV_BLINQ}/api/storage`,
+};
 exports.SERVICES_URI = process.env.NODE_ENV_BLINQ === 'local'
     ? exports.LOCAL // eslint-disable-line
     : process.env.NODE_ENV_BLINQ === 'dev'
         ? exports.DEV // eslint-disable-line
         : process.env.NODE_ENV_BLINQ === 'stage'
-            ? exports.STAGE
-            : exports.PROD; // eslint-disable-line
+            ? exports.STAGE // eslint-disable-line
+            : process.env.NODE_ENV_BLINQ === 'prod'
+                ? exports.PROD // eslint-disable-line
+                : !process.env.NODE_ENV_BLINQ
+                    ? exports.PROD // eslint-disable-line
+                    : exports.CUSTOM; // eslint-disable-line
 var ActionEvents;
 (function (ActionEvents) {
     ActionEvents["record_scenario"] = "record_scenario";

package/lib/formatter/helpers/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/formatter/helpers/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,KAAK,GAAG;IACnB,GAAG,EAAE,gCAAgC;IACrC,SAAS,EAAE,qCAAqC;IAChD,IAAI,EAAE,gCAAgC;IACtC,OAAO,EAAE,mCAAmC;CAC7C,CAAA;AACY,QAAA,GAAG,GAAG;IACjB,GAAG,EAAE,mCAAmC;IACxC,SAAS,EAAE,wCAAwC;IACnD,IAAI,EAAE,mCAAmC;IACzC,OAAO,EAAE,mCAAmC;CAC7C,CAAA;AACY,QAAA,IAAI,GAAG;IAClB,GAAG,EAAE,+BAA+B;IACpC,SAAS,EAAE,oCAAoC;IAC/C,IAAI,EAAE,+BAA+B;IACrC,OAAO,EAAE,kCAAkC;CAC5C,CAAA;AACY,QAAA,KAAK,GAAG;IACnB,GAAG,EAAE,qCAAqC;IAC1C,SAAS,EAAE,0CAA0C;IACrD,IAAI,EAAE,qCAAqC;IAC3C,OAAO,EAAE,wCAAwC;CAClD,CAAA;AAEY,QAAA,YAAY,GACvB,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,OAAO;IACpC,CAAC,CAAC,aAAK,CAAC,sBAAsB;IAC9B,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,KAAK;QACtC,CAAC,CAAC,WAAG,CAAC,sBAAsB;QAC5B,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,OAAO;YACxC,CAAC,CAAC,aAAK;YACP,CAAC,CAAC,YAAI,CAAA,CAAC,sBAAsB;AAEjC,IAAY,YAaX;AAbD,WAAY,YAAY;IACtB,mDAAmC,CAAA;IACnC,mDAAmC,CAAA;IACnC,+CAA+B,CAAA;IAC/B,+DAA+C,CAAA;IAC/C,yDAAyC,CAAA;IACzC,qDAAqC,CAAA;IACrC,uDAAuC,CAAA;IACvC,+CAA+B,CAAA;IAC/B,uDAAuC,CAAA;IACvC,uDAAuC,CAAA;IACvC,+CAA+B,CAAA;IAC/B,+CAA+B,CAAA;AACjC,CAAC,EAbW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAavB","sourcesContent":["export const LOCAL = {\n  SSO: 'http://localhost:5000/api/auth',\n  WORKSPACE: 'http://localhost:6000/api/workspace',\n  RUNS: 'http://localhost:5001/api/runs',\n  STORAGE: 'http://localhost:5050/api/storage',\n}\nexport const DEV = {\n  SSO: 'https://dev.api.blinq.io/api/auth',\n  WORKSPACE: 'https://dev.api.blinq.io/api/workspace',\n  RUNS: 'https://dev.api.blinq.io/api/runs',\n  STORAGE: 'http://localhost:5050/api/storage',\n}\nexport const PROD = {\n  SSO: 'https://api.blinq.io/api/auth',\n  WORKSPACE: 'https://api.blinq.io/api/workspace',\n  RUNS: 'https://api.blinq.io/api/runs',\n  STORAGE: 'https://api.blinq.io/api/storage',\n}\nexport const STAGE = {\n  SSO: 'https://stage.api.blinq.io/api/auth',\n  WORKSPACE: 'https://stage.api.blinq.io/api/workspace',\n  RUNS: 'https://stage.api.blinq.io/api/runs',\n  STORAGE: 'https://stage.api.blinq.io/api/storage',\n}\n\nexport const SERVICES_URI =\n  process.env.NODE_ENV_BLINQ === 'local'\n    ? LOCAL // eslint-disable-line\n    : process.env.NODE_ENV_BLINQ === 'dev'\n    ? DEV // eslint-disable-line\n    : process.env.NODE_ENV_BLINQ === 'stage'\n    ? STAGE\n    : PROD // eslint-disable-line\n\nexport enum ActionEvents {\n  record_scenario = 'record_scenario',\n  download_editor = 'download_editor',\n  launch_editor = 'launch_editor',\n  click_start_recording = 'click_start_recording',\n  click_run_scenario = 'click_run_scenario',\n  publish_scenario = 'publish_scenario',\n  click_ai_generate = 'click_ai_generate',\n  click_run_all = 'click_run_all',\n  click_open_vscode = 'click_open_vscode',\n  error_open_vscode = 'error_open_vscode',\n  cli_run_tests = 'cli_run_tests',\n  upload_report = 'upload_report',\n}\n"]}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/formatter/helpers/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,KAAK,GAAG;IACnB,GAAG,EAAE,gCAAgC;IACrC,SAAS,EAAE,qCAAqC;IAChD,IAAI,EAAE,gCAAgC;IACtC,OAAO,EAAE,mCAAmC;CAC7C,CAAA;AACY,QAAA,GAAG,GAAG;IACjB,GAAG,EAAE,mCAAmC;IACxC,SAAS,EAAE,wCAAwC;IACnD,IAAI,EAAE,mCAAmC;IACzC,OAAO,EAAE,sCAAsC;CAChD,CAAA;AACY,QAAA,IAAI,GAAG;IAClB,GAAG,EAAE,+BAA+B;IACpC,SAAS,EAAE,oCAAoC;IAC/C,IAAI,EAAE,+BAA+B;IACrC,OAAO,EAAE,kCAAkC;CAC5C,CAAA;AACY,QAAA,KAAK,GAAG;IACnB,GAAG,EAAE,qCAAqC;IAC1C,SAAS,EAAE,0CAA0C;IACrD,IAAI,EAAE,qCAAqC;IAC3C,OAAO,EAAE,wCAAwC;CAClD,CAAA;AAEY,QAAA,MAAM,GAAG;IACpB,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,WAAW;IAC7C,SAAS,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,gBAAgB;IACxD,IAAI,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,WAAW;IAC9C,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,cAAc;CACrD,CAAA;AAEY,QAAA,YAAY,GACvB,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,OAAO;IACpC,CAAC,CAAC,aAAK,CAAC,sBAAsB;IAC9B,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,KAAK;QACpC,CAAC,CAAC,WAAG,CAAC,sBAAsB;QAC5B,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,OAAO;YACtC,CAAC,CAAC,aAAK,CAAC,sBAAsB;YAC9B,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,MAAM;gBACrC,CAAC,CAAC,YAAI,CAAC,sBAAsB;gBAC7B,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc;oBAC3B,CAAC,CAAC,YAAI,CAAC,sBAAsB;oBAC7B,CAAC,CAAC,cAAM,CAAA,CAAC,sBAAsB;AAE3C,IAAY,YAaX;AAbD,WAAY,YAAY;IACtB,mDAAmC,CAAA;IACnC,mDAAmC,CAAA;IACnC,+CAA+B,CAAA;IAC/B,+DAA+C,CAAA;IAC/C,yDAAyC,CAAA;IACzC,qDAAqC,CAAA;IACrC,uDAAuC,CAAA;IACvC,+CAA+B,CAAA;IAC/B,uDAAuC,CAAA;IACvC,uDAAuC,CAAA;IACvC,+CAA+B,CAAA;IAC/B,+CAA+B,CAAA;AACjC,CAAC,EAbW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAavB","sourcesContent":["export const LOCAL = {\n  SSO: 'http://localhost:5000/api/auth',\n  WORKSPACE: 'http://localhost:6000/api/workspace',\n  RUNS: 'http://localhost:5001/api/runs',\n  STORAGE: 'http://localhost:5050/api/storage',\n}\nexport const DEV = {\n  SSO: 'https://dev.api.blinq.io/api/auth',\n  WORKSPACE: 'https://dev.api.blinq.io/api/workspace',\n  RUNS: 'https://dev.api.blinq.io/api/runs',\n  STORAGE: 'https://dev.api.blinq.io/api/storage',\n}\nexport const PROD = {\n  SSO: 'https://api.blinq.io/api/auth',\n  WORKSPACE: 'https://api.blinq.io/api/workspace',\n  RUNS: 'https://api.blinq.io/api/runs',\n  STORAGE: 'https://api.blinq.io/api/storage',\n}\nexport const STAGE = {\n  SSO: 'https://stage.api.blinq.io/api/auth',\n  WORKSPACE: 'https://stage.api.blinq.io/api/workspace',\n  RUNS: 'https://stage.api.blinq.io/api/runs',\n  STORAGE: 'https://stage.api.blinq.io/api/storage',\n}\n\nexport const CUSTOM = {\n  SSO: `${process.env.NODE_ENV_BLINQ}/api/auth`,\n  WORKSPACE: `${process.env.NODE_ENV_BLINQ}/api/workspace`,\n  RUNS: `${process.env.NODE_ENV_BLINQ}/api/runs`,\n  STORAGE: `${process.env.NODE_ENV_BLINQ}/api/storage`,\n}\n\nexport const SERVICES_URI =\n  process.env.NODE_ENV_BLINQ === 'local'\n    ? LOCAL // eslint-disable-line\n    : process.env.NODE_ENV_BLINQ === 'dev'\n      ? DEV // eslint-disable-line\n      : process.env.NODE_ENV_BLINQ === 'stage'\n        ? STAGE // eslint-disable-line\n        : process.env.NODE_ENV_BLINQ === 'prod'\n          ? PROD // eslint-disable-line\n          : !process.env.NODE_ENV_BLINQ\n            ? PROD // eslint-disable-line\n            : CUSTOM // eslint-disable-line\n\nexport enum ActionEvents {\n  record_scenario = 'record_scenario',\n  download_editor = 'download_editor',\n  launch_editor = 'launch_editor',\n  click_start_recording = 'click_start_recording',\n  click_run_scenario = 'click_run_scenario',\n  publish_scenario = 'publish_scenario',\n  click_ai_generate = 'click_ai_generate',\n  click_run_all = 'click_run_all',\n  click_open_vscode = 'click_open_vscode',\n  error_open_vscode = 'error_open_vscode',\n  cli_run_tests = 'cli_run_tests',\n  upload_report = 'upload_report',\n}\n"]}

package/lib/formatter/helpers/report_generator.d.ts

@@ -1,6 +1,6 @@
 import * as messages from '@cucumber/messages';
 type JsonTimestamp = number;
-type JsonStepType = 'Unknown' | 'Context' | 'Action' | 'Outcome' | 'Conjunction';
+type JsonStepType = 'Unknown' | 'Context' | 'Action' | 'Outcome' | 'Conjunction' | 'After' | 'Before';
 export type JsonResultUnknown = {
     status: 'UNKNOWN';
 };
@@ -32,6 +32,7 @@ export type JsonResultFailed = {
     startTime: JsonTimestamp;
     endTime: JsonTimestamp;
     message?: string;
+    name?: string;
 };
 export type JsonFixedByAi = {
     status: 'FIXED_BY_AI';
@@ -63,7 +64,12 @@ export type JsonStep = {
     commands: JsonCommand[];
     result: JsonStepResult;
     webLog: webLog[];
+    networkData: any[];
     data?: any;
+    ariaSnapshot: string;
+    traceFilePath?: string;
+    brunoData?: any;
+    interceptResults?: any;
 };
 export type RetrainStats = {
     result: JsonTestResult;
@@ -80,12 +86,15 @@ export type JsonTestProgress = {
     steps: JsonStep[];
     result: JsonTestResult;
     retrainStats?: RetrainStats;
+    initialAriaSnapshot?: string;
     webLog: any;
     networkLog: any;
+    logFileId?: string;
     env: {
         name: string;
         baseUrl: string;
     };
+    traceFileId?: string;
 };
 export type JsonReport = {
     testCases: JsonTestProgress[];
@@ -114,10 +123,16 @@ export default class ReportGenerator {
     private logs;
     private networkLog;
     private stepLogs;
+    private stepNetworkLogs;
     private runName;
+    private ariaSnapshot;
+    private initialAriaSnapshot;
+    private testCaseLog;
+    private loggingOverridden;
     reportFolder: null | string;
     private uploadService;
-    handleMessage(envelope: EnvelopeWithMetaMessage): Promise<void>;
+    private retryTestCaseId;
+    handleMessage(envelope: EnvelopeWithMetaMessage | messages.Envelope, reRunId?: string): Promise<any>;
     getReport(): JsonReport;
     private handleParseError;
     private onGherkinDocument;
@@ -130,11 +145,15 @@ export default class ReportGenerator {
     private onTestCaseStarted;
     private onTestStepStarted;
     private onAttachment;
+    private getFailedTestStepResult;
     private onTestStepFinished;
     getLogFileContent(): any;
     private getTestCaseResult;
     private onTestCaseFinished;
+    private readonly retryCount;
     private uploadTestCase;
+    private tryUpload;
+    private writeTestCaseReportToDisk;
     private onTestRunFinished;
 }
 export {};

package/lib/formatter/helpers/report_generator.js

@@ -31,13 +31,20 @@ const messages = __importStar(require("@cucumber/messages"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const upload_serivce_1 = require("./upload_serivce");
+const fs_extra_1 = require("fs-extra");
+// type JsonException = messages.Exception
+const object_path_1 = __importDefault(require("object-path"));
 const URL = process.env.NODE_ENV_BLINQ === 'dev'
     ? 'https://dev.api.blinq.io/api/runs'
     : process.env.NODE_ENV_BLINQ === 'local'
         ? 'http://localhost:5001/api/runs'
         : process.env.NODE_ENV_BLINQ === 'stage'
             ? 'https://stage.api.blinq.io/api/runs'
-            : 'https://api.blinq.io/api/runs';
+            : process.env.NODE_ENV_BLINQ === 'prod'
+                ? 'https://api.blinq.io/api/runs'
+                : !process.env.NODE_ENV_BLINQ
+                    ? 'https://api.blinq.io/api/runs'
+                    : `${process.env.NODE_ENV_BLINQ}/api/runs`;
 const REPORT_SERVICE_URL = (_a = process.env.REPORT_SERVICE_URL) !== null && _a !== void 0 ? _a : URL;
 const BATCH_SIZE = 10;
 const MAX_RETRIES = 3;
@@ -65,12 +72,19 @@ class ReportGenerator {
         this.logs = [];
         this.networkLog = [];
         this.stepLogs = [];
+        this.stepNetworkLogs = [];
         this.runName = '';
+        this.ariaSnapshot = '';
+        this.initialAriaSnapshot = '';
+        this.testCaseLog = [];
+        this.loggingOverridden = false; // Flag to track if logging is overridden
         this.reportFolder = null;
         this.uploadService = new upload_serivce_1.RunUploadService(REPORT_SERVICE_URL, REPORT_SERVICE_TOKEN);
+        this.retryTestCaseId = null;
+        this.retryCount = 3;
     }
-    async handleMessage(envelope) {
-        if (envelope.meta && envelope.meta.runName) {
+    async handleMessage(envelope, reRunId) {
+        if (envelope.meta && 'runName' in envelope.meta) {
             this.runName = envelope.meta.runName;
         }
         const type = Object.keys(envelope)[0];
@@ -97,14 +111,35 @@ class ReportGenerator {
             case 'testRunStarted': {
                 const testRunStarted = envelope[type];
                 this.onTestRunStarted(testRunStarted);
+                await this.uploadService.createStatus('running');
                 break;
             }
             case 'testCase': {
                 const testCase = envelope[type];
+                // Initialize the log storage
+                this.testCaseLog = [];
+                if (!this.loggingOverridden) {
+                    this.loggingOverridden = true;
+                    // Store the original process.stdout.write, and process.stderr.write
+                    const originalStdoutWrite = process.stdout.write;
+                    const originalStderrWrite = process.stderr.write;
+                    // Override process.stdout.write
+                    process.stdout.write = (chunk, ...args) => {
+                        this.testCaseLog.push(chunk.toString());
+                        return originalStdoutWrite.call(process.stdout, chunk, ...args);
+                    };
+                    // Override process.stderr.write
+                    process.stderr.write = (chunk, ...args) => {
+                        this.testCaseLog.push(chunk.toString());
+                        return originalStderrWrite.call(process.stderr, chunk, ...args);
+                    };
+                }
+                // Call the onTestCase method
                 this.onTestCase(testCase);
                 break;
             }
             case 'testCaseStarted': {
+                this.retryTestCaseId = envelope[type].retryTestCaseId;
                 const testCaseStarted = envelope[type];
                 this.onTestCaseStarted(testCaseStarted);
                 break;
@@ -126,13 +161,18 @@ class ReportGenerator {
             }
             case 'testCaseFinished': {
                 const testCaseFinished = envelope[type];
-                await this.onTestCaseFinished(testCaseFinished);
-                break;
+                let reRunIdFinal = this.retryTestCaseId;
+                if (reRunId) {
+                    reRunIdFinal = reRunId;
+                }
+                // Call the onTestCaseFinished method
+                const result = await this.onTestCaseFinished(testCaseFinished, reRunIdFinal);
+                return result;
             }
             // case "hook": { break} // After Hook
             case 'testRunFinished': {
                 const testRunFinished = envelope[type];
-                this.onTestRunFinished(testRunFinished);
+                await this.onTestRunFinished(testRunFinished);
                 break;
             }
             // case "parameterType" : { break}
@@ -263,7 +303,10 @@ class ReportGenerator {
                 result: {
                     status: 'UNKNOWN',
                 },
+                networkData: [],
                 webLog: [],
+                data: {},
+                ariaSnapshot: this.ariaSnapshot,
             });
             return this.stepReportMap.get(pickleStep.id);
         });
@@ -306,6 +349,14 @@ class ReportGenerator {
             this.reportFolder = body.replaceAll('\\', '/');
             return;
         }
+        if (mediaType === 'application/json+snapshot-before') {
+            this.initialAriaSnapshot = body;
+            return;
+        }
+        if (mediaType === 'application/json+snapshot-after') {
+            this.ariaSnapshot = body;
+            return;
+        }
         if (mediaType === 'application/json+env') {
             const data = JSON.parse(body);
             this.report.env = data;
@@ -325,6 +376,7 @@ class ReportGenerator {
             const networkLog = JSON.parse(body);
             if (this.networkLog.length < 1000)
                 this.networkLog.push(networkLog);
+            this.stepNetworkLogs.push(networkLog);
         }
         const testStep = this.testStepMap.get(testStepId);
         if (testStep.pickleStepId === undefined)
@@ -334,12 +386,79 @@ class ReportGenerator {
             const command = JSON.parse(body);
             stepProgess.commands.push(command);
         }
+        else if (mediaType === 'application/json+trace') {
+            const data = JSON.parse(body);
+            stepProgess.traceFilePath = data.traceFilePath;
+        }
+        if (mediaType === 'application/json+bruno') {
+            try {
+                const data = JSON.parse(body);
+                stepProgess.brunoData = data;
+            }
+            catch (error) {
+                console.error('Error parsing bruno data:', error);
+            }
+        }
+        if (mediaType === 'application/json+intercept-results') {
+            try {
+                const data = JSON.parse(body);
+                stepProgess.interceptResults = data;
+            }
+            catch (error) {
+                console.error('Error parsing intercept results:', error);
+            }
+        }
+    }
+    getFailedTestStepResult({ commands, startTime, endTime, result, stepName, }) {
+        for (const command of commands) {
+            if (command.result.status === 'FAILED') {
+                return {
+                    status: 'FAILED',
+                    message: command.result.message,
+                    name: stepName,
+                    startTime,
+                    endTime,
+                };
+            }
+        }
+        return {
+            status: 'FAILED',
+            startTime,
+            endTime,
+            message: result.message,
+            name: stepName,
+        };
     }
     onTestStepFinished(testStepFinished) {
         const { testStepId, testStepResult, timestamp } = testStepFinished;
         const testStep = this.testStepMap.get(testStepId);
         if (testStep.pickleStepId === undefined) {
             if (testStepResult.status === 'FAILED') {
+                const testCase = this.testCaseReportMap.get(testStepFinished.testCaseStartedId);
+                const type = testCase.steps[0].result.status === 'UNKNOWN' ? 'Before' : 'After';
+                const hookStep = {
+                    ariaSnapshot: null,
+                    commands: [],
+                    keyword: type,
+                    data: {},
+                    networkData: [],
+                    result: {
+                        status: 'FAILED',
+                        message: testStepResult.message,
+                        startTime: this.getTimeStamp(timestamp),
+                        endTime: this.getTimeStamp(timestamp),
+                    },
+                    text: 'Failed hook',
+                    type,
+                    webLog: [],
+                };
+                if (type === 'Before') {
+                    testCase.steps = [hookStep, ...testCase.steps];
+                }
+                else {
+                    testCase.steps = [...testCase.steps, hookStep];
+                }
+                this.testCaseReportMap.set(testStepFinished.testCaseStartedId, testCase);
                 console.error(`Before/After hook failed with message: ${testStepResult.message}`);
             }
             return;
@@ -378,18 +497,74 @@ class ReportGenerator {
         catch (error) {
             console.log('Error reading data.json');
         }
-        stepProgess.result = {
-            status: testStepResult.status,
-            startTime: prevStepResult.startTime,
-            endTime: this.getTimeStamp(timestamp),
-            message: testStepResult.message,
-            // exception: testStepResult.exception,
-        };
+        if (testStepResult.status === 'FAILED') {
+            stepProgess.result = this.getFailedTestStepResult({
+                commands: stepProgess.commands,
+                startTime: prevStepResult.startTime,
+                endTime: this.getTimeStamp(timestamp),
+                result: testStepResult,
+                stepName: stepProgess.text,
+            });
+        }
+        else {
+            stepProgess.result = {
+                status: testStepResult.status,
+                startTime: prevStepResult.startTime,
+                endTime: this.getTimeStamp(timestamp),
+            };
+        }
         stepProgess.webLog = this.stepLogs;
+        stepProgess.networkData = this.stepNetworkLogs;
+        stepProgess.ariaSnapshot = this.ariaSnapshot;
+        this.ariaSnapshot = '';
+        this.stepNetworkLogs = [];
         this.stepLogs = [];
         if (Object.keys(data).length > 0) {
             stepProgess.data = data;
+            const id = testStepFinished.testCaseStartedId;
+            const parameters = this.testCaseReportMap.get(id).parameters;
+            const _parameters = {};
+            Object.keys(parameters).map((key) => {
+                var _a;
+                const valueParam = parameters[key].toString();
+                if (valueParam.startsWith('{{') && valueParam.endsWith('}}')) {
+                    const path = valueParam.slice(2, -2).split('.');
+                    let value = String((_a = object_path_1.default.get(data, path)) !== null && _a !== void 0 ? _a : valueParam);
+                    if (value) {
+                        if (value.startsWith('secret:')) {
+                            value = 'secret:****';
+                        }
+                        else if (value.startsWith('totp:')) {
+                            value = 'totp:****';
+                        }
+                        else if (value.startsWith('mask:')) {
+                            value = 'mask:****';
+                        }
+                        _parameters[key] = value;
+                    }
+                }
+                else {
+                    _parameters[key] = parameters[key];
+                }
+            });
+            this.report.testCases.find((testCase) => {
+                return testCase.id === id;
+            }).parameters = _parameters;
         }
+        // if (process.env.TESTCASE_REPORT_FOLDER_PATH) {
+        //   this.reportFolder = process.env.TESTCASE_REPORT_FOLDER_PATH
+        //   if (!fs.existsSync(this.reportFolder)) {
+        //     fs.mkdirSync(this.reportFolder)
+        //   }
+        //   const reportFilePath = path.join(
+        //     this.reportFolder,
+        //     `report.json`
+        //   )
+        //   writeFileSync(reportFilePath, JSON.stringify(this.report, null, 2))
+        //   return undefined
+        //   // } else {
+        //   // return await this.uploadTestCase(testProgress, reRunId)
+        // }
     }
     getLogFileContent() {
         let projectPath = process.cwd();
@@ -416,6 +591,12 @@ class ReportGenerator {
         }
     }
     getTestCaseResult(steps) {
+        if (steps[0] && steps[0].result.status === 'SKIPPED') {
+            return {
+                status: 'FAILED',
+                message: 'Test skipped due to failure in before hooks',
+            };
+        }
         for (const step of steps) {
             switch (step.result.status) {
                 case 'FAILED':
@@ -437,24 +618,79 @@ class ReportGenerator {
             status: 'PASSED',
         };
     }
-    async onTestCaseFinished(testCaseFinished) {
+    async onTestCaseFinished(testCaseFinished, reRunId) {
         const { testCaseStartedId, timestamp } = testCaseFinished;
         const testProgress = this.testCaseReportMap.get(testCaseStartedId);
         const prevResult = testProgress.result;
         const steps = Object.values(testProgress.steps);
         const result = this.getTestCaseResult(steps);
+        if (result.status === 'PASSED' && reRunId) {
+            this.uploadService.updateProjectAnalytics(process.env.PROJECT_ID);
+        }
+        const endTime = this.getTimeStamp(timestamp);
         testProgress.result = {
             ...result,
             startTime: prevResult.startTime,
-            endTime: this.getTimeStamp(timestamp),
+            endTime,
         };
         testProgress.webLog = this.logs;
         testProgress.networkLog = this.networkLog;
+        testProgress.initialAriaSnapshot = this.initialAriaSnapshot;
+        if (process.env.TRACE) {
+            testProgress.traceFileId = path_1.default.join(`trace-${testCaseStartedId}.zip`);
+        }
+        this.initialAriaSnapshot = '';
         this.networkLog = [];
         this.logs = [];
-        await this.uploadTestCase(testProgress);
+        if (this.testCaseLog &&
+            this.testCaseLog.length > 0 &&
+            !testProgress.logFileId) {
+            // Create the logs directory
+            const logsDir = path_1.default.join(this.reportFolder, 'editorLogs');
+            const fileName = `testCaseLog_${testCaseStartedId}.log`;
+            const filePath = path_1.default.join(logsDir, fileName);
+            // Ensure the logs directory exists
+            fs_1.default.mkdirSync(logsDir, { recursive: true });
+            // Write the logs to the file
+            fs_1.default.writeFileSync(filePath, this.testCaseLog.join('\n'), 'utf8');
+            // Store this ID in the testProgress object so it can be accessed later
+            testProgress.logFileId = testCaseStartedId;
+        }
+        this.testCaseLog = [];
+        if (process.env.TESTCASE_REPORT_FOLDER_PATH) {
+            this.reportFolder = process.env.TESTCASE_REPORT_FOLDER_PATH;
+            if (!fs_1.default.existsSync(this.reportFolder)) {
+                fs_1.default.mkdirSync(this.reportFolder);
+            }
+            const reportFilePath = path_1.default.join(this.reportFolder, `${endTime}_${testProgress.scenarioName}.json`);
+            (0, fs_extra_1.writeFileSync)(reportFilePath, JSON.stringify(testProgress, null, 2));
+            return undefined;
+        }
+        else {
+            return await this.uploadTestCase(testProgress, reRunId);
+        }
     }
-    async uploadTestCase(testCase) {
+    async uploadTestCase(testCase, rerunId) {
+        let data = null;
+        for (let attempt = 1; attempt <= this.retryCount; attempt++) {
+            try {
+                data = await this.tryUpload(testCase, rerunId);
+                break;
+            }
+            catch (e) {
+                console.error(`Attempt ${attempt} to upload testcase failed:`, e);
+                if (attempt === this.retryCount) {
+                    console.error('All retry attempts failed, failed to upload testcase.');
+                }
+                else {
+                    const waitTime = 1000 * 2 ** (attempt - 1); //? exponential backoff: 1s, 2s, 4s...
+                    await new Promise((r) => setTimeout(r, waitTime));
+                }
+            }
+        }
+        return data;
+    }
+    async tryUpload(testCase, rerunId) {
         let runId = '';
         let projectId = '';
         if (!process.env.UPLOADING_TEST_CASE) {
@@ -472,7 +708,7 @@ class ReportGenerator {
                 projectId = process.env.PROJECT_ID;
             }
             else {
-                const runDoc = await this.uploadService.createRunDocument(this.runName);
+                const runDoc = await this.uploadService.createRunDocument(this.runName, testCase.env);
                 runId = runDoc._id;
                 projectId = runDoc.project_id;
                 if (!process.env.IGNORE_ENV_VARIABLES) {
@@ -480,10 +716,9 @@ class ReportGenerator {
                     process.env.PROJECT_ID = projectId;
                 }
             }
-            await this.uploadService.uploadTestCase(testCase, runId, projectId, this.reportFolder);
-        }
-        catch (e) {
-            console.error('Error uploading test case:', e);
+            const data = await this.uploadService.uploadTestCase(testCase, runId, projectId, this.reportFolder, rerunId);
+            this.writeTestCaseReportToDisk(testCase);
+            return data;
         }
         finally {
             const arrRem = JSON.parse(process.env.UPLOADING_TEST_CASE);
@@ -491,7 +726,30 @@ class ReportGenerator {
             process.env.UPLOADING_TEST_CASE = JSON.stringify(arrRem);
         }
     }
-    onTestRunFinished(testRunFinished) {
+    writeTestCaseReportToDisk(testCase) {
+        var _a;
+        const reportFolder = (_a = this.reportFolder) !== null && _a !== void 0 ? _a : process.env.TESTCASE_REPORT_FOLDER_PATH;
+        if (!reportFolder) {
+            console.error('Report folder is not defined');
+            return;
+        }
+        try {
+            let i = 0;
+            while (fs_1.default.existsSync(path_1.default.join(reportFolder, `${i}`))) {
+                i++;
+            }
+            fs_1.default.mkdirSync(path_1.default.join(reportFolder, `${i}`));
+            //exclude network log from the saved report
+            const networkLog = testCase.networkLog;
+            delete testCase.networkLog;
+            fs_1.default.writeFileSync(path_1.default.join(reportFolder, `${i}`, `report.json`), JSON.stringify(testCase, null, 2));
+            fs_1.default.writeFileSync(path_1.default.join(reportFolder, `${i}`, `network.json`), JSON.stringify(networkLog, null, 2));
+        }
+        catch (error) {
+            console.error('Error writing test case report to disk:', error);
+        }
+    }
+    async onTestRunFinished(testRunFinished) {
         const { timestamp, success, message } = testRunFinished;
         const prevResult = this.report.result;
         this.report.result = {
@@ -501,6 +759,7 @@ class ReportGenerator {
             message,
             // exception,
         };
+        await this.uploadService.createStatus(success ? 'passed' : 'failed');
     }
 }
 exports.default = ReportGenerator;