@wdio/utils 9.26.1 → 9.27.1

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

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/node/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,sBAAsB,kCAqB7H;AAED,wBAAgB,YAAY,CAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,sBAAsB,kCAYxH"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/node/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,sBAAsB,kCAqB7H;AAED,wBAAgB,YAAY,CAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,sBAAsB,kCAsBxH"}

package/build/node/startWebDriver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"startWebDriver.d.ts","sourceRoot":"","sources":["../../src/node/startWebDriver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAyB,MAAM,oBAAoB,CAAA;AAQ1D,OAAO,EAA8B,KAAK,mBAAmB,IAAI,sBAAsB,EAAE,MAAM,cAAc,CAAA;AAC7G,OAAO,EAA6B,KAAK,qBAAqB,EAAE,MAAM,aAAa,CAAA;AACnF,OAAO,EAA0C,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAC9F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAM/C,MAAM,MAAM,sBAAsB,GAAG,CACjC,OAAO,CAAC,cAAc,CAAC,GACvB,IAAI,CAAC,oBAAoB,EAAE,MAAM,GAAG,mBAAmB,GAAG,sBAAsB,CAAC,GACjF,IAAI,CAAC,qBAAqB,EAAE,WAAW,CAAC,CAC3C,CAAA;AACD,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,WAAW,CAAC;QAClB,UAAU,mBAAoB,SAAQ,sBAAsB;SAAI;QAChE,UAAU,kBAAmB,SAAQ,IAAI,CAAC,qBAAqB,EAAE,MAAM,CAAC;SAAI;QAC5E,UAAU,iBAAkB,SAAQ,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC;SAAI;QAC1E,UAAU,mBAAoB,SAAQ,IAAI,CAAC,sBAAsB,EAAE,MAAM,CAAC;SAAI;KACjF;CACJ;AAMD,wBAAsB,cAAc,CAAC,OAAO,EAAE,YAAY,CAAC,YAAY,wCA8KtE"}
+{"version":3,"file":"startWebDriver.d.ts","sourceRoot":"","sources":["../../src/node/startWebDriver.ts"],"names":[],"mappings":"AAGA,OAAO,EAAyB,MAAM,oBAAoB,CAAA;AAQ1D,OAAO,EAA8B,KAAK,mBAAmB,IAAI,sBAAsB,EAAE,MAAM,cAAc,CAAA;AAC7G,OAAO,EAA6B,KAAK,qBAAqB,EAAE,MAAM,aAAa,CAAA;AACnF,OAAO,EAA0C,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAC9F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAM/C,MAAM,MAAM,sBAAsB,GAAG,CACjC,OAAO,CAAC,cAAc,CAAC,GACvB,IAAI,CAAC,oBAAoB,EAAE,MAAM,GAAG,mBAAmB,GAAG,sBAAsB,CAAC,GACjF,IAAI,CAAC,qBAAqB,EAAE,WAAW,CAAC,CAC3C,CAAA;AACD,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,WAAW,CAAC;QAClB,UAAU,mBAAoB,SAAQ,sBAAsB;SAAI;QAChE,UAAU,kBAAmB,SAAQ,IAAI,CAAC,qBAAqB,EAAE,MAAM,CAAC;SAAI;QAC5E,UAAU,iBAAkB,SAAQ,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC;SAAI;QAC1E,UAAU,mBAAoB,SAAQ,IAAI,CAAC,sBAAsB,EAAE,MAAM,CAAC;SAAI;KACjF;CACJ;AAMD,wBAAsB,cAAc,CAAC,OAAO,EAAE,YAAY,CAAC,YAAY,wCA+LtE"}

package/build/node.js

@@ -325,25 +325,29 @@ If you like to run a local browser session make sure to pick from one of the fol
   if (isChrome(caps.browserName)) {
     const chromedriverOptions = caps["wdio:chromedriverOptions"] || {};
     const chromedriverBinary = chromedriverOptions.binary || process.env.CHROMEDRIVER_PATH;
-    const { executablePath: chromeExecuteablePath, browserVersion } = await setupPuppeteerBrowser(cacheDir, caps);
-    const { executablePath: chromedriverExcecuteablePath } = chromedriverBinary ? { executablePath: chromedriverBinary } : await setupChromedriver(cacheDir, browserVersion);
-    const prefs = generateDefaultPrefs(caps);
-    caps["goog:chromeOptions"] = deepmerge(
-      { binary: chromeExecuteablePath },
-      prefs,
-      caps["goog:chromeOptions"] || {}
-    );
-    if (process.platform === "win32" && process.env.WDIO_WORKER_ID) {
-      const existingArgs = caps["goog:chromeOptions"]?.args || [];
-      const hasUserDataDir = existingArgs.some((arg) => typeof arg === "string" && arg.includes("user-data-dir"));
-      if (!hasUserDataDir) {
-        const userDataDir = path3.join(
-          options.outputDir || os2.tmpdir(),
-          `wdio-chrome-${process.env.WDIO_WORKER_ID}-${Date.now()}`
-        );
-        caps["goog:chromeOptions"].args = [...existingArgs, `--user-data-dir=${userDataDir}`];
+    let browserVersion;
+    if (!caps["goog:chromeOptions"]?.androidPackage) {
+      const puppeteerResult = await setupPuppeteerBrowser(cacheDir, caps);
+      browserVersion = puppeteerResult.browserVersion;
+      const prefs = generateDefaultPrefs(caps);
+      caps["goog:chromeOptions"] = deepmerge(
+        { binary: puppeteerResult.executablePath },
+        prefs,
+        caps["goog:chromeOptions"] || {}
+      );
+      if (process.platform === "win32" && process.env.WDIO_WORKER_ID) {
+        const existingArgs = caps["goog:chromeOptions"]?.args || [];
+        const hasUserDataDir = existingArgs.some((arg) => typeof arg === "string" && arg.includes("user-data-dir"));
+        if (!hasUserDataDir) {
+          const userDataDir = path3.join(
+            options.outputDir || os2.tmpdir(),
+            `wdio-chrome-${process.env.WDIO_WORKER_ID}-${Date.now()}`
+          );
+          caps["goog:chromeOptions"].args = [...existingArgs, `--user-data-dir=${userDataDir}`];
+        }
       }
     }
+    const { executablePath: chromedriverExcecuteablePath } = chromedriverBinary ? { executablePath: chromedriverBinary } : await setupChromedriver(cacheDir, browserVersion);
     chromedriverOptions.allowedOrigins = chromedriverOptions.allowedOrigins || ["*"];
     chromedriverOptions.allowedIps = chromedriverOptions.allowedIps || ["0.0.0.0"];
     const driverParams = parseParams({ port, ...chromedriverOptions });
@@ -361,11 +365,13 @@ If you like to run a local browser session make sure to pick from one of the fol
       port
     });
   } else if (isFirefox(caps.browserName)) {
-    const { executablePath } = await setupPuppeteerBrowser(cacheDir, caps);
-    caps["moz:firefoxOptions"] = deepmerge(
-      { binary: executablePath },
-      caps["moz:firefoxOptions"] || {}
-    );
+    if (!caps["moz:firefoxOptions"]?.androidPackage) {
+      const { executablePath } = await setupPuppeteerBrowser(cacheDir, caps);
+      caps["moz:firefoxOptions"] = deepmerge(
+        { binary: executablePath },
+        caps["moz:firefoxOptions"] || {}
+      );
+    }
     delete caps.browserVersion;
     const { binary, ...geckodriverOptions } = caps["wdio:geckodriverOptions"] || {};
     if (binary) {
@@ -496,6 +502,10 @@ function setupBrowser(options, caps) {
     if (isEdge(cap.browserName)) {
       return Promise.resolve();
     } else if (isChrome(cap.browserName) || isFirefox(cap.browserName)) {
+      const browserOptions = isFirefox(cap.browserName) ? cap["moz:firefoxOptions"] : cap["goog:chromeOptions"];
+      if (browserOptions?.androidPackage) {
+        return Promise.resolve();
+      }
       return setupPuppeteerBrowser(cacheDir, cap);
     }
     return Promise.resolve();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/utils",
-  "version": "9.26.1",
+  "version": "9.27.1",
   "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",
@@ -39,7 +39,7 @@
   "dependencies": {
     "@puppeteer/browsers": "^2.2.0",
     "@wdio/logger": "9.18.0",
-    "@wdio/types": "9.26.1",
+    "@wdio/types": "9.27.1",
     "decamelize": "^6.0.0",
     "deepmerge-ts": "^7.0.3",
     "edgedriver": "^6.1.2",
@@ -55,5 +55,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0149a736235a2fb00f84a50652193bb92c24cd8f"
+  "gitHead": "e2b5652f61da0858251860e7d3bc0c0aaffbb525"
 }