Merge pull request #12 from qavajs/step-gherkin-location

Step gherkin location

Author: AlexGalichenko

CHANGELOG.MD

@@ -1,3 +1,7 @@
+## 0.5.0
+- added step gherkin location
+- fixed issue with identifying hook keyword
+
 ## 0.4.0
 - updated logs displaying
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@qavajs/console-formatter",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "console formatter for cucumber framework",
   "scripts": {
     "test:e2e": "qavajs run --config test-e2e/config.js"
@@ -29,8 +29,8 @@
     "figures": "^3.2.0"
   },
   "devDependencies": {
-    "@cucumber/cucumber": "^9.2.0",
-    "@qavajs/cli": "^0.26.0",
+    "@cucumber/cucumber": "^9.3.0",
+    "@qavajs/cli": "^0.27.0",
     "@qavajs/memory": "^1.6.0"
   }
 }

package.json

@@ -141,6 +141,7 @@ class PrettyFormatter extends Formatter {
         const result = this.eventDataCollector.getTestCaseAttempt(testCase.testCaseStartedId);
         const tc = this.testCases[testCase.testCaseStartedId];
         tc.testSteps.forEach(step => {
+            step.gherkinLocation = this.stepGherkinLocation(step, result);
             step.logs = result.stepAttachments[step.id]?.filter(attachment => attachment.mediaType === 'text/x.cucumber.log+plain') ?? [];
         });
         this.updateRunStatus(tc);
@@ -156,7 +157,7 @@ class PrettyFormatter extends Formatter {
 
     drawStep(step) {
         let line = this.indent + chalk.bold(this.statusIcons[step.testStepResult.status]) + ' ' + step.stepText;
-        line += ` ${chalk.gray(step.location)}`;
+        line += ` ${chalk.gray(step.gherkinLocation)}${chalk.gray(step.location)}`;
         if (step.argument && step.argument.dataTable) {
             line += `\n${this.drawDataTable(step.argument.dataTable)}`
         }
@@ -199,7 +200,23 @@ class PrettyFormatter extends Formatter {
     hookKeyword(steps, testStep) {
         const hook = this.stepDefinitions[testStep.hookId];
         if (hook.name) return hook.name
-        return steps.every(element => element.stepText === undefined || element.stepText === 'Before') ? 'Before' : 'After'
+        const hookIndex = steps.findIndex(element => element.hookId === testStep.hookId);
+        return steps.slice(0, hookIndex).some(element => element.pickleStepId) ? 'After' : 'Before'
+    }
+
+    stepGherkinLocation(step, scenario) {
+        if (step.pickleStepId) {
+            const [ scenarioPickleId ] = scenario.pickle.astNodeIds;
+            const pickle = scenario.pickle.steps.find(e => e.id === step.pickleStepId);
+            const [ astNodeId] = pickle.astNodeIds;
+            const children = scenario.gherkinDocument.feature.children;
+            const scenarioSource = children.find(child => child.scenario?.id === scenarioPickleId);
+            const backgroundSource = children.find(child => child.background);
+            const stepsSources = [].concat(scenarioSource?.scenario?.steps).concat(backgroundSource?.background?.steps).filter(x => x);
+            const stepSource = stepsSources.find(s => s.id === astNodeId);
+            return stepSource ? `${scenario.gherkinDocument.uri}:${stepSource.location.line} ` : '';
+        }
+        return '';
     }
 
 }