cucumberjs-qase-reporter 2.0.0-beta.1 → 2.0.0-beta.2

package/dist/reporter.d.ts

@@ -1,5 +1,5 @@
 import { Formatter, IFormatterOptions, Status } from '@cucumber/cucumber';
-import { ConfigType, ConfigLoader, TestStatusEnum } from 'qase-javascript-commons';
+import { ConfigLoader, ConfigType, StepStatusEnum, TestStatusEnum } from 'qase-javascript-commons';
 type TestStepResultStatus = (typeof Status)[keyof typeof Status];
 export type CucumberQaseOptionsType = IFormatterOptions & {
     qase?: ConfigType;
@@ -13,6 +13,10 @@ export declare class CucumberQaseReporter extends Formatter {
      * @type {Record<TestStepResultStatus, TestStatusEnum | null>}
      */
     static statusMap: Record<TestStepResultStatus, TestStatusEnum | null>;
+    /**
+     * @type {Record<TestStepResultStatus, StepStatusEnum>}
+     */
+    static stepStatusMap: Record<TestStepResultStatus, StepStatusEnum>;
     /**
      * @type {RegExp}
      */
@@ -37,6 +41,11 @@ export declare class CucumberQaseReporter extends Formatter {
      * @type {Record<string, >}
      * @private
      */
+    /**
+     * @type {Record<string, TestStepFinished>}
+     * @private
+     */
+    private testCaseStepsFinished;
     private testCaseStartedResult;
     /**
      * @type {Record<string, string[]>}
@@ -77,10 +86,16 @@ export declare class CucumberQaseReporter extends Formatter {
      * @private
      */
     private bindEventListeners;
+    private convertSteps;
     /**
      * @returns {Promise<void>}
      * @private
      */
     private publishResults;
+    /**
+     * @returns {Promise<void>}
+     * @private
+     */
+    private startTestRun;
 }
 export {};

package/dist/reporter.js

@@ -44,6 +44,11 @@ class CucumberQaseReporter extends cucumber_1.Formatter {
          * @type {Record<string, >}
          * @private
          */
+        /**
+         * @type {Record<string, TestStepFinished>}
+         * @private
+         */
+        this.testCaseStepsFinished = {};
         this.testCaseStartedResult = {};
         /**
          * @type {Record<string, string[]>}
@@ -65,7 +70,7 @@ class CucumberQaseReporter extends cucumber_1.Formatter {
          * @private
          */
         this.attachments = {};
-        this.reporter = new qase_javascript_commons_1.QaseReporter({
+        this.reporter = qase_javascript_commons_1.QaseReporter.getInstance({
             ...(0, qase_javascript_commons_1.composeOptions)(qase, config),
             frameworkPackage: '@cucumber/cucumber',
             frameworkName: 'cucumberjs',
@@ -94,6 +99,7 @@ class CucumberQaseReporter extends cucumber_1.Formatter {
                     caseIds: CucumberQaseReporter.getCaseIds(envelope.pickle.tags),
                     name: envelope.pickle.name,
                     lastAstNodeId: envelope.pickle.astNodeIds[envelope.pickle.astNodeIds.length - 1],
+                    steps: envelope.pickle.steps,
                 };
             }
             else if (envelope.attachment) {
@@ -103,12 +109,15 @@ class CucumberQaseReporter extends cucumber_1.Formatter {
                         envelope.attachment.fileName;
                 }
             }
+            else if (envelope.testRunStarted) {
+                this.startTestRun();
+            }
             else if (envelope.testRunFinished) {
                 void this.publishResults();
             }
             else if (envelope.testCase) {
                 this.testCaseScenarioId[envelope.testCase.id] =
-                    envelope.testCase.pickleId;
+                    envelope.testCase;
             }
             else if (envelope.testCaseStarted) {
                 this.testCaseStarts[envelope.testCaseStarted.id] =
@@ -123,6 +132,7 @@ class CucumberQaseReporter extends cucumber_1.Formatter {
                 if (newStatus === null) {
                     return;
                 }
+                this.testCaseStepsFinished[stepFin.testStepId] = stepFin;
                 if (newStatus !== qase_javascript_commons_1.TestStatusEnum.passed) {
                     if (stepFin.testStepResult.message) {
                         const errors = this.testCaseStartedErrors[stepFin.testCaseStartedId] ?? [];
@@ -146,11 +156,11 @@ class CucumberQaseReporter extends cucumber_1.Formatter {
                 if (!tcs) {
                     return;
                 }
-                const pickleId = this.testCaseScenarioId[tcs.testCaseId];
-                if (!pickleId) {
+                const testCase = this.testCaseScenarioId[tcs.testCaseId];
+                if (!testCase) {
                     return;
                 }
-                const info = this.pickleInfo[pickleId];
+                const info = this.pickleInfo[testCase.pickleId];
                 if (!info) {
                     return;
                 }
@@ -158,20 +168,79 @@ class CucumberQaseReporter extends cucumber_1.Formatter {
                 if (this.testCaseStartedErrors[tcs.id]?.length) {
                     error = new Error(this.testCaseStartedErrors[tcs.id]?.join('\n\n'));
                 }
-                this.reporter.addTestResult({
+                let relations = null;
+                if (info.lastAstNodeId != undefined && this.scenarios[info.lastAstNodeId] != undefined) {
+                    relations = {
+                        suite: {
+                            data: [
+                                {
+                                    title: this.scenarios[info.lastAstNodeId] ?? '',
+                                    public_id: null,
+                                },
+                            ],
+                        },
+                    };
+                }
+                void this.reporter.addTestResult({
+                    attachments: [],
+                    author: null,
+                    execution: {
+                        status: this.testCaseStartedResult[envelope.testCaseFinished.testCaseStartedId] ?? qase_javascript_commons_1.TestStatusEnum.passed,
+                        start_time: null,
+                        end_time: null,
+                        duration: Math.abs(envelope.testCaseFinished.timestamp.seconds - tcs.timestamp.seconds),
+                        stacktrace: error?.stack ?? null,
+                        thread: null,
+                    },
+                    fields: {},
+                    message: null,
+                    muted: false,
+                    params: {},
+                    relations: relations,
+                    run_id: null,
+                    signature: '',
+                    steps: this.convertSteps(info.steps, testCase),
+                    testops_id: info.caseIds.length > 0 ? info.caseIds : null,
                     id: tcs.id,
-                    testOpsId: info.caseIds,
                     title: info.name,
-                    suiteTitle: info.lastAstNodeId && this.scenarios[info.lastAstNodeId],
-                    status: this.testCaseStartedResult[envelope.testCaseFinished.testCaseStartedId] ?? qase_javascript_commons_1.TestStatusEnum.passed,
-                    startTime: tcs.timestamp.seconds,
-                    endTime: envelope.testCaseFinished.timestamp.seconds,
-                    duration: Math.abs(envelope.testCaseFinished.timestamp.seconds - tcs.timestamp.seconds),
-                    error,
+                    // suiteTitle: info.lastAstNodeId && this.scenarios[info.lastAstNodeId],
                 });
             }
         });
     }
+    convertSteps(steps, testCase) {
+        const results = [];
+        for (const s of testCase.testSteps) {
+            const finished = this.testCaseStepsFinished[s.id];
+            if (!finished) {
+                continue;
+            }
+            const step = steps.find((step) => step.id === s.pickleStepId);
+            if (!step) {
+                continue;
+            }
+            const result = {
+                id: s.id,
+                step_type: qase_javascript_commons_1.StepType.GHERKIN,
+                data: {
+                    keyword: step.text,
+                    name: step.text,
+                    line: 0,
+                },
+                execution: {
+                    status: CucumberQaseReporter.stepStatusMap[finished.testStepResult.status],
+                    start_time: null,
+                    end_time: null,
+                    duration: finished.testStepResult.duration.seconds,
+                },
+                attachments: [],
+                steps: [],
+                parent_id: null,
+            };
+            results.push(result);
+        }
+        return results;
+    }
     /**
      * @returns {Promise<void>}
      * @private
@@ -179,6 +248,13 @@ class CucumberQaseReporter extends cucumber_1.Formatter {
     async publishResults() {
         await this.reporter.publish();
     }
+    /**
+     * @returns {Promise<void>}
+     * @private
+     */
+    startTestRun() {
+        this.reporter.startTestRun();
+    }
 }
 exports.CucumberQaseReporter = CucumberQaseReporter;
 /**
@@ -193,6 +269,18 @@ CucumberQaseReporter.statusMap = {
     [cucumber_1.Status.UNDEFINED]: null,
     [cucumber_1.Status.UNKNOWN]: null,
 };
+/**
+ * @type {Record<TestStepResultStatus, StepStatusEnum>}
+ */
+CucumberQaseReporter.stepStatusMap = {
+    [cucumber_1.Status.PASSED]: qase_javascript_commons_1.StepStatusEnum.passed,
+    [cucumber_1.Status.FAILED]: qase_javascript_commons_1.StepStatusEnum.failed,
+    [cucumber_1.Status.SKIPPED]: qase_javascript_commons_1.StepStatusEnum.blocked,
+    [cucumber_1.Status.AMBIGUOUS]: qase_javascript_commons_1.StepStatusEnum.blocked,
+    [cucumber_1.Status.PENDING]: qase_javascript_commons_1.StepStatusEnum.blocked,
+    [cucumber_1.Status.UNDEFINED]: qase_javascript_commons_1.StepStatusEnum.blocked,
+    [cucumber_1.Status.UNKNOWN]: qase_javascript_commons_1.StepStatusEnum.blocked,
+};
 /**
  * @type {RegExp}
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cucumberjs-qase-reporter",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.2",
   "description": "Qase TMS CucumberJS Reporter",
   "homepage": "https://github.com/qase-tms/qase-javascript",
   "main": "./dist/index.js",
@@ -40,7 +40,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@cucumber/messages": "^22.0.0",
-    "qase-javascript-commons": "^2.0.0-beta.1"
+    "qase-javascript-commons": "^2.0.0-beta.8"
   },
   "peerDependencies": {
     "@cucumber/cucumber": ">=7.0.0"