@wdio/sauce-service 7.26.0 → 7.28.0

package/build/service.d.ts

@@ -34,11 +34,14 @@ export default class SauceService implements Services.ServiceInstance {
     beforeFeature(uri: unknown, feature: {
         name: string;
     }): Promise<unknown>;
+    /**
+     * Runs before a Cucumber Scenario.
+     * @param world world object containing information on pickle and test step
+     */
     beforeScenario(world: Frameworks.World): Promise<unknown> | undefined;
     beforeStep(step: Frameworks.PickleStep): Promise<unknown>;
     /**
-     *
-     * Runs before a Cucumber Scenario.
+     * Runs after a Cucumber Scenario.
      * @param world world object containing information on pickle and test step
      * @param result result object containing
      * @param result.passed   true if scenario has passed
@@ -66,5 +69,6 @@ export default class SauceService implements Services.ServiceInstance {
      * Update the running Sauce Labs Job with an annotation
      */
     setAnnotation(annotation: string): Promise<unknown>;
+    private _setJobName;
 }
 //# sourceMappingURL=service.d.ts.map

package/build/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AAGA,OAAkB,EAAoB,GAAG,EAAE,MAAM,WAAW,CAAA;AAE5D,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAC9E,OAAO,KAAK,EAAE,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAG9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAO5C,MAAM,CAAC,OAAO,OAAO,YAAa,YAAW,QAAQ,CAAC,eAAe;IAgB7D,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,OAAO;IAhBnB,OAAO,CAAC,QAAQ,CAAI;IACpB,OAAO,CAAC,oBAAoB,CAAI;IAChC,OAAO,CAAC,SAAS,CAAI;IACrB,OAAO,CAAC,iBAAiB,CAAO;IAChC,OAAO,CAAC,aAAa,CAAQ;IAE7B,OAAO,CAAC,QAAQ,CAAoB;IACpC,OAAO,CAAC,IAAI,CAAW;IACvB,OAAO,CAAC,QAAQ,CAAC,CAAgD;IACjE,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,WAAW,CAAC,CAAQ;IAC5B,OAAO,CAAC,IAAI,CAAK;gBAGb,OAAO,EAAE,kBAAkB,EACnB,aAAa,EAAE,YAAY,CAAC,gBAAgB,EAC5C,OAAO,EAAE,OAAO,CAAC,UAAU;IAOvC;;OAEG;IACH,aAAa,CAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM;IAkB3D,MAAM,CAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,kBAAkB,CAAC,OAAO,CAAC;IAazF,WAAW,CAAE,KAAK,EAAE,UAAU,CAAC,KAAK;IAepC,UAAU,CAAE,IAAI,EAAE,UAAU,CAAC,IAAI;IAqDvC,UAAU,CAAE,KAAK,EAAE,UAAU,CAAC,KAAK;IAMnC,OAAO,CAAC,eAAe;IAKvB,SAAS,CAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC,UAAU;IAyClF,SAAS,CAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,CAAC,UAAU;IAetE;;OAEG;IACG,aAAa,CAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;IAuB5D,cAAc,CAAE,KAAK,EAAE,UAAU,CAAC,KAAK;IAajC,UAAU,CAAE,IAAI,EAAE,UAAU,CAAC,UAAU;IAY7C;;;;;;;;OAQG;IACH,aAAa,CAAC,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,YAAY;IAOtE;;OAEG;IACG,KAAK,CAAE,MAAM,EAAE,MAAM;IAsC3B;;;;OAIG;YACW,WAAW;IAezB,QAAQ,CAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IAmB9C,SAAS,CAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,UAAQ,EAAE,WAAW,CAAC,EAAE,MAAM;IAMlG;;OAEG;IACH,OAAO,CAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,UAAQ,EAAE,WAAW,CAAC,EAAE,MAAM;IAgDvE;;OAEG;IACG,aAAa,CAAE,UAAU,EAAE,MAAM;CAkB1C"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AAGA,OAAkB,EAAoB,GAAG,EAAE,MAAM,WAAW,CAAA;AAE5D,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAC9E,OAAO,KAAK,EAAE,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAG9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAO5C,MAAM,CAAC,OAAO,OAAO,YAAa,YAAW,QAAQ,CAAC,eAAe;IAgB7D,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,OAAO;IAhBnB,OAAO,CAAC,QAAQ,CAAI;IACpB,OAAO,CAAC,oBAAoB,CAAI;IAChC,OAAO,CAAC,SAAS,CAAI;IACrB,OAAO,CAAC,iBAAiB,CAAO;IAChC,OAAO,CAAC,aAAa,CAAQ;IAE7B,OAAO,CAAC,QAAQ,CAAoB;IACpC,OAAO,CAAC,IAAI,CAAW;IACvB,OAAO,CAAC,QAAQ,CAAC,CAAgD;IACjE,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,WAAW,CAAC,CAAQ;IAC5B,OAAO,CAAC,IAAI,CAAK;gBAGb,OAAO,EAAE,kBAAkB,EACnB,aAAa,EAAE,YAAY,CAAC,gBAAgB,EAC5C,OAAO,EAAE,OAAO,CAAC,UAAU;IAOvC;;OAEG;IACH,aAAa,CAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM;IAkB3D,MAAM,CAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,kBAAkB,CAAC,OAAO,CAAC;IAazF,WAAW,CAAE,KAAK,EAAE,UAAU,CAAC,KAAK;IAepC,UAAU,CAAE,IAAI,EAAE,UAAU,CAAC,IAAI;IAwCvC,UAAU,CAAE,KAAK,EAAE,UAAU,CAAC,KAAK;IAMnC,OAAO,CAAC,eAAe;IAKvB,SAAS,CAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC,UAAU;IAyClF,SAAS,CAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,CAAC,UAAU;IAetE;;OAEG;IACG,aAAa,CAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;IAsB5D;;;OAGG;IACH,cAAc,CAAE,KAAK,EAAE,UAAU,CAAC,KAAK;IAajC,UAAU,CAAE,IAAI,EAAE,UAAU,CAAC,UAAU;IAY7C;;;;;;;OAOG;IACH,aAAa,CAAC,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,YAAY;IAOtE;;OAEG;IACG,KAAK,CAAE,MAAM,EAAE,MAAM;IAsC3B;;;;OAIG;YACW,WAAW;IAezB,QAAQ,CAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IAmB9C,SAAS,CAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,UAAQ,EAAE,WAAW,CAAC,EAAE,MAAM;IAMlG;;OAEG;IACH,OAAO,CAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,UAAQ,EAAE,WAAW,CAAC,EAAE,MAAM;IAgDvE;;OAEG;IACG,aAAa,CAAE,UAAU,EAAE,MAAM;YAmBzB,WAAW;CAa5B"}

package/build/service.js

@@ -58,14 +58,14 @@ class SauceService {
     async beforeSuite(suite) {
         this._suiteTitle = suite.title;
         /**
-         * Make sure we account for the cases where there is a long running `before` function for a
-         * suite or one that can fail so we set the default job name at the suite level
-         * Don't do this for Jasmine because the `suiteTitle` is `Jasmine__TopLevel__Suite` and the
-         * `fullName` is `null`, so no alternative
-         **/
+         * Set the default job name at the suite level to make sure we account
+         * for the cases where there is a long running `before` function for a
+         * suite or one that can fail.
+         * Don't do this for Jasmine because `suite.title` is `Jasmine__TopLevel__Suite`
+         * and `suite.fullTitle` is `undefined`, so no alternative to use for the job name.
+         */
         if (this._browser && !this._isRDC && !this._isJobNameSet && this._suiteTitle !== 'Jasmine__TopLevel__Suite') {
-            await this.setAnnotation('sauce:job-name=' + this._suiteTitle);
-            this._isJobNameSet = true;
+            await this._setJobName(this._suiteTitle);
         }
     }
     async beforeTest(test) {
@@ -82,16 +82,7 @@ class SauceService {
             this._suiteTitle = test.fullName.slice(0, test.fullName.indexOf(test.description || '') - 1);
         }
         if (this._browser && !this._isJobNameSet) {
-            let jobName = this._suiteTitle;
-            if (this._options.setJobName) {
-                jobName = this._options.setJobName(this._config, this._capabilities, this._suiteTitle);
-                await this.setAnnotation(`sauce:job-name=${jobName}`);
-                this._isJobNameSet = true;
-            }
-            if (!this._isJobNameSet) {
-                await this.setAnnotation(`sauce:job-name=${jobName}`);
-                this._isJobNameSet = true;
-            }
+            await this._setJobName(this._suiteTitle);
         }
         /**
          * Date:    20200714
@@ -175,8 +166,7 @@ class SauceService {
         }
         this._suiteTitle = feature.name;
         if (this._browser && !this._isJobNameSet) {
-            await this.setAnnotation(`sauce:job-name=${this._suiteTitle}`);
-            this._isJobNameSet = true;
+            await this._setJobName(this._suiteTitle);
         }
         /**
          * Date:    20200714
@@ -187,6 +177,10 @@ class SauceService {
         }
         return this.setAnnotation(`sauce:context=Feature: ${this._suiteTitle}`);
     }
+    /**
+     * Runs before a Cucumber Scenario.
+     * @param world world object containing information on pickle and test step
+     */
     beforeScenario(world) {
         /**
          * Date:    20200714
@@ -209,8 +203,7 @@ class SauceService {
         return this.setAnnotation(`sauce:context=--Step: ${keyword}${text}`);
     }
     /**
-     *
-     * Runs before a Cucumber Scenario.
+     * Runs after a Cucumber Scenario.
      * @param world world object containing information on pickle and test step
      * @param result result object containing
      * @param result.passed   true if scenario has passed
@@ -346,5 +339,15 @@ class SauceService {
         }
         return this._browser.execute(annotation);
     }
+    async _setJobName(suiteTitle) {
+        if (!suiteTitle)
+            return;
+        let jobName = suiteTitle;
+        if (this._options.setJobName) {
+            jobName = this._options.setJobName(this._config, this._capabilities, suiteTitle);
+        }
+        await this.setAnnotation(`sauce:job-name=${jobName}`);
+        this._isJobNameSet = true;
+    }
 }
 exports.default = SauceService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/sauce-service",
-  "version": "7.26.0",
+  "version": "7.28.0",
   "description": "WebdriverIO service that provides a better integration into Sauce Labs",
   "author": "Christian Bromann <mail@bromann.dev>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-sauce-service",
@@ -28,7 +28,7 @@
     "@wdio/types": "7.26.0",
     "@wdio/utils": "7.26.0",
     "saucelabs": "^7.1.3",
-    "webdriverio": "7.26.0"
+    "webdriverio": "7.28.0"
   },
   "peerDependencies": {
     "@wdio/cli": "^7.0.0"
@@ -37,5 +37,5 @@
     "access": "public"
   },
   "types": "./build/index.d.ts",
-  "gitHead": "573927a79dc0a2b9d9a9e19e7d1b8c1ff9fac308"
+  "gitHead": "09be73a21a3241d65c92269ff2ca7cec2d49b5fc"
 }