@uuv/playwright 3.1.0 → 3.2.1

package/dist/lib/runner-playwright.js

@@ -94,7 +94,8 @@ class UUVCliPlaywrightRunner {
         }
         return `${targetTestFile
             .replaceAll("uuv/e2e/", ".uuv-features-gen/")
-            .replaceAll(".feature", ".feature.spec.js")}`;
+            .replaceAll("e2e/", ".features-gen/")
+            .replaceAll(/\.feature$/g, ".feature.spec.js")}`;
     }
     runPlaywright(options) {
         const configFile = `${this.projectDir}/playwright.config.ts`;

package/dist/reporter/uuv-playwright-reporter-helper.d.ts

@@ -16,6 +16,8 @@ declare class UuvPlaywrightReporterHelper {
     private consoleReportMap;
     private errors;
     private currentFeatureFile;
+    private foundConf;
+    constructor();
     createTestRunStartedEnvelope(config: FullConfig, suite: Suite, startTimestamp: {
         seconds: number;
         nanos: number;
@@ -35,8 +37,8 @@ declare class UuvPlaywrightReporterHelper {
     }): void;
     private getTestStepKey;
     createTestCaseFinishedEnvelope(test: TestCase, result: TestResult, featureFile: string, endTimestamp: any): void;
-    private logTeamcityTestEnd;
-    private logTeamcitySuiteFinishedIfNeeded;
+    private handleTestEnd;
+    private handleTestSuiteFinishedIfNeeded;
     private addResultErrors;
     private createTestCaseErrorAttachmentsEnvelope;
     private initConsoleReportIfNotExists;
@@ -48,6 +50,7 @@ declare class UuvPlaywrightReporterHelper {
         nanos: number;
     };
     getOriginalFeatureFile(generatedFile: string): string | undefined;
+    getTestSuiteName(featureFile: string): string;
     getCurrentRunningScenario(test: TestCase, featureFile: string): string;
     private addError;
     private getStatus;
@@ -68,12 +71,6 @@ declare class UuvPlaywrightReporterHelper {
     logTestEnd(testCase: TestCase, result: TestResult): void;
     private getResultIcon;
     private getTestCaseTitle;
-    logTeamCity(line: any): void;
-    private teamcityFlowId;
-    private teamcityFlowIdAndParentFlowId;
-    private teamcityAddName;
-    private teamcityAddDuration;
-    private teamcityAddCustomField;
     private getTagsParameter;
 }
 export default UuvPlaywrightReporterHelper;

package/dist/reporter/uuv-playwright-reporter-helper.js

@@ -15,6 +15,7 @@ const chalk_table_1 = __importDefault(require("chalk-table"));
 const uuv_custom_formatter_1 = require("./uuv-custom-formatter");
 const tag_expressions_1 = __importDefault(require("@cucumber/tag-expressions"));
 const path_1 = __importDefault(require("path"));
+const runner_commons_1 = require("@uuv/runner-commons");
 const NANOS_IN_SECOND = 1000000000;
 const NANOS_IN_MILLISSECOND = 1000000;
 var GeneratedReportType;
@@ -50,6 +51,19 @@ class UuvPlaywrightReporterHelper {
     consoleReportMap = new Map();
     errors = [];
     currentFeatureFile;
+    foundConf;
+    constructor() {
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        const bddgenConfAsString = process.env.PLAYWRIGHT_BDD_CONFIGS;
+        if (bddgenConfAsString) {
+            const bddgenConf = JSON.parse(bddgenConfAsString);
+            if (Object.keys.length > 0) {
+                const foundPath = Object.keys(bddgenConf)[0];
+                this.foundConf = bddgenConf[foundPath];
+            }
+        }
+    }
     createTestRunStartedEnvelope(config, suite, startTimestamp) {
         this.testDir = config.projects[0].testDir;
         const featureFiles = this.getFeatureFiles(suite);
@@ -87,7 +101,11 @@ class UuvPlaywrightReporterHelper {
             this.testCasesAndTestCasesStartedIdMap.set(test.id, testCaseStartedId);
             this.initConsoleReportIfNotExists(featureFile);
         }
-        this.logTeamCity(`##teamcity[testStarted ${this.teamcityAddName(test.title)} ${this.teamcityFlowIdAndParentFlowId(test.title, featureFile)} ${this.teamcityAddCustomField("locationHint", "test://" + featureFile)} ]`);
+        runner_commons_1.UUVEventEmitter.getInstance().emitTestStarted({
+            testName: test.title,
+            testSuiteName: this.getTestSuiteName(featureFile),
+            testSuitelocation: featureFile
+        });
     }
     createTestStepStartedEnvelope(test, step, featureFile, startTimestamp) {
         const currentQuery = this.queries.get(featureFile);
@@ -180,7 +198,7 @@ class UuvPlaywrightReporterHelper {
         return `${location.file.replaceAll("\\", "_")}-${location.line}-${location.column}`;
     }
     createTestCaseFinishedEnvelope(test, result, featureFile, endTimestamp) {
-        this.logTeamcityTestEnd(result, test, featureFile);
+        this.handleTestEnd(result, test, featureFile);
         this.updateTestcaseStatus(featureFile, test.id, "done");
         const currentQuery = this.queries.get(featureFile);
         if (currentQuery) {
@@ -201,26 +219,38 @@ class UuvPlaywrightReporterHelper {
             this.addResultErrors(result, test, featureFile);
             this.createTestCaseErrorAttachmentsEnvelope(testCaseStartedId, result);
         }
-        this.logTeamcitySuiteFinishedIfNeeded(featureFile);
+        this.handleTestSuiteFinishedIfNeeded(featureFile);
     }
-    logTeamcityTestEnd(result, test, featureFile) {
+    handleTestEnd(result, test, featureFile) {
         switch (result.status) {
             case "passed":
-                this.logTeamCity(`##teamcity[testFinished ${this.teamcityAddName(test.title)} ${this.teamcityFlowIdAndParentFlowId(test.title, featureFile)} ${this.teamcityAddDuration(result)} ]`);
+                runner_commons_1.UUVEventEmitter.getInstance().emitTestFinished({
+                    testName: test.title,
+                    testSuiteName: this.getTestSuiteName(featureFile),
+                    duration: result.duration
+                });
                 break;
             case "failed":
-                this.logTeamCity(`##teamcity[testFailed ${this.teamcityAddName(test.title)} ${this.teamcityFlowIdAndParentFlowId(test.title, featureFile)} type='comparisonFailure' message='Test failed' ]`);
-                this.logTeamCity(`##teamcity[testFinished ${this.teamcityAddName(test.title)} ${this.teamcityFlowIdAndParentFlowId(test.title, featureFile)} ${this.teamcityAddDuration(result)} ]`);
+                runner_commons_1.UUVEventEmitter.getInstance().emitTestFailed({
+                    testName: test.title,
+                    testSuiteName: this.getTestSuiteName(featureFile),
+                    duration: result.duration
+                });
                 break;
             default:
-                this.logTeamCity(`##teamcity[testIgnored ${this.teamcityAddName(test.title)} ${this.teamcityFlowIdAndParentFlowId(test.title, featureFile)} ]`);
+                runner_commons_1.UUVEventEmitter.getInstance().emitTestIgnored({
+                    testName: test.title,
+                    testSuiteName: this.getTestSuiteName(featureFile)
+                });
         }
     }
-    logTeamcitySuiteFinishedIfNeeded(featureFile) {
+    handleTestSuiteFinishedIfNeeded(featureFile) {
         const featureTestCaseStatus = this.featureFileAndTestCaseStatusMap.get(featureFile);
         if (featureTestCaseStatus) {
             if (Object.entries(featureTestCaseStatus).find(([, value]) => value === "todo") === undefined) {
-                this.logTeamCity(`##teamcity[testSuiteFinished ${this.teamcityAddName(featureFile)} ${this.teamcityFlowId(featureFile)} ]`);
+                runner_commons_1.UUVEventEmitter.getInstance().emitTestSuiteFinished({
+                    testSuiteName: this.getTestSuiteName(featureFile)
+                });
             }
         }
     }
@@ -255,7 +285,10 @@ class UuvPlaywrightReporterHelper {
     }
     initConsoleReportIfNotExists(featureFile) {
         if (!this.consoleReportMap.get(featureFile)) {
-            this.logTeamCity(`##teamcity[testSuiteStarted ${this.teamcityAddName(featureFile)} ${this.teamcityFlowId(featureFile)} ${this.teamcityAddCustomField("locationHint", "suite://" + featureFile)} ]`);
+            runner_commons_1.UUVEventEmitter.getInstance().emitTestSuiteStarted({
+                testSuiteName: this.getTestSuiteName(featureFile),
+                testSuitelocation: featureFile
+            });
             this.consoleReportMap.set(featureFile, new ReportOfFeature());
         }
     }
@@ -291,24 +324,19 @@ class UuvPlaywrightReporterHelper {
         };
     }
     getOriginalFeatureFile(generatedFile) {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        const bddgenConfAsString = process.env.PLAYWRIGHT_BDD_CONFIGS;
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        const projectDir = process.env.CONFIG_DIR;
-        if (bddgenConfAsString && projectDir) {
-            const bddgenConf = JSON.parse(bddgenConfAsString);
-            const foundPath = Object.keys(bddgenConf).find(key => generatedFile.startsWith(key));
-            if (foundPath) {
-                const foundConf = bddgenConf[foundPath];
-                return path_1.default.relative(process.cwd(), generatedFile
-                    .replaceAll(foundConf.outputDir, foundConf.featuresRoot)
-                    .replaceAll(".feature.spec.js", ".feature"));
-            }
+        if (this.foundConf) {
+            return path_1.default.relative(process.cwd(), generatedFile
+                .replaceAll(this.foundConf.outputDir, this.foundConf.featuresRoot)
+                .replaceAll(".feature.spec.js", ".feature"));
         }
         return;
     }
+    getTestSuiteName(featureFile) {
+        if (this.foundConf) {
+            return path_1.default.relative(this.foundConf.featuresRoot, path_1.default.join(process.cwd(), featureFile));
+        }
+        return featureFile;
+    }
     getCurrentRunningScenario(test, featureFile) {
         const counter = `[${test.parent.allTests().filter(test => test.results.length > 0).length}/${test.parent.allTests().length}]`;
         return `File ${featureFile} > Scenario ${counter} - ${test.title}`;
@@ -539,28 +567,6 @@ class UuvPlaywrightReporterHelper {
             return chalk_1.default.redBright(message);
         }
     }
-    logTeamCity(line) {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        if (process.env.enableTeamcityLogging) {
-            console.log(line);
-        }
-    }
-    teamcityFlowId(name) {
-        return "flowId='" + name.replaceAll("'", "|'") + "'";
-    }
-    teamcityFlowIdAndParentFlowId(name, parentName) {
-        return "flowId='" + name.replaceAll("'", "|'") + "' parent='" + parentName.replaceAll("'", "|'") + "'";
-    }
-    teamcityAddName(name) {
-        return "name='" + name.replaceAll("'", "|'") + "'";
-    }
-    teamcityAddDuration(result) {
-        return "duration='" + result.duration + "'";
-    }
-    teamcityAddCustomField(fieldName, value) {
-        return `${fieldName}='${value}'`;
-    }
     getTagsParameter() {
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore

package/dist/reporter/uuv-playwright-reporter.d.ts

@@ -1,6 +1,7 @@
 import { FullConfig, FullResult, Reporter, Suite, TestCase, TestError, TestResult, TestStep } from "@playwright/test/reporter";
 declare class UuvPlawrightReporter implements Reporter {
     private helper;
+    constructor();
     onBegin(config: FullConfig, suite: Suite): void;
     onError?(error: TestError): void;
     onTestBegin(test: TestCase, result: TestResult): void;

package/dist/reporter/uuv-playwright-reporter.js

@@ -5,13 +5,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const uuv_playwright_reporter_helper_1 = __importDefault(require("./uuv-playwright-reporter-helper"));
 const chalk_1 = __importDefault(require("chalk"));
+const runner_commons_1 = require("@uuv/runner-commons");
 class UuvPlawrightReporter {
     helper = new uuv_playwright_reporter_helper_1.default();
+    constructor() {
+        runner_commons_1.UUVListenerHelper.build();
+    }
     onBegin(config, suite) {
         const startTimestamp = this.helper.getTimestamp();
         // console.log(`Starting the run with ${suite.allTests().length} tests`);
         this.helper.createTestRunStartedEnvelope(config, suite, startTimestamp);
-        this.helper.logTeamCity("##teamcity[progressStart 'Running UUV Tests']");
+        runner_commons_1.UUVEventEmitter.getInstance().emitProgressStart();
         console.info(chalk_1.default.yellow(`Starting the run with ${suite.allTests().length} tests`));
     }
     onError(error) {
@@ -66,7 +70,7 @@ class UuvPlawrightReporter {
         else {
             console.error(chalk_1.default.red(`Tests executed with status: ${result.status}`));
         }
-        this.helper.logTeamCity("##teamcity[progressFinish 'Running UUV Tests']");
+        runner_commons_1.UUVEventEmitter.getInstance().emitProgressFinish();
     }
 }
 exports.default = UuvPlawrightReporter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uuv/playwright",
-  "version": "3.1.0",
+  "version": "3.2.1",
   "type": "commonjs",
   "author": "Louis Fredice NJAKO MOLOM (https://github.com/luifr10) & Stanley SERVICAL (https://github.com/stanlee974)",
   "description": "A solution to facilitate the writing and execution of E2E tests understandable by any human being using cucumber(BDD) and playwright",
@@ -44,7 +44,7 @@
   "dependencies": {
     "@cucumber/tag-expressions": "^6.0.0",
     "@playwright/test": "^1.44.1",
-    "@uuv/runner-commons": "2.16.4",
+    "@uuv/runner-commons": "2.17.0",
     "axe-core": "4.9.1",
     "axe-playwright": "2.0.1",
     "chalk-table": "^1.0.2",