@wdio/junit-reporter 9.32.0-alpha.6 → 9.32.0

package/build/index.d.ts

@@ -38,9 +38,27 @@ declare class JunitReporter extends WDIOReporter {
     private _addSuiteToBuilder;
     private _buildJunitXml;
     private _buildOrderedReport;
+    /**
+     * Emit filename-only suites that matched more than one grouped spec. They
+     * still belong in the report (issue #13052) but must not inherit the first
+     * spec's full path.
+     */
+    private _addAmbiguousBasenameSuites;
     private _getStandardOutput;
     private _getCommandStandardOutput;
     private _format;
+    private _toFilePath;
+    private _isBasenameOnly;
+    private _fileNamesEqual;
+    private _matchingSpecCount;
+    /**
+     * Decide whether a suite can be tied to a specific runner spec.
+     * - unique: full path match, or a filename-only Jasmine suite whose
+     *   basename appears once in runner.specs
+     * - ambiguous: filename-only suite that matches multiple grouped specs
+     * - none: not the same file
+     */
+    private _suiteFileAssociation;
     private _sameFileName;
 }
 export * from './common/api.js';

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAc,SAAS,EAAE,MAAM,gBAAgB,CAAA;AACxE,OAAO,YAAY,MAAM,gBAAgB,CAAA;AAGzC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAmBtD;;;;;GAKG;AACH,cAAM,aAAc,SAAQ,YAAY;IAajB,OAAO,EAAE,oBAAoB;IAZhD,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,YAAY,CAAC,CAAQ;IAC7B,OAAO,CAAC,gBAAgB,CAAC,CAAQ;IACjC,OAAO,CAAC,cAAc,CAAC,CAAQ;IAC/B,OAAO,CAAC,cAAc,CAAC,CAAK;IAC5B,OAAO,CAAC,kBAAkB,CAAC,CAAK;IAChC,OAAO,CAAC,4BAA4B,CAAwD;IAC5F,OAAO,CAAC,YAAY,CAAC,CAAW;IAChC,OAAO,CAAC,oBAAoB,CAAU;IACtC,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,UAAU,CAAS;gBAER,OAAO,EAAE,oBAAoB;IAiBhD,WAAW,CAAC,SAAS,EAAE,SAAS;IAIhC,WAAW,CAAC,IAAI,EAAE,SAAS;IAU3B,WAAW,CAAC,MAAM,EAAE,WAAW;IAK/B,OAAO,CAAC,yBAAyB;IAMjC,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,eAAe;IAkBvB;;;;OAIG;IACH,OAAO,CAAC,cAAc;IA+CtB,OAAO,CAAC,4BAA4B;IA6GpC,OAAO,CAAC,kBAAkB;IAqC1B,OAAO,CAAC,cAAc;IA2CtB,OAAO,CAAC,mBAAmB;IAwC3B,OAAO,CAAC,kBAAkB;IAkB1B,OAAO,CAAC,yBAAyB;IAoBjC,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,aAAa;CAgBxB;AAED,cAAc,iBAAiB,CAAA;AAC/B,eAAe,aAAa,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,WAAW,EAAc,SAAS,EAAE,MAAM,gBAAgB,CAAA;AACxE,OAAO,YAAY,MAAM,gBAAgB,CAAA;AAGzC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAmBtD;;;;;GAKG;AACH,cAAM,aAAc,SAAQ,YAAY;IAajB,OAAO,EAAE,oBAAoB;IAZhD,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,YAAY,CAAC,CAAQ;IAC7B,OAAO,CAAC,gBAAgB,CAAC,CAAQ;IACjC,OAAO,CAAC,cAAc,CAAC,CAAQ;IAC/B,OAAO,CAAC,cAAc,CAAC,CAAK;IAC5B,OAAO,CAAC,kBAAkB,CAAC,CAAK;IAChC,OAAO,CAAC,4BAA4B,CAAwD;IAC5F,OAAO,CAAC,YAAY,CAAC,CAAW;IAChC,OAAO,CAAC,oBAAoB,CAAU;IACtC,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,UAAU,CAAS;gBAER,OAAO,EAAE,oBAAoB;IAiBhD,WAAW,CAAC,SAAS,EAAE,SAAS;IAIhC,WAAW,CAAC,IAAI,EAAE,SAAS;IAU3B,WAAW,CAAC,MAAM,EAAE,WAAW;IAK/B,OAAO,CAAC,yBAAyB;IAMjC,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,eAAe;IAkBvB;;;;OAIG;IACH,OAAO,CAAC,cAAc;IA+CtB,OAAO,CAAC,4BAA4B;IA6GpC,OAAO,CAAC,kBAAkB;IAqC1B,OAAO,CAAC,cAAc;IAuDtB,OAAO,CAAC,mBAAmB;IA6D3B;;;;OAIG;IACH,OAAO,CAAC,2BAA2B;IAkCnC,OAAO,CAAC,kBAAkB;IAkB1B,OAAO,CAAC,yBAAyB;IAoBjC,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,kBAAkB;IAO1B;;;;;;OAMG;IACH,OAAO,CAAC,qBAAqB;IAoB7B,OAAO,CAAC,aAAa;CAuBxB;AAED,cAAc,iBAAiB,CAAA;AAC/B,eAAe,aAAa,CAAA"}

package/build/index.js

@@ -1,4 +1,5 @@
 // src/index.ts
+import path from "node:path";
 import url from "node:url";
 import os from "node:os";
 import WDIOReporter from "@wdio/reporter";
@@ -318,17 +319,19 @@ ${stepsOutput}
       this._suiteTitleLabel = "suiteName";
       this._fileNameLabel = "file";
     }
+    const assignedSuiteKeys = /* @__PURE__ */ new Set();
     runner.specs.forEach((specFileName) => {
       if (isCucumberFrameworkRunner) {
-        this._buildOrderedReport(builder, runner, specFileName, "feature", isCucumberFrameworkRunner);
-        this._buildOrderedReport(builder, runner, specFileName, "scenario", isCucumberFrameworkRunner);
+        this._buildOrderedReport(builder, runner, specFileName, "feature", isCucumberFrameworkRunner, assignedSuiteKeys);
+        this._buildOrderedReport(builder, runner, specFileName, "scenario", isCucumberFrameworkRunner, assignedSuiteKeys);
       } else {
-        this._buildOrderedReport(builder, runner, specFileName, "", isCucumberFrameworkRunner);
+        this._buildOrderedReport(builder, runner, specFileName, "", isCucumberFrameworkRunner, assignedSuiteKeys);
       }
     });
+    this._addAmbiguousBasenameSuites(builder, runner, isCucumberFrameworkRunner, assignedSuiteKeys);
     return builder.build();
   }
-  _buildOrderedReport(builder, runner, specFileName, type, isCucumberFrameworkRunner) {
+  _buildOrderedReport(builder, runner, specFileName, type, isCucumberFrameworkRunner, assignedSuiteKeys = /* @__PURE__ */ new Set()) {
     const suiteKeys = Object.keys(this.suites);
     if (suiteKeys.length === 0) {
       if (!isCucumberFrameworkRunner || isCucumberFrameworkRunner && type === "feature") {
@@ -343,16 +346,48 @@ ${stepsOutput}
       if (suiteKey.match(/^"before all"/)) {
         continue;
       }
+      if (assignedSuiteKeys.has(suiteKey)) {
+        continue;
+      }
       const suite = this.suites[suiteKey];
-      const sameSpecFileName = this._sameFileName(specFileName, suite.file);
-      if (isCucumberFrameworkRunner && suite.type === type && sameSpecFileName) {
+      if (this._suiteFileAssociation(specFileName, suite.file, runner?.specs) !== "unique") {
+        continue;
+      }
+      if (isCucumberFrameworkRunner && suite.type === type) {
+        assignedSuiteKeys.add(suiteKey);
         builder = this._addCucumberFeatureToBuilder(builder, runner, specFileName, suite);
-      } else if (!isCucumberFrameworkRunner && sameSpecFileName) {
+      } else if (!isCucumberFrameworkRunner) {
+        assignedSuiteKeys.add(suiteKey);
         builder = this._addSuiteToBuilder(builder, runner, specFileName, suite);
       }
     }
     return builder;
   }
+  /**
+   * Emit filename-only suites that matched more than one grouped spec. They
+   * still belong in the report (issue #13052) but must not inherit the first
+   * spec's full path.
+   */
+  _addAmbiguousBasenameSuites(builder, runner, isCucumberFrameworkRunner, assignedSuiteKeys) {
+    const types = isCucumberFrameworkRunner ? ["feature", "scenario"] : [""];
+    for (const type of types) {
+      for (const suiteKey of Object.keys(this.suites)) {
+        if (suiteKey.match(/^"before all"/) || assignedSuiteKeys.has(suiteKey)) {
+          continue;
+        }
+        const suite = this.suites[suiteKey];
+        if (isCucumberFrameworkRunner && suite.type !== type) {
+          continue;
+        }
+        if (!suite.file || !this._isBasenameOnly(this._toFilePath(suite.file)) || this._matchingSpecCount(suite.file, runner.specs) <= 1) {
+          continue;
+        }
+        assignedSuiteKeys.add(suiteKey);
+        builder = isCucumberFrameworkRunner ? this._addCucumberFeatureToBuilder(builder, runner, suite.file, suite) : this._addSuiteToBuilder(builder, runner, suite.file, suite);
+      }
+    }
+    return builder;
+  }
   _getStandardOutput(test) {
     let consoleOutput = "";
     if (this._addWorkerLogs) {
@@ -388,6 +423,39 @@ ${stepsOutput}
   _format(val) {
     return JSON.stringify(limit(val));
   }
+  _toFilePath(file) {
+    return file.startsWith("file://") ? url.fileURLToPath(file) : file;
+  }
+  _isBasenameOnly(file) {
+    return !file.includes("/") && !file.includes("\\");
+  }
+  _fileNamesEqual(file1, file2) {
+    return file1.localeCompare(file2, void 0, { sensitivity: this._isWindows ? "accent" : "variant" }) === 0;
+  }
+  _matchingSpecCount(suiteFile, runnerSpecs) {
+    const suiteBase = path.basename(this._toFilePath(suiteFile));
+    return runnerSpecs.filter((spec) => this._fileNamesEqual(path.basename(this._toFilePath(spec)), suiteBase)).length;
+  }
+  /**
+   * Decide whether a suite can be tied to a specific runner spec.
+   * - unique: full path match, or a filename-only Jasmine suite whose
+   *   basename appears once in runner.specs
+   * - ambiguous: filename-only suite that matches multiple grouped specs
+   * - none: not the same file
+   */
+  _suiteFileAssociation(specFileName, suiteFile, runnerSpecs = []) {
+    if (!this._sameFileName(specFileName, suiteFile)) {
+      return "none";
+    }
+    if (!suiteFile) {
+      return "unique";
+    }
+    const suitePath = this._toFilePath(suiteFile);
+    if (!this._isBasenameOnly(suitePath)) {
+      return "unique";
+    }
+    return this._matchingSpecCount(suiteFile, runnerSpecs) > 1 ? "ambiguous" : "unique";
+  }
   _sameFileName(file1, file2) {
     if (!file1 && !file2) {
       return true;
@@ -395,9 +463,13 @@ ${stepsOutput}
     if (!file1 || !file2) {
       return false;
     }
-    file1 = file1.startsWith("file://") ? url.fileURLToPath(file1) : file1;
-    file2 = file2.startsWith("file://") ? url.fileURLToPath(file2) : file2;
-    return file1.localeCompare(file2, void 0, { sensitivity: this._isWindows ? "accent" : "variant" }) === 0;
+    file1 = this._toFilePath(file1);
+    file2 = this._toFilePath(file2);
+    if (this._isBasenameOnly(file1) || this._isBasenameOnly(file2)) {
+      file1 = path.basename(file1);
+      file2 = path.basename(file2);
+    }
+    return this._fileNamesEqual(file1, file2);
   }
 };
 var index_default = JunitReporter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/junit-reporter",
-  "version": "9.32.0-alpha.6+3d8818a67",
+  "version": "9.32.0",
   "description": "A WebdriverIO reporter that creates Jenkins compatible XML based JUnit reports",
   "author": "Christian Bromann <mail@bromann.dev>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-junit-reporter",
@@ -35,8 +35,8 @@
   },
   "typeScriptVersion": "3.8.3",
   "dependencies": {
-    "@wdio/reporter": "9.32.0-alpha.6+3d8818a67",
-    "@wdio/types": "9.32.0-alpha.6+3d8818a67",
+    "@wdio/reporter": "9.32.0",
+    "@wdio/types": "9.32.0",
     "json-stringify-safe": "^5.0.1",
     "junit-report-builder": "^5.1.1"
   },
@@ -46,5 +46,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3d8818a67404f0b5d4b81eda877ffad1f4d317c0"
+  "gitHead": "5c2a318d9a5e8424a2f2de95df9374b89bda7936"
 }