@wdio/junit-reporter 7.16.13 → 7.17.3

package/README.md

@@ -179,7 +179,25 @@ outputFileFormat: function (options) {
 Gives the ability to provide custom regex for formatting test suite name (e.g. in output xml ).
 
 Type: `Regex`,<br />
-Default: `/[^a-z0-9]+/`
+Default: `/[^a-zA-Z0-9@]+/`
+
+```js
+// wdio.conf.js
+module.exports = {
+    // ...
+    reporters: [
+        'dot',
+        ['junit', {
+            outputDir: './',
+            suiteNameFormat: /[^a-zA-Z0-9@]+/
+            outputFileFormat: function(options) { // optional
+                return `results-${options.cid}.${options.capabilities}.xml`
+            }
+        }]
+    ],
+    // ...
+};
+```
 
 ### addFileAttribute
 

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,YAAY,EAAE,EAAc,WAAW,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAGjF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAOnD;;;;;GAKG;AACH,cAAM,aAAc,SAAQ,YAAY;IAQhB,OAAO,EAAE,oBAAoB;IAPjD,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;gBAEZ,OAAO,EAAE,oBAAoB;IAOjD,WAAW,CAAE,SAAS,EAAE,SAAS;IAIjC,WAAW,CAAE,MAAM,EAAE,WAAW;IAKhC,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,eAAe;IAkBvB,OAAO,CAAC,4BAA4B;IAmFpC,OAAO,CAAC,kBAAkB;IAyE1B,OAAO,CAAC,cAAc;IAyCtB,OAAO,CAAC,mBAAmB;IAmB3B,OAAO,CAAC,kBAAkB;IAoB1B,OAAO,CAAC,OAAO;CAGlB;AAED,eAAe,aAAa,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,YAAY,EAAE,EAAc,WAAW,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAGjF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAOnD;;;;;GAKG;AACH,cAAM,aAAc,SAAQ,YAAY;IAQhB,OAAO,EAAE,oBAAoB;IAPjD,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;gBAEZ,OAAO,EAAE,oBAAoB;IAOjD,WAAW,CAAE,SAAS,EAAE,SAAS;IAIjC,WAAW,CAAE,MAAM,EAAE,WAAW;IAKhC,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,eAAe;IAkBvB,OAAO,CAAC,4BAA4B;IA6EpC,OAAO,CAAC,kBAAkB;IAyE1B,OAAO,CAAC,cAAc;IAuCtB,OAAO,CAAC,mBAAmB;IAmB3B,OAAO,CAAC,kBAAkB;IAoB1B,OAAO,CAAC,OAAO;CAGlB;AAED,eAAe,aAAa,CAAA"}

package/build/index.js

@@ -215,15 +215,15 @@ class JunitReporter extends reporter_1.default {
             this._suiteTitleLabel = 'suiteName';
             this._fileNameLabel = 'file';
         }
-        // there should only be one spec file per runner so we can safely take the first element of the array
-        const specFileName = runner.specs[0];
-        if (isCucumberFrameworkRunner) {
-            this._buildOrderedReport(builder, runner, specFileName, 'feature', isCucumberFrameworkRunner);
-            this._buildOrderedReport(builder, runner, specFileName, 'scenario', isCucumberFrameworkRunner);
-        }
-        else {
-            this._buildOrderedReport(builder, runner, specFileName, '', isCucumberFrameworkRunner);
-        }
+        runner.specs.forEach((specFileName) => {
+            if (isCucumberFrameworkRunner) {
+                this._buildOrderedReport(builder, runner, specFileName, 'feature', isCucumberFrameworkRunner);
+                this._buildOrderedReport(builder, runner, specFileName, 'scenario', isCucumberFrameworkRunner);
+            }
+            else {
+                this._buildOrderedReport(builder, runner, specFileName, '', isCucumberFrameworkRunner);
+            }
+        });
         return builder.build();
     }
     _buildOrderedReport(builder, runner, specFileName, type, isCucumberFrameworkRunner) {
@@ -236,7 +236,7 @@ class JunitReporter extends reporter_1.default {
                 continue;
             }
             const suite = this.suites[suiteKey];
-            if (isCucumberFrameworkRunner && suite.type === type) {
+            if (isCucumberFrameworkRunner && suite.type === type && specFileName === suite.file) {
                 builder = this._addCucumberFeatureToBuilder(builder, runner, specFileName, suite);
             }
             else if (!isCucumberFrameworkRunner) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/junit-reporter",
-  "version": "7.16.13",
+  "version": "7.17.3",
   "description": "A WebdriverIO reporter that creates Jenkins compatible XML based JUnit reports",
   "author": "Christian Bromann <christian@saucelabs.com>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-junit-reporter",
@@ -26,8 +26,8 @@
   "dependencies": {
     "@types/json-stringify-safe": "^5.0.0",
     "@types/validator": "^13.1.3",
-    "@wdio/reporter": "7.16.13",
-    "@wdio/types": "7.16.13",
+    "@wdio/reporter": "7.17.3",
+    "@wdio/types": "7.17.3",
     "json-stringify-safe": "^5.0.1",
     "junit-report-builder": "^3.0.0",
     "validator": "^13.0.0"
@@ -38,5 +38,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a0079123fa5207523e8386e6e5100df0bf2f84ef"
+  "gitHead": "2bcb589dbdd10ca181f301a269b4dd158faab257"
 }