@wdio/junit-reporter 7.1.1 → 7.1.2

package/build/index.d.ts

@@ -21,6 +21,7 @@ declare class JunitReporter extends WDIOReporter {
     private _addCucumberFeatureToBuilder;
     private _addSuiteToBuilder;
     private _buildJunitXml;
+    private _buildOrderedReport;
     private _getStandardOutput;
     private _format;
 }

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,EAAa,MAAM,gBAAgB,CAAA;AAGjF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAEnD;;;;;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,MAAM,EAAE,WAAW;IAKhC,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,eAAe;IAkBvB,OAAO,CAAC,4BAA4B;IA8EpC,OAAO,CAAC,kBAAkB;IA6D1B,OAAO,CAAC,cAAc;IAoDtB,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,EAAa,MAAM,gBAAgB,CAAA;AAGjF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAEnD;;;;;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,MAAM,EAAE,WAAW;IAKhC,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,eAAe;IAkBvB,OAAO,CAAC,4BAA4B;IA+EpC,OAAO,CAAC,kBAAkB;IA8D1B,OAAO,CAAC,cAAc;IAyCtB,OAAO,CAAC,mBAAmB;IAmB3B,OAAO,CAAC,kBAAkB;IAoB1B,OAAO,CAAC,OAAO;CAGlB;AAED,eAAe,aAAa,CAAA"}

package/build/index.js

@@ -64,7 +64,7 @@ class JunitReporter extends reporter_1.default {
             const testName = this._prepareName(suite.title);
             const testCase = this._activeFeature.testCase()
                 .className(`${this._packageName}.${this._activeFeatureName}`)
-                .name(`${this._activeFeatureName}.${testName}`)
+                .name(`${testName}`)
                 .time(scenario._duration / 1000);
             if (this.options.addFileAttribute) {
                 testCase.file(filePath);
@@ -103,6 +103,7 @@ class JunitReporter extends reporter_1.default {
                     else {
                         testCase.error();
                     }
+                    testCase.failure();
                     isFailing = true;
                     stepEmoji = '❗';
                 }
@@ -158,6 +159,7 @@ class JunitReporter extends reporter_1.default {
                 else {
                     testCase.error();
                 }
+                testCase.failure();
             }
             const output = this._getStandardOutput(test);
             if (output)
@@ -194,6 +196,18 @@ 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);
+        }
+        return builder.build();
+    }
+    _buildOrderedReport(builder, runner, specFileName, type, isCucumberFrameworkRunner) {
         for (let suiteKey of Object.keys(this.suites)) {
             /**
              * ignore root before all
@@ -202,17 +216,15 @@ class JunitReporter extends reporter_1.default {
             if (suiteKey.match(/^"before all"/)) {
                 continue;
             }
-            // 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];
             const suite = this.suites[suiteKey];
-            if (isCucumberFrameworkRunner) {
+            if (isCucumberFrameworkRunner && suite.type === type) {
                 builder = this._addCucumberFeatureToBuilder(builder, runner, specFileName, suite);
             }
-            else {
+            else if (!isCucumberFrameworkRunner) {
                 builder = this._addSuiteToBuilder(builder, runner, specFileName, suite);
             }
         }
-        return builder.build();
+        return builder;
     }
     _getStandardOutput(test) {
         let standardOutput = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/junit-reporter",
-  "version": "7.1.1",
+  "version": "7.1.2",
   "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",
@@ -38,5 +38,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "39b675448969b8548e119a28a1ebc065ec3e6914"
+  "gitHead": "3dae2a78bc95f240f7c517b33ab3503b6aa3f3eb"
 }