@wdio/sauce-service 7.16.8 → 7.16.12

package/build/service.d.ts

@@ -12,9 +12,8 @@ export default class SauceService implements Services.ServiceInstance {
     private _isJobNameSet;
     private _options;
     private _api;
-    private _isLegacyRDC;
     private _browser?;
-    private _isUP?;
+    private _isRDC?;
     private _suiteTitle?;
     private _cid;
     constructor(options: SauceServiceConfig, _capabilities: Capabilities.RemoteCapability, _config: Options.Testrunner);
@@ -23,8 +22,8 @@ export default class SauceService implements Services.ServiceInstance {
      */
     beforeSession(_: never, __: never, ___: never, cid: string): void;
     before(caps: unknown, specs: string[], browser: Browser<'async'> | MultiRemoteBrowser<'async'>): void;
-    beforeSuite(suite: Frameworks.Suite): void;
-    beforeTest(test: Frameworks.Test): void;
+    beforeSuite(suite: Frameworks.Suite): Promise<void>;
+    beforeTest(test: Frameworks.Test): Promise<unknown>;
     afterSuite(suite: Frameworks.Suite): void;
     private _reportErrorLog;
     afterTest(test: Frameworks.Test, context: unknown, results: Frameworks.TestResult): void;
@@ -34,8 +33,9 @@ export default class SauceService implements Services.ServiceInstance {
      */
     beforeFeature(uri: unknown, feature: {
         name: string;
-    }): void;
-    beforeScenario(world: Frameworks.World): void;
+    }): Promise<unknown>;
+    beforeScenario(world: Frameworks.World): Promise<unknown> | undefined;
+    beforeStep(step: Frameworks.PickleStep): Promise<unknown>;
     /**
      *
      * Runs before a Cucumber Scenario.
@@ -63,10 +63,8 @@ export default class SauceService implements Services.ServiceInstance {
      */
     getBody(failures: number, calledOnReload?: boolean, browserName?: string): Partial<Job>;
     /**
-     * Update the UP with the JS-executor
-     * @param {number} failures
-     * @returns {*}
+     * Update the running Sauce Labs Job with an annotation
      */
-    updateUP(failures: number): Promise<unknown> | undefined;
+    setAnnotation(annotation: string): Promise<unknown>;
 }
 //# 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;IAiB7D,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,OAAO;IAjBnB,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,YAAY,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,CAAgD;IACjE,OAAO,CAAC,KAAK,CAAC,CAAS;IACvB,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;IAQvC;;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;IAa/F,WAAW,CAAE,KAAK,EAAE,UAAU,CAAC,KAAK;IAYpC,UAAU,CAAE,IAAI,EAAE,UAAU,CAAC,IAAI;IAiDjC,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;IACH,aAAa,CAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;IAuBtD,cAAc,CAAE,KAAK,EAAE,UAAU,CAAC,KAAK;IAavC;;;;;;;;OAQG;IACH,aAAa,CAAC,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,YAAY;IAOtE;;OAEG;IACG,KAAK,CAAE,MAAM,EAAE,MAAM;IA8B3B;;;;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;IAYlG;;OAEG;IACH,OAAO,CAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,UAAQ,EAAE,WAAW,CAAC,EAAE,MAAM;IAgDvE;;;;OAIG;IACH,QAAQ,CAAE,QAAQ,EAAE,MAAM;CAM7B"}
+{"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;IAK7C;;;;;;;;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"}

package/build/service.js

@@ -23,7 +23,6 @@ class SauceService {
         this._cid = '';
         this._options = { ...constants_1.DEFAULT_OPTIONS, ...options };
         this._api = new saucelabs_1.default(this._config);
-        this._isLegacyRDC = 'testobject_api_key' in this._capabilities;
         this._maxErrorStackLength = this._options.maxErrorStackLength || this._maxErrorStackLength;
     }
     /**
@@ -34,13 +33,13 @@ class SauceService {
         /**
          * if no user and key is specified even though a sauce service was
          * provided set user and key with values so that the session request
-         * will fail (not for RDC tho due to other auth mechansim)
+         * will fail
          */
-        if (!this._isLegacyRDC && !this._config.user) {
+        if (!this._config.user) {
             this._isServiceEnabled = false;
             this._config.user = 'unknown_user';
         }
-        if (!this._isLegacyRDC && !this._config.key) {
+        if (!this._config.key) {
             this._isServiceEnabled = false;
             this._config.key = 'unknown_key';
         }
@@ -54,20 +53,23 @@ class SauceService {
         // `this._browser.capabilities` returns the process data from Sauce which is without
         // the postfix
         const capabilities = this._browser.requestedCapabilities || {};
-        this._isUP = (0, utils_1.isUnifiedPlatform)(capabilities);
+        this._isRDC = (0, utils_1.isRDC)(capabilities);
     }
-    beforeSuite(suite) {
+    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
          **/
-        if (this._browser && !this._isUP && !this._isJobNameSet) {
-            this._browser.execute('sauce:job-name=' + this._suiteTitle);
+        if (this._browser && !this._isRDC && !this._isJobNameSet && this._suiteTitle !== 'Jasmine__TopLevel__Suite') {
+            await this.setAnnotation('sauce:job-name=' + this._suiteTitle);
+            this._isJobNameSet = true;
         }
     }
-    beforeTest(test) {
-        if (!this._isServiceEnabled || this._isLegacyRDC || !this._browser) {
+    async beforeTest(test) {
+        if (!this._isServiceEnabled || !this._browser) {
             return;
         }
         /**
@@ -80,17 +82,22 @@ 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) {
-                let jobName = this._options.setJobName(this._config, this._capabilities, this._suiteTitle);
-                this._browser.execute(`sauce:job-name=${jobName}`);
+                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;
             }
-            this._isJobNameSet = true;
         }
         /**
          * Date:    20200714
          * Remark:  Sauce Unified Platform doesn't support updating the context yet.
          */
-        if (this._isUP) {
+        if (this._isRDC) {
             return;
         }
         const fullTitle = (
@@ -102,7 +109,7 @@ class SauceService {
              * Mocha
              */
             `${test.parent} - ${test.title}`);
-        this._browser.execute('sauce:context=' + fullTitle);
+        return this.setAnnotation(`sauce:context=${fullTitle}`);
     }
     afterSuite(suite) {
         if (Object.prototype.hasOwnProperty.call(suite, 'error')) {
@@ -111,7 +118,7 @@ class SauceService {
     }
     _reportErrorLog(error) {
         const lines = (error.stack || '').split(/\r?\n/).slice(0, this._maxErrorStackLength);
-        lines.forEach((line) => this._browser.execute(`sauce:context=${line.replace((0, utils_1.ansiRegex)(), '')}`));
+        lines.forEach((line) => this.setAnnotation(`sauce:context=${line.replace((0, utils_1.ansiRegex)(), '')}`));
     }
     afterTest(test, context, results) {
         /**
@@ -119,7 +126,7 @@ class SauceService {
          * This should not be done for UP because it's not supported yet and
          * should be removed when UP supports `sauce:context`
          */
-        if (results.error && results.error.stack && !this._isUP) {
+        if (results.error && results.error.stack && !this._isRDC) {
             this._reportErrorLog(results.error);
         }
         /**
@@ -152,7 +159,7 @@ class SauceService {
          * This should not be done for UP because it's not supported yet and
          * should be removed when UP supports `sauce:context`
          */
-        if (results.error && !this._isUP) {
+        if (results.error && !this._isRDC) {
             this._reportErrorLog(results.error);
         }
         if (!results.passed) {
@@ -162,34 +169,38 @@ class SauceService {
     /**
      * For CucumberJS
      */
-    beforeFeature(uri, feature) {
-        if (!this._isServiceEnabled || this._isLegacyRDC || !this._browser) {
+    async beforeFeature(uri, feature) {
+        if (!this._isServiceEnabled || !this._browser) {
             return;
         }
         this._suiteTitle = feature.name;
         if (this._browser && !this._isJobNameSet) {
-            this._browser.execute('sauce:job-name=' + this._suiteTitle);
+            await this.setAnnotation(`sauce:job-name=${this._suiteTitle}`);
             this._isJobNameSet = true;
         }
         /**
          * Date:    20200714
          * Remark:  Sauce Unified Platform doesn't support updating the context yet.
          */
-        if (this._isUP) {
+        if (this._isRDC) {
             return;
         }
-        this._browser.execute('sauce:context=Feature: ' + this._suiteTitle);
+        return this.setAnnotation(`sauce:context=Feature: ${this._suiteTitle}`);
     }
     beforeScenario(world) {
         /**
          * Date:    20200714
          * Remark:  Sauce Unified Platform doesn't support updating the context yet.
          */
-        if (!this._isServiceEnabled || this._isLegacyRDC || this._isUP || !this._browser) {
+        if (!this._isServiceEnabled || this._isRDC || !this._browser) {
             return;
         }
         const scenarioName = world.pickle.name || 'unknown scenario';
-        this._browser.execute('sauce:context=Scenario: ' + scenarioName);
+        return this.setAnnotation(`sauce:context=-Scenario: ${scenarioName}`);
+    }
+    async beforeStep(step) {
+        const { keyword, text } = step;
+        return this.setAnnotation(`sauce:context=--Step: ${keyword}${text}`);
     }
     /**
      *
@@ -210,7 +221,7 @@ class SauceService {
      * update Sauce Labs job
      */
     async after(result) {
-        if (!this._browser || (!this._isServiceEnabled && !this._isLegacyRDC)) {
+        if (!this._browser || !this._isServiceEnabled) {
             return;
         }
         let failures = this._failures;
@@ -225,13 +236,21 @@ class SauceService {
         if (!this._browser.isMultiremote) {
             await this._uploadLogs(this._browser.sessionId);
             log.info(`Update job with sessionId ${this._browser.sessionId}, ${status}`);
-            return this._isUP ? this.updateUP(failures) : this.updateJob(this._browser.sessionId, failures);
+            return this._isRDC ?
+                this.setAnnotation(`sauce:job-result=${failures === 0}`) :
+                this.updateJob(this._browser.sessionId, failures);
         }
-        const mulitremoteBrowser = this._browser;
+        const multiRemoteBrowser = this._browser;
         return Promise.all(Object.keys(this._capabilities).map(async (browserName) => {
-            await this._uploadLogs(mulitremoteBrowser[browserName].sessionId);
-            log.info(`Update multiremote job for browser "${browserName}" and sessionId ${mulitremoteBrowser[browserName].sessionId}, ${status}`);
-            return this._isUP ? this.updateUP(failures) : this.updateJob(mulitremoteBrowser[browserName].sessionId, failures, false, browserName);
+            const isMultiRemoteRDC = (0, utils_1.isRDC)(multiRemoteBrowser[browserName].capabilities);
+            log.info(`Update multiRemote job for browser "${browserName}" and sessionId ${multiRemoteBrowser[browserName].sessionId}, ${status}`);
+            // Sauce Unified Platform (RDC) can not be updated with an API.
+            // The logs can also not be uploaded
+            if (isMultiRemoteRDC) {
+                return this.setAnnotation(`sauce:job-result=${failures === 0}`);
+            }
+            await this._uploadLogs(multiRemoteBrowser[browserName].sessionId);
+            return this.updateJob(multiRemoteBrowser[browserName].sessionId, failures, false, browserName);
         }));
     }
     /**
@@ -249,7 +268,7 @@ class SauceService {
         return this._api.uploadJobAssets(jobId, { files: files.map((file) => path_1.default.join(this._config.outputDir, file)) }).catch((err) => log.error(`Couldn't upload log files to Sauce Labs: ${err.message}`));
     }
     onReload(oldSessionId, newSessionId) {
-        if (!this._browser || (!this._isServiceEnabled && !this._isLegacyRDC)) {
+        if (!this._browser || !this._isServiceEnabled) {
             return;
         }
         const status = 'status: ' + (this._failures > 0 ? 'failing' : 'passing');
@@ -263,11 +282,6 @@ class SauceService {
         return this.updateJob(oldSessionId, this._failures, true, browserName);
     }
     async updateJob(sessionId, failures, calledOnReload = false, browserName) {
-        if (this._isLegacyRDC) {
-            await this._api.updateTest(sessionId, { passed: failures === 0 });
-            this._failures = 0;
-            return;
-        }
         const body = this.getBody(failures, calledOnReload, browserName);
         await this._api.updateJob(this._config.user, sessionId, body);
         this._failures = 0;
@@ -309,15 +323,22 @@ class SauceService {
         return body;
     }
     /**
-     * Update the UP with the JS-executor
-     * @param {number} failures
-     * @returns {*}
+     * Update the running Sauce Labs Job with an annotation
      */
-    updateUP(failures) {
+    async setAnnotation(annotation) {
         if (!this._browser) {
             return;
         }
-        return this._browser.execute(`sauce:job-result=${failures === 0}`);
+        if (this._browser.isMultiremote) {
+            const multiRemoteBrowser = this._browser;
+            return Promise.all(Object.keys(this._capabilities).map(async (browserName) => {
+                const isMultiRemoteRDC = (0, utils_1.isRDC)(multiRemoteBrowser[browserName].capabilities);
+                if ((isMultiRemoteRDC && !annotation.includes('sauce:context')) || !isMultiRemoteRDC) {
+                    return this._browser.execute(annotation);
+                }
+            }));
+        }
+        return this._browser.execute(annotation);
     }
 }
 exports.default = SauceService;

package/build/utils.d.ts

@@ -1,8 +1,8 @@
 import type { Capabilities } from '@wdio/types';
 /**
- * Determine if the current instance is a Unified Platform instance. UP tests are Real Device tests
+ * Determine if the current instance is a RDC instance. RDC tests are Real Device tests
  * that can be started with different sets of capabilities. A deviceName is not mandatory, the only mandatory cap for
- * UP is the platformName. Downside of the platformName is that is can also be EMUSIM. EMUSIM can be distinguished by
+ * RDC is the platformName. Downside of the platformName is that is can also be EMUSIM. EMUSIM can be distinguished by
  * the `Emulator|Simulator` postfix
  *
  * @param {object} caps
@@ -41,7 +41,7 @@ import type { Capabilities } from '@wdio/types';
  *  deviceContextId: ''
  * }
  */
-export declare function isUnifiedPlatform(caps: Capabilities.DesiredCapabilities): boolean;
+export declare function isRDC(caps: Capabilities.DesiredCapabilities): boolean;
 /**
  * Determine if this is an EMUSIM session
  * @param {object} caps

package/build/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAI/C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,wBAAgB,iBAAiB,CAAE,IAAI,EAAE,YAAY,CAAC,mBAAmB,WAMxE;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,CAAE,IAAI,EAAE,YAAY,CAAC,mBAAmB,WAM/D;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,gBAAgB,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,gBACpD,aAAa,mBAAmB,UA2BvD;AAED,wBAAgB,SAAS,WAOxB"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAI/C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,wBAAgB,KAAK,CAAE,IAAI,EAAE,YAAY,CAAC,mBAAmB,WAM5D;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,CAAE,IAAI,EAAE,YAAY,CAAC,mBAAmB,WAM/D;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,gBAAgB,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,gBACpD,aAAa,mBAAmB,UA2BvD;AAED,wBAAgB,SAAS,WAOxB"}

package/build/utils.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ansiRegex = exports.makeCapabilityFactory = exports.isEmuSim = exports.isUnifiedPlatform = void 0;
-const utils_1 = require("@wdio/utils");
+exports.ansiRegex = exports.makeCapabilityFactory = exports.isEmuSim = exports.isRDC = void 0;
 /**
- * Determine if the current instance is a Unified Platform instance. UP tests are Real Device tests
+ * Determine if the current instance is a RDC instance. RDC tests are Real Device tests
  * that can be started with different sets of capabilities. A deviceName is not mandatory, the only mandatory cap for
- * UP is the platformName. Downside of the platformName is that is can also be EMUSIM. EMUSIM can be distinguished by
+ * RDC is the platformName. Downside of the platformName is that is can also be EMUSIM. EMUSIM can be distinguished by
  * the `Emulator|Simulator` postfix
  *
  * @param {object} caps
@@ -44,13 +43,13 @@ const utils_1 = require("@wdio/utils");
  *  deviceContextId: ''
  * }
  */
-function isUnifiedPlatform(caps) {
+function isRDC(caps) {
     const { 'appium:deviceName': appiumDeviceName = '', deviceName = '', platformName = '' } = caps;
     const name = appiumDeviceName || deviceName;
     // If the string contains `simulator` or `emulator` it's an EMU/SIM session
     return !name.match(/(simulator)|(emulator)/gi) && !!platformName.match(/(ios)|(android)/gi);
 }
-exports.isUnifiedPlatform = isUnifiedPlatform;
+exports.isRDC = isRDC;
 /**
  * Determine if this is an EMUSIM session
  * @param {object} caps
@@ -70,21 +69,21 @@ exports.isEmuSim = isEmuSim;
  */
 function makeCapabilityFactory(tunnelIdentifier, options) {
     return (capability) => {
-        // If the capability appears to be using the legacy JSON Wire Protocol
-        // we need to make sure the key 'sauce:options' is not present
-        const isLegacy = Boolean((capability.platform || capability.version) &&
-            !(0, utils_1.isW3C)(capability) &&
-            !capability['sauce:options']);
-        // Unified Platform and EMUSIM is currently not W3C ready, so the tunnel needs to be on the cap level
-        if (!capability['sauce:options'] && !isLegacy && !isUnifiedPlatform(capability) && !isEmuSim(capability)) {
+        // Check if this is a 'valid' W3C request, this is done with a simple check
+        // where we assume that if only one cap has `:` it's W3C, even if the request
+        // is a mix of JWP and W3C. This is hard to check
+        const isW3CRequest = Boolean(Object.keys(capability).find((cap) => cap.includes(':')));
+        // If the `sauce:options` are not provided and it is a W3C session
+        // then add it
+        if (!capability['sauce:options'] && isW3CRequest) {
             capability['sauce:options'] = {};
         }
         Object.assign(capability, options);
-        const sauceOptions = (!isLegacy && !isUnifiedPlatform(capability) && !isEmuSim(capability) ? capability['sauce:options'] : capability);
+        const sauceOptions = (isW3CRequest ? capability['sauce:options'] : capability);
         sauceOptions.tunnelIdentifier = (capability.tunnelIdentifier ||
             sauceOptions.tunnelIdentifier ||
             tunnelIdentifier);
-        if (!isLegacy && !isUnifiedPlatform(capability) && !isEmuSim(capability)) {
+        if (isW3CRequest) {
             delete capability.tunnelIdentifier;
         }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/sauce-service",
-  "version": "7.16.8",
+  "version": "7.16.12",
   "description": "WebdriverIO service that provides a better integration into Sauce Labs",
   "author": "Christian Bromann <christian@saucelabs.com>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-sauce-service",
@@ -25,10 +25,10 @@
   "dependencies": {
     "@types/node": "^16.11.1",
     "@wdio/logger": "7.16.0",
-    "@wdio/types": "7.16.3",
-    "@wdio/utils": "7.16.3",
+    "@wdio/types": "7.16.11",
+    "@wdio/utils": "7.16.11",
     "saucelabs": "^7.0.0",
-    "webdriverio": "7.16.8"
+    "webdriverio": "7.16.12"
   },
   "peerDependencies": {
     "@wdio/cli": "^7.0.0"
@@ -37,5 +37,5 @@
     "access": "public"
   },
   "types": "./build/index.d.ts",
-  "gitHead": "f8584110532a33ad899ff66eefde427d2d0c7481"
+  "gitHead": "18b8916ea2bfed56f20f1926099286618b7f8ffc"
 }