@dev-blinq/cucumber-js 1.0.30 → 1.0.32-stage

package/lib/formatter/feature_data_format.d.ts

@@ -1,14 +1,23 @@
+import { TableCell } from '@cucumber/messages';
 declare const generateTestData: (featureFileContent: string, vars?: any, fakeData?: {
     var: string;
     fake: string;
-}[]) => {
+}[], projectDir?: string) => {
     newContent: string;
     variables: any;
     otherFakeData: {
         var: string;
-        fake: string;
+        fake: any;
     }[];
     changed: boolean;
     fakeIndex: number;
 };
-export { generateTestData };
+declare const generateExamplesFromFunction: (data: string, feature_path: string, functionName: string, functionFile: string) => {
+    newData: string;
+    mjsData: any;
+};
+declare const generateExamplesFromFunctionGherkin: (headers: readonly TableCell[], values: readonly TableCell[], mjsData: any) => {
+    header: string;
+    value: any;
+}[];
+export { generateTestData, generateExamplesFromFunction, generateExamplesFromFunctionGherkin, };

package/lib/formatter/feature_data_format.js

@@ -1,16 +1,35 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateTestData = void 0;
+exports.generateExamplesFromFunctionGherkin = exports.generateExamplesFromFunction = exports.generateTestData = void 0;
 const faker_1 = require("@faker-js/faker");
-const generateTestData = (featureFileContent, vars, fakeData) => {
-    const regexp = /\{\{([^}]+)\}\}/g;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const json5_1 = __importDefault(require("json5"));
+const generateTestData = (featureFileContent, vars, fakeData, projectDir) => {
+    const regexp = /\{\{([^}]*\([^)]*\))\}\}/g;
     const variableRegex = /^([a-zA-Z0-9_]*)=(.*)/g;
     let newContent = featureFileContent;
     let match;
+    if (!projectDir) {
+        projectDir = process.cwd();
+    }
+    const namespacePath = path_1.default.join(projectDir, 'features', 'step_definitions', 'namespaces.json');
+    let namespaces = fs_1.default.existsSync(namespacePath)
+        ? JSON.parse(fs_1.default.readFileSync(namespacePath, 'utf-8'))
+        : [];
+    if (!Array.isArray(namespaces)) {
+        namespaces = [];
+    }
     const matches = [];
     // collect all matches
     while ((match = regexp.exec(featureFileContent)) !== null) {
-        matches.push(match);
+        // match[0] is the full match, match[1] is the first capturing group
+        // Eg:- match[0] = {{name}}, match[1] = name
+        if (!namespaces.includes(match[1].split('.')[0]))
+            matches.push(match);
     }
     // find all variables in the matches
     const variables = { ...vars };
@@ -43,7 +62,7 @@ const generateTestData = (featureFileContent, vars, fakeData) => {
         }
         for (const key in variables) {
             const variable = variables[key];
-            const fake = faker_1.faker.helpers.fake(`{{${variable.toFake}}}`);
+            const fake = getFakeString(variable.toFake.substring(2, variable.toFake.length - 2));
             newContent = newContent.replaceAll(`{{${variable.var}}}`, fake);
             variables[key].fake = fake;
         }
@@ -53,10 +72,14 @@ const generateTestData = (featureFileContent, vars, fakeData) => {
     const duplicateFakeData = fakeData ? [...fakeData] : [];
     let fakeIndex = 0;
     while ((match = regexp.exec(featureFileContent)) !== null) {
+        if (namespaces.includes(match[1].split('.')[0]))
+            continue;
         try {
-            const fake = duplicateFakeData && duplicateFakeData.length > 0
+            const fake = duplicateFakeData &&
+                duplicateFakeData.length > 0 &&
+                duplicateFakeData[0].var === match[0]
                 ? duplicateFakeData.shift().fake
-                : faker_1.faker.helpers.fake(match[0]);
+                : getFakeString(match[0].substring(2, match[0].length - 2));
             otherFakeData.push({
                 var: match[0],
                 fake,
@@ -66,7 +89,7 @@ const generateTestData = (featureFileContent, vars, fakeData) => {
         }
         catch (err) {
             // eslint-disable-next-line no-console
-            console.log('unknown faker variable:' + match[0]);
+            //console.log('unknown faker variable:' + match[0])
         }
     }
     return {
@@ -78,4 +101,69 @@ const generateTestData = (featureFileContent, vars, fakeData) => {
     };
 };
 exports.generateTestData = generateTestData;
+const getFakeString = (content) => {
+    const faking = content.split('(')[0].split('.');
+    const argument = content.substring(content.indexOf('(') + 1, content.indexOf(')'));
+    let fakeFunc = faker_1.faker;
+    faking.forEach((f) => {
+        fakeFunc = fakeFunc[f];
+    });
+    try {
+        return fakeFunc(json5_1.default.parse(argument));
+    }
+    catch (error) {
+        return fakeFunc(argument);
+    }
+};
+const getDefinitionFunction = (feature_path, functionName, functionFile) => {
+    const mjsFiles = fs_1.default
+        .readdirSync(path_1.default.join(feature_path, '../step_definitions'))
+        .filter((file) => file === `${functionFile}.js`);
+    if (mjsFiles.length === 0) {
+        throw new Error(`File ${functionFile} not found in step_definitions folder`);
+    }
+    const [mjsData] = mjsFiles.map((file) => {
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        const { [functionName]: func } = require(path_1.default.join(feature_path, '../step_definitions', file));
+        if (!func)
+            throw new Error(`Function ${functionName} not found in file ${file}`);
+        return func();
+    });
+    return mjsData;
+};
+const generateExamplesFromFunction = (data, feature_path, functionName, functionFile) => {
+    const examples = data.split('Examples:')[1].split('\n').slice(1);
+    const headers = examples[0]
+        .split('|')
+        .map((header) => header.trim())
+        .filter((header) => header !== '');
+    const values = examples[1]
+        .split('|')
+        .map((value) => value.trim())
+        .filter((header) => header !== '');
+    const mjsData = getDefinitionFunction(feature_path, functionName, functionFile);
+    const newExamples = headers.map((header) => {
+        if (mjsData[header]) {
+            return mjsData[header];
+        }
+        return values[headers.indexOf(header)];
+    });
+    let newExamplesString = data.split('Examples:')[1];
+    newExamples.forEach((example, index) => {
+        newExamplesString = newExamplesString.replace(values[index], example);
+    });
+    const newData = data.replace(data.split('Examples:')[1], newExamplesString);
+    return { newData, mjsData };
+};
+exports.generateExamplesFromFunction = generateExamplesFromFunction;
+const generateExamplesFromFunctionGherkin = (headers, values, mjsData) => {
+    const newExamples = headers.map(({ value: header }, index) => {
+        if (mjsData[header]) {
+            return { header, value: mjsData[header] };
+        }
+        return { header, value: values[index].value };
+    });
+    return newExamples;
+};
+exports.generateExamplesFromFunctionGherkin = generateExamplesFromFunctionGherkin;
 //# sourceMappingURL=feature_data_format.js.map

package/lib/formatter/feature_data_format.js.map

@@ -1 +1 @@
-{"version":3,"file":"feature_data_format.js","sourceRoot":"","sources":["../../src/formatter/feature_data_format.ts"],"names":[],"mappings":"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","sourcesContent":["import { faker } from '@faker-js/faker'\n\nconst generateTestData = (\n  featureFileContent: string,\n  vars?: any,\n  fakeData?: {\n    var: string\n    fake: string\n  }[]\n) => {\n  const regexp = /\\{\\{([^}]+)\\}\\}/g\n  const variableRegex = /^([a-zA-Z0-9_]*)=(.*)/g\n  let newContent = featureFileContent\n  let match: RegExpExecArray\n  const matches = []\n  // collect all matches\n  while ((match = regexp.exec(featureFileContent)) !== null) {\n    matches.push(match)\n  }\n  // find all variables in the matches\n  const variables: any = { ...vars }\n\n  if (Object.keys(variables).length > 0) {\n    for (let i = 0; i < matches.length; i++) {\n      const _match = matches[i]\n      const value = _match[1]\n      const variableMatch = variableRegex.exec(value)\n      if (variableMatch !== null) {\n        newContent = newContent.replaceAll(_match[0], `{{${variableMatch[1]}}}`)\n      }\n    }\n\n    for (const key in variables) {\n      const variable = variables[key]\n      newContent = newContent.replaceAll(`{{${variable.var}}}`, variable.fake)\n    }\n  } else {\n    for (let i = 0; i < matches.length; i++) {\n      const _match = matches[i]\n      const value = _match[1]\n      const variableMatch = variableRegex.exec(value)\n      if (variableMatch !== null) {\n        variables[variableMatch[1]] = {\n          var: variableMatch[1],\n          toFake: variableMatch[2],\n        }\n        newContent = newContent.replaceAll(_match[0], `{{${variableMatch[1]}}}`)\n      }\n    }\n\n    for (const key in variables) {\n      const variable = variables[key]\n      const fake = faker.helpers.fake(`{{${variable.toFake}}}`)\n      newContent = newContent.replaceAll(`{{${variable.var}}}`, fake)\n      variables[key].fake = fake\n    }\n  }\n\n  regexp.lastIndex = 0\n  const otherFakeData = []\n  const duplicateFakeData = fakeData ? [...fakeData] : []\n  let fakeIndex = 0\n\n  while ((match = regexp.exec(featureFileContent)) !== null) {\n    try {\n      const fake =\n        duplicateFakeData && duplicateFakeData.length > 0\n          ? duplicateFakeData.shift().fake\n          : faker.helpers.fake(match[0])\n      otherFakeData.push({\n        var: match[0],\n        fake,\n      })\n      newContent = newContent.replace(match[0], fake)\n      fakeIndex++\n    } catch (err) {\n      // eslint-disable-next-line no-console\n      console.log('unknown faker variable:' + match[0])\n    }\n  }\n\n  return {\n    newContent,\n    variables,\n    otherFakeData,\n    changed: newContent !== featureFileContent,\n    fakeIndex,\n  }\n}\n\n//let result = generateTestData(\"/Users/guyarieli/Documents/GitHub/ai-qa/cucumber_demo/features/create_issues.feature\");\n//console.log(result.newContent);\nexport { generateTestData }\n"]}
+{"version":3,"file":"feature_data_format.js","sourceRoot":"","sources":["../../src/formatter/feature_data_format.ts"],"names":[],"mappings":"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","sourcesContent":["import { faker } from '@faker-js/faker'\nimport fs from 'fs'\nimport path from 'path'\nimport { TableCell } from '@cucumber/messages'\nimport JSON5 from 'json5'\n\nconst generateTestData = (\n  featureFileContent: string,\n  vars?: any,\n  fakeData?: {\n    var: string\n    fake: string\n  }[],\n  projectDir?: string\n) => {\n  const regexp = /\\{\\{([^}]*\\([^)]*\\))\\}\\}/g\n  const variableRegex = /^([a-zA-Z0-9_]*)=(.*)/g\n  let newContent = featureFileContent\n  let match: RegExpExecArray\n  if (!projectDir) {\n    projectDir = process.cwd()\n  }\n  const namespacePath = path.join(\n    projectDir,\n    'features',\n    'step_definitions',\n    'namespaces.json'\n  )\n  let namespaces: string[] = fs.existsSync(namespacePath)\n    ? JSON.parse(fs.readFileSync(namespacePath, 'utf-8'))\n    : []\n  if (!Array.isArray(namespaces)) {\n    namespaces = []\n  }\n  const matches = []\n  // collect all matches\n  while ((match = regexp.exec(featureFileContent)) !== null) {\n    // match[0] is the full match, match[1] is the first capturing group\n    // Eg:- match[0] = {{name}}, match[1] = name\n    if (!namespaces.includes(match[1].split('.')[0])) matches.push(match)\n  }\n  // find all variables in the matches\n  const variables: any = { ...vars }\n\n  if (Object.keys(variables).length > 0) {\n    for (let i = 0; i < matches.length; i++) {\n      const _match = matches[i]\n      const value = _match[1]\n      const variableMatch = variableRegex.exec(value)\n      if (variableMatch !== null) {\n        newContent = newContent.replaceAll(_match[0], `{{${variableMatch[1]}}}`)\n      }\n    }\n\n    for (const key in variables) {\n      const variable = variables[key]\n      newContent = newContent.replaceAll(`{{${variable.var}}}`, variable.fake)\n    }\n  } else {\n    for (let i = 0; i < matches.length; i++) {\n      const _match = matches[i]\n      const value = _match[1]\n      const variableMatch = variableRegex.exec(value)\n      if (variableMatch !== null) {\n        variables[variableMatch[1]] = {\n          var: variableMatch[1],\n          toFake: variableMatch[2],\n        }\n        newContent = newContent.replaceAll(_match[0], `{{${variableMatch[1]}}}`)\n      }\n    }\n\n    for (const key in variables) {\n      const variable = variables[key]\n      const fake = getFakeString(\n        variable.toFake.substring(2, variable.toFake.length - 2)\n      )\n      newContent = newContent.replaceAll(`{{${variable.var}}}`, fake)\n      variables[key].fake = fake\n    }\n  }\n\n  regexp.lastIndex = 0\n  const otherFakeData = []\n  const duplicateFakeData = fakeData ? [...fakeData] : []\n  let fakeIndex = 0\n  while ((match = regexp.exec(featureFileContent)) !== null) {\n    if (namespaces.includes(match[1].split('.')[0])) continue\n    try {\n      const fake =\n        duplicateFakeData &&\n        duplicateFakeData.length > 0 &&\n        duplicateFakeData[0].var === match[0]\n          ? duplicateFakeData.shift().fake\n          : getFakeString(match[0].substring(2, match[0].length - 2))\n      otherFakeData.push({\n        var: match[0],\n        fake,\n      })\n      newContent = newContent.replace(match[0], fake)\n      fakeIndex++\n    } catch (err) {\n      // eslint-disable-next-line no-console\n      //console.log('unknown faker variable:' + match[0])\n    }\n  }\n\n  return {\n    newContent,\n    variables,\n    otherFakeData,\n    changed: newContent !== featureFileContent,\n    fakeIndex,\n  }\n}\n\nconst getFakeString = (content: string) => {\n  const faking = content.split('(')[0].split('.')\n  const argument = content.substring(\n    content.indexOf('(') + 1,\n    content.indexOf(')')\n  )\n  let fakeFunc: any = faker\n  faking.forEach((f: string) => {\n    fakeFunc = fakeFunc[f]\n  })\n\n  try {\n    return fakeFunc(JSON5.parse(argument))\n  } catch (error) {\n    return fakeFunc(argument)\n  }\n}\n\nconst getDefinitionFunction = (\n  feature_path: string,\n  functionName: string,\n  functionFile: string\n) => {\n  const mjsFiles = fs\n    .readdirSync(path.join(feature_path, '../step_definitions'))\n    .filter((file) => file === `${functionFile}.js`)\n\n  if (mjsFiles.length === 0) {\n    throw new Error(`File ${functionFile} not found in step_definitions folder`)\n  }\n\n  const [mjsData] = mjsFiles.map((file) => {\n    // eslint-disable-next-line @typescript-eslint/no-var-requires\n    const { [functionName]: func } = require(path.join(\n      feature_path,\n      '../step_definitions',\n      file\n    ))\n    if (!func)\n      throw new Error(`Function ${functionName} not found in file ${file}`)\n\n    return func()\n  })\n\n  return mjsData\n}\n\nconst generateExamplesFromFunction = (\n  data: string,\n  feature_path: string,\n  functionName: string,\n  functionFile: string\n) => {\n  const examples = data.split('Examples:')[1].split('\\n').slice(1)\n  const headers = examples[0]\n    .split('|')\n    .map((header) => header.trim())\n    .filter((header) => header !== '')\n  const values = examples[1]\n    .split('|')\n    .map((value) => value.trim())\n    .filter((header) => header !== '')\n\n  const mjsData = getDefinitionFunction(\n    feature_path,\n    functionName,\n    functionFile\n  )\n\n  const newExamples = headers.map((header) => {\n    if (mjsData[header]) {\n      return mjsData[header]\n    }\n    return values[headers.indexOf(header)]\n  })\n\n  let newExamplesString = data.split('Examples:')[1]\n  newExamples.forEach((example, index) => {\n    newExamplesString = newExamplesString.replace(values[index], example)\n  })\n\n  const newData = data.replace(data.split('Examples:')[1], newExamplesString)\n\n  return { newData, mjsData }\n}\n\nconst generateExamplesFromFunctionGherkin = (\n  headers: readonly TableCell[],\n  values: readonly TableCell[],\n  mjsData: any\n) => {\n  const newExamples = headers.map(({ value: header }, index) => {\n    if (mjsData[header]) {\n      return { header, value: mjsData[header] }\n    }\n    return { header, value: values[index].value }\n  })\n\n  return newExamples\n}\n\nexport {\n  generateTestData,\n  generateExamplesFromFunction,\n  generateExamplesFromFunctionGherkin,\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';
+type JsonStepType = 'Unknown' | 'Context' | 'Action' | 'Outcome' | 'Conjunction';
 export type JsonResultUnknown = {
     status: 'UNKNOWN';
 };
@@ -48,12 +48,22 @@ type JsonCommand = {
     text: string;
     screenshotId?: string;
     result: JsonCommandResult;
+    webLog?: webLog[];
+    netWorkLog?: any[];
+};
+type webLog = {
+    type: string;
+    text: string;
+    location: string;
+    time: string;
 };
 export type JsonStep = {
+    keyword: string;
     type: JsonStepType;
     text: string;
     commands: JsonCommand[];
     result: JsonStepResult;
+    data?: any;
 };
 export type RetrainStats = {
     result: JsonTestResult;
@@ -70,19 +80,29 @@ export type JsonTestProgress = {
     steps: JsonStep[];
     result: JsonTestResult;
     retrainStats?: RetrainStats;
+    webLog: any;
+    networkLog: any;
 };
 export type JsonReport = {
     testCases: JsonTestProgress[];
     result: JsonReportResult;
+    env: {
+        name: string;
+        baseUrl: string;
+    };
 };
 export default class ReportGenerator {
     private report;
     private gherkinDocumentMap;
+    private stepMap;
     private pickleMap;
     private testCaseMap;
     private testStepMap;
-    private stepProgressMap;
-    private testProgressMap;
+    private stepReportMap;
+    private testCaseReportMap;
+    private scenarioIterationCountMap;
+    private logs;
+    private networkLog;
     reportFolder: null | string;
     handleMessage(envelope: messages.Envelope): void;
     getReport(): JsonReport;
@@ -92,10 +112,13 @@ export default class ReportGenerator {
     private getTimeStamp;
     private onTestRunStarted;
     private onTestCase;
+    private _findScenario;
+    private _getParameters;
     private onTestCaseStarted;
     private onTestStepStarted;
     private onAttachment;
     private onTestStepFinished;
+    getLogFileContent(): any;
     private getTestCaseResult;
     private onTestCaseFinished;
     private onTestRunFinished;

package/lib/formatter/helpers/report_generator.js

@@ -1,5 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
 class ReportGenerator {
     constructor() {
         this.report = {
@@ -7,13 +12,21 @@ class ReportGenerator {
                 status: 'UNKNOWN',
             },
             testCases: [],
+            env: {
+                name: '',
+                baseUrl: '',
+            },
         };
         this.gherkinDocumentMap = new Map();
+        this.stepMap = new Map();
         this.pickleMap = new Map();
         this.testCaseMap = new Map();
         this.testStepMap = new Map();
-        this.stepProgressMap = new Map();
-        this.testProgressMap = new Map();
+        this.stepReportMap = new Map();
+        this.testCaseReportMap = new Map();
+        this.scenarioIterationCountMap = new Map();
+        this.logs = [];
+        this.networkLog = [];
         this.reportFolder = null;
     }
     handleMessage(envelope) {
@@ -87,7 +100,7 @@ class ReportGenerator {
         return this.report;
     }
     handleParseError(parseError) {
-        const { message, source } = parseError;
+        const { message } = parseError;
         const timestamp = new Date().getTime();
         this.report.result = {
             status: 'FAILED',
@@ -98,6 +111,32 @@ class ReportGenerator {
     }
     onGherkinDocument(doc) {
         this.gherkinDocumentMap.set(doc.uri, doc);
+        doc.feature.children.forEach((child) => {
+            if (child.scenario) {
+                child.scenario.steps.forEach((step) => {
+                    this.stepMap.set(step.id, step);
+                });
+            }
+            else if (child.background) {
+                child.background.steps.forEach((step) => {
+                    this.stepMap.set(step.id, step);
+                });
+            }
+            else if (child.rule) {
+                child.rule.children.forEach((child) => {
+                    if (child.scenario) {
+                        child.scenario.steps.forEach((step) => {
+                            this.stepMap.set(step.id, step);
+                        });
+                    }
+                    else if (child.background) {
+                        child.background.steps.forEach((step) => {
+                            this.stepMap.set(step.id, step);
+                        });
+                    }
+                });
+            }
+        });
     }
     onPickle(pickle) {
         this.pickleMap.set(pickle.id, pickle);
@@ -117,6 +156,37 @@ class ReportGenerator {
             this.testStepMap.set(testStep.id, testStep);
         });
     }
+    _findScenario(doc, scenarioId) {
+        for (const child of doc.feature.children) {
+            if (child.scenario && child.scenario.id === scenarioId) {
+                return child.scenario;
+            }
+            if (child.rule) {
+                for (const scenario of child.rule.children) {
+                    if (scenario.scenario && scenario.scenario.id === scenarioId) {
+                        return scenario.scenario;
+                    }
+                }
+            }
+        }
+        throw new Error(`scenario "${scenarioId}" not found`);
+    }
+    _getParameters(scenario, exampleId) {
+        const parameters = {};
+        if (scenario.examples.length === 0)
+            return parameters;
+        for (const examples of scenario.examples) {
+            for (const tableRow of examples.tableBody) {
+                if (tableRow.id === exampleId) {
+                    for (let i = 0; i < examples.tableHeader.cells.length; i++) {
+                        parameters[examples.tableHeader.cells[i].value] =
+                            tableRow.cells[i].value;
+                    }
+                }
+            }
+        }
+        return parameters;
+    }
     onTestCaseStarted(testCaseStarted) {
         const { testCaseId, id, timestamp } = testCaseStarted;
         const testCase = this.testCaseMap.get(testCaseId);
@@ -129,67 +199,112 @@ class ReportGenerator {
         if (doc === undefined)
             throw new Error(`gherkinDocument with uri ${pickle.uri} not found`);
         const featureName = doc.feature.name;
-        const scenarioName = pickle.name;
-        const steps = pickle.steps.map((step) => {
-            this.stepProgressMap.set(step.id, {
-                type: step.type,
+        const scenarioId = pickle.astNodeIds[0];
+        const scenario = this._findScenario(doc, scenarioId);
+        const scenarioName = scenario.name;
+        if (!this.scenarioIterationCountMap.has(scenarioId)) {
+            this.scenarioIterationCountMap.set(scenarioId, 1);
+        }
+        const parameters = this._getParameters(scenario, pickle.astNodeIds[1]);
+        console.log(`Running scenario ${scenarioName} iteration ${this.scenarioIterationCountMap.get(scenarioId)} with parameters:\n${JSON.stringify(parameters, null, 4)}\n 
+      `);
+        this.scenarioIterationCountMap.set(scenarioId, this.scenarioIterationCountMap.get(scenarioId) + 1);
+        const steps = pickle.steps.map((pickleStep) => {
+            const stepId = pickleStep.astNodeIds[0];
+            const step = this.stepMap.get(stepId);
+            this.stepReportMap.set(pickleStep.id, {
+                type: step.keywordType,
+                keyword: step.keyword,
                 text: step.text,
                 commands: [],
                 result: {
                     status: 'UNKNOWN',
                 },
             });
-            return this.stepProgressMap.get(step.id);
+            return this.stepReportMap.get(pickleStep.id);
         });
-        this.testProgressMap.set(id, {
+        this.testCaseReportMap.set(id, {
             id,
             uri: pickle.uri,
             featureName,
             scenarioName,
-            // TODO: compute parameters
-            parameters: {},
+            parameters,
             steps,
             result: {
                 status: 'STARTED',
                 startTime: this.getTimeStamp(timestamp),
             },
+            webLog: [],
+            networkLog: [],
         });
-        this.report.testCases.push(this.testProgressMap.get(id));
+        this.report.testCases.push(this.testCaseReportMap.get(id));
     }
     onTestStepStarted(testStepStarted) {
-        const { testStepId, timestamp, testCaseStartedId } = testStepStarted;
+        const { testStepId, timestamp } = testStepStarted;
         const testStep = this.testStepMap.get(testStepId);
         if (testStep === undefined)
             throw new Error(`testStep with id ${testStepId} not found`);
         if (testStep.pickleStepId === undefined)
             return;
-        const stepProgess = this.stepProgressMap.get(testStep.pickleStepId);
+        const stepProgess = this.stepReportMap.get(testStep.pickleStepId);
         stepProgess.result = {
             status: 'STARTED',
             startTime: this.getTimeStamp(timestamp),
         };
     }
     onAttachment(attachment) {
-        const { testCaseStartedId, testStepId, body, mediaType, contentEncoding, fileName, source, url, } = attachment;
+        const { testStepId, body, mediaType } = attachment;
         if (mediaType === 'text/plain') {
             this.reportFolder = body.replaceAll('\\', '/');
+            return;
+        }
+        if (mediaType === 'application/json+env') {
+            const data = JSON.parse(body);
+            this.report.env = data;
+        }
+        if (mediaType === 'application/json+log') {
+            const log = JSON.parse(body);
+            if (this.logs.length < 1000)
+                this.logs.push(log);
+        }
+        if (mediaType === 'application/json+network') {
+            const networkLog = JSON.parse(body);
+            if (this.networkLog.length < 1000)
+                this.networkLog.push(networkLog);
         }
         const testStep = this.testStepMap.get(testStepId);
         if (testStep.pickleStepId === undefined)
             return;
-        const stepProgess = this.stepProgressMap.get(testStep.pickleStepId);
+        const stepProgess = this.stepReportMap.get(testStep.pickleStepId);
         if (mediaType === 'application/json') {
             const command = JSON.parse(body);
             stepProgess.commands.push(command);
         }
     }
     onTestStepFinished(testStepFinished) {
-        const { testStepId, testCaseStartedId, testStepResult, timestamp } = testStepFinished;
+        const { testStepId, testStepResult, timestamp } = testStepFinished;
         const testStep = this.testStepMap.get(testStepId);
-        if (testStep.pickleStepId === undefined)
+        if (testStep.pickleStepId === undefined) {
+            if (testStepResult.status === 'FAILED') {
+                console.error(`Before/After hook failed with message: ${testStepResult.message}`);
+            }
             return;
-        const stepProgess = this.stepProgressMap.get(testStep.pickleStepId);
+        }
+        const stepProgess = this.stepReportMap.get(testStep.pickleStepId);
         const prevStepResult = stepProgess.result;
+        let data = {};
+        const reportFolder = this.reportFolder;
+        if (reportFolder === null) {
+            throw new Error('"reportFolder" is "null". Failed to run BVT hooks. Please retry after running "Generate All" or "Record Scenario" ');
+        }
+        try {
+            if (fs_1.default.existsSync(path_1.default.join(reportFolder, 'data.json'))) {
+                data = JSON.parse(fs_1.default.readFileSync(path_1.default.join(reportFolder, 'data.json'), 'utf8'));
+            }
+        }
+        catch (error) {
+            console.log('Error reading data.json');
+        }
         stepProgess.result = {
             status: testStepResult.status,
             startTime: prevStepResult.startTime,
@@ -197,6 +312,33 @@ class ReportGenerator {
             message: testStepResult.message,
             // exception: testStepResult.exception,
         };
+        if (Object.keys(data).length > 0) {
+            stepProgess.data = data;
+        }
+    }
+    getLogFileContent() {
+        let projectPath = process.cwd();
+        if (process.env.PROJECT_PATH) {
+            projectPath = process.env.PROJECT_PATH;
+        }
+        const logFolder = path_1.default.join(projectPath, 'logs', 'web');
+        if (!fs_1.default.existsSync(logFolder)) {
+            return [];
+        }
+        let nextId = 1;
+        while (fs_1.default.existsSync(path_1.default.join(logFolder, `${nextId}.json`))) {
+            nextId++;
+        }
+        if (nextId === 1) {
+            return [];
+        }
+        try {
+            const logFileContent = fs_1.default.readFileSync(path_1.default.join(logFolder, `${nextId - 1}.json`), 'utf8');
+            return JSON.parse(logFileContent);
+        }
+        catch (error) {
+            return [];
+        }
     }
     getTestCaseResult(steps) {
         for (const step of steps) {
@@ -222,7 +364,7 @@ class ReportGenerator {
     }
     onTestCaseFinished(testCaseFinished) {
         const { testCaseStartedId, timestamp } = testCaseFinished;
-        const testProgress = this.testProgressMap.get(testCaseStartedId);
+        const testProgress = this.testCaseReportMap.get(testCaseStartedId);
         const prevResult = testProgress.result;
         const steps = Object.values(testProgress.steps);
         const result = this.getTestCaseResult(steps);
@@ -231,9 +373,13 @@ class ReportGenerator {
             startTime: prevResult.startTime,
             endTime: this.getTimeStamp(timestamp),
         };
+        testProgress.webLog = this.logs;
+        testProgress.networkLog = this.networkLog;
+        this.networkLog = [];
+        this.logs = [];
     }
     onTestRunFinished(testRunFinished) {
-        const { timestamp, success, exception, message } = testRunFinished;
+        const { timestamp, success, message } = testRunFinished;
         const prevResult = this.report.result;
         this.report.result = {
             status: success ? 'PASSED' : 'FAILED',