@wdio/utils 8.16.3 → 8.16.9

package/build/driver/manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/driver/manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAgGxD,wBAAsB,WAAW,CAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,kBAAkB,kCAezH;AAED,wBAAgB,YAAY,CAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,kBAAkB,kCAYpH"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/driver/manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AA4GxD,wBAAsB,WAAW,CAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,kBAAkB,kCAezH;AAED,wBAAgB,YAAY,CAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,kBAAkB,kCAYpH"}

package/build/driver/manager.js

@@ -14,7 +14,12 @@ function mapCapabilities(options, caps, task, taskItemLabel) {
             const multiremoteCaps = cap;
             const isMultiremote = Boolean(multiremoteCaps[Object.keys(cap)[0]].capabilities);
             if (isMultiremote) {
-                return Object.values(multiremoteCaps).map((c) => c.capabilities);
+                return Object.values(multiremoteCaps).map((c) => {
+                    if (c.automationProtocol === 'devtools') {
+                        return;
+                    }
+                    return c.capabilities;
+                });
             }
             else if (w3cCaps.alwaysMatch) {
                 return w3cCaps.alwaysMatch;
@@ -23,6 +28,9 @@ function mapCapabilities(options, caps, task, taskItemLabel) {
         }).flat()
         : Object.values(caps).map((mrOpts) => {
             const w3cCaps = mrOpts.capabilities;
+            if (mrOpts.automationProtocol === 'devtools') {
+                return;
+            }
             if (w3cCaps.alwaysMatch) {
                 return w3cCaps.alwaysMatch;
             }
@@ -31,14 +39,18 @@ function mapCapabilities(options, caps, task, taskItemLabel) {
     /**
      * only set up driver if
      */
-    // - browserName is defined so we know it is a browser session
-    cap.browserName &&
+    // - capabilities are defined and not empty because automationProtocol is set to `devtools`
+    cap &&
+        // - browserName is defined so we know it is a browser session
+        cap.browserName &&
         // - we are not about to run a cloud session
         !definesRemoteDriver(options) &&
         // - we are not running Safari (driver already installed on macOS)
         !isSafari(cap.browserName) &&
         // - driver options don't define a binary path
-        !getDriverOptions(cap).binary));
+        !getDriverOptions(cap).binary &&
+        // - user is not defining "devtools" as automation protocol
+        options.automationProtocol !== 'devtools'));
     /**
      * nothing to setup
      */

package/build/driver/utils.js

@@ -38,7 +38,7 @@ export function getBuildIdByChromePath(chromePath) {
         const oldest = versions.sort((a, b) => a > b ? -1 : 1)[0];
         return oldest;
     }
-    const versionString = cp.execSync(`"${chromePath}" --version`).toString();
+    const versionString = cp.execSync(`"${chromePath}" --version --no-sandbox`).toString();
     return versionString.trim().split(' ').pop()?.trim();
 }
 export async function getBuildIdByFirefoxPath(firefoxPath) {
@@ -74,7 +74,7 @@ export async function setupPuppeteerBrowser(cacheDir, caps) {
         await fsp.mkdir(cacheDir, { recursive: true });
     }
     /**
-     * don't set up Chrome if a binary was defined in caps
+     * don't set up Chrome/Firefox if a binary was defined in caps
      */
     const browserOptions = (browserName === Browser.CHROME
         ? caps['goog:chromeOptions']
@@ -99,7 +99,7 @@ export async function setupPuppeteerBrowser(cacheDir, caps) {
             ? getBuildIdByChromePath(executablePath)
             : await getBuildIdByFirefoxPath(executablePath);
         /**
-         * verify that we have a valid Chrome browser installed
+         * verify that we have a valid Chrome/Firefox browser installed
          */
         if (tag) {
             return {
@@ -109,7 +109,7 @@ export async function setupPuppeteerBrowser(cacheDir, caps) {
         }
     }
     /**
-     * otherwise download provided Chrome browser version or "stable"
+     * otherwise download provided Chrome/Firefox browser version or "stable"
      */
     const tag = browserName === Browser.CHROME
         ? caps.browserVersion || ChromeReleaseChannel.STABLE

package/build/shim.d.ts

@@ -26,8 +26,9 @@ declare const wrapCommand: <T>(commandName: string, fn: Function) => (...args: a
  * @param  {Function} fn         spec or hook method
  * @param  {object}   retries    { limit: number, attempts: number }
  * @param  {Array}    args       arguments passed to hook
+ * @param  {number}   timeout    The maximum time (in milliseconds) to wait for the function to complete
  * @return {Promise}             that gets resolved once test/hook is done or was retried enough
  */
-declare function executeAsync(this: any, fn: Function, retries: Retries, args?: any[]): Promise<unknown>;
+declare function executeAsync(this: any, fn: Function, retries: Retries, args?: any[], timeout?: number): Promise<unknown>;
 export { executeHooksWithArgs, wrapCommand, executeAsync, };
 //# sourceMappingURL=shim.d.ts.map

package/build/shim.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shim.d.ts","sourceRoot":"","sources":["../src/shim.ts"],"names":[],"mappings":"AASA,UAAU,OAAO;IACb,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;CACnB;AAED,OAAO,CAAC,MAAM,CAAC;IAEX,IAAI,WAAW,EAAE,GAAG,CAAA;CACvB;AAED,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM,CAAC;QACb,UAAU,MAAM;YACZ,MAAM,EAAE,GAAG,CAAA;YACX,WAAW,EAAE,GAAG,CAAA;SACnB;KACJ;CACJ;AAaD,QAAA,MAAM,oBAAoB,YAAqD,GAAG,YAAY,MAAM,UAAS,QAAQ,GAAG,QAAQ,EAAE,SAAa,GAAG,EAAE,2BA6CnJ,CAAA;AAED;;;;GAIG;AACH,QAAA,MAAM,WAAW,mBAAwC,MAAM,MAAM,QAAQ,eAAa,GAAG,eAkL5F,CAAA;AAED;;;;;;;GAOG;AACH,iBAAe,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,GAAE,GAAG,EAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAmBzG;AAED,OAAO,EACH,oBAAoB,EACpB,WAAW,EACX,YAAY,GACf,CAAA"}
+{"version":3,"file":"shim.d.ts","sourceRoot":"","sources":["../src/shim.ts"],"names":[],"mappings":"AASA,UAAU,OAAO;IACb,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;CACnB;AAED,OAAO,CAAC,MAAM,CAAC;IAEX,IAAI,WAAW,EAAE,GAAG,CAAA;CACvB;AAED,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM,CAAC;QACb,UAAU,MAAM;YACZ,MAAM,EAAE,GAAG,CAAA;YACX,WAAW,EAAE,GAAG,CAAA;SACnB;KACJ;CACJ;AAaD,QAAA,MAAM,oBAAoB,YAAqD,GAAG,YAAY,MAAM,UAAS,QAAQ,GAAG,QAAQ,EAAE,SAAa,GAAG,EAAE,2BAsDnJ,CAAA;AAED;;;;GAIG;AACH,QAAA,MAAM,WAAW,mBAAwC,MAAM,MAAM,QAAQ,eAAa,GAAG,eAkL5F,CAAA;AAED;;;;;;;;GAQG;AACH,iBAAe,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,GAAE,GAAG,EAAO,EAAE,OAAO,GAAE,MAAc,GAAG,OAAO,CAAC,OAAO,CAAC,CA+BlI;AAED,OAAO,EACH,oBAAoB,EACpB,WAAW,EACX,YAAY,GACf,CAAA"}

package/build/shim.js

@@ -25,12 +25,21 @@ const executeHooksWithArgs = async function executeHooksWithArgsShim(hookName, h
     if (!Array.isArray(args)) {
         args = [args];
     }
-    const hooksPromises = hooks.map((hook) => new Promise((resolve) => {
+    const hooksPromises = hooks.map((hook) => new Promise((resolve, reject) => {
         let result;
         try {
             result = hook.apply(this, args);
         }
         catch (e) {
+            /**
+             * When we use `this.skip()` inside a test or a hook, it's a signal that we want to stop that particular test.
+             * Mocha, the testing framework, knows how to handle this for its own built-in hooks and test steps.
+             * However, for our custom hooks, we need to reject the promise, which effectively skips the test case.
+             * For more details, refer to: https://github.com/mochajs/mocha/pull/3859#issuecomment-534116333
+             */
+            if (/^(sync|async) skip; aborting execution$/.test(e.message)) {
+                return reject();
+            }
             log.error(e.stack);
             return resolve(e);
         }
@@ -216,12 +225,25 @@ const wrapCommand = function wrapCommand(commandName, fn) {
  * @param  {Function} fn         spec or hook method
  * @param  {object}   retries    { limit: number, attempts: number }
  * @param  {Array}    args       arguments passed to hook
+ * @param  {number}   timeout    The maximum time (in milliseconds) to wait for the function to complete
  * @return {Promise}             that gets resolved once test/hook is done or was retried enough
  */
-async function executeAsync(fn, retries, args = []) {
+async function executeAsync(fn, retries, args = [], timeout = 20000) {
     this.wdioRetries = retries.attempts;
     try {
-        const result = fn.apply(this, args);
+        // @ts-expect-error
+        const _timeout = this?._runnable?._timeout || globalThis.jasmine?.DEFAULT_TIMEOUT_INTERVAL || timeout;
+        /**
+         * Executes the function with specified timeout and returns the result, or throws an error if the timeout is exceeded.
+         */
+        const result = await Promise.race([
+            fn.apply(this, args),
+            new Promise((resolve, reject) => {
+                setTimeout(() => {
+                    reject(new Error('Timeout'));
+                }, _timeout);
+            })
+        ]);
         if (result && typeof result.finally === 'function') {
             result.catch((err) => err);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/utils",
-  "version": "8.16.3",
+  "version": "8.16.9",
   "description": "A WDIO helper utility to provide several utility functions used across the project.",
   "author": "Christian Bromann <mail@bromann.dev>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-utils",
@@ -32,7 +32,7 @@
   "dependencies": {
     "@puppeteer/browsers": "^1.6.0",
     "@wdio/logger": "8.11.0",
-    "@wdio/types": "8.16.3",
+    "@wdio/types": "8.16.7",
     "decamelize": "^6.0.0",
     "deepmerge-ts": "^5.1.0",
     "edgedriver": "^5.3.5",
@@ -47,5 +47,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2c05558b0e4d6ecdca5eb7b0ed37d4a4e733b5a5"
+  "gitHead": "a94335c7a66b9d4c792f0ae55a854f2c8b68e26d"
 }