webdriverio 9.2.8 → 9.2.12

package/build/commands/browser/switchFrame.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"switchFrame.d.ts","sourceRoot":"","sources":["../../../src/commands/browser/switchFrame.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,KAAK,KAAK,EAAe,MAAM,WAAW,CAAA;AAOhE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAA;AAE7D,KAAK,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,UAAU,CAAC,GAAG;IAAE,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,CAAA;AAG3F;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsDG;AACH,wBAAsB,WAAW,CAC7B,IAAI,EAAE,WAAW,CAAC,OAAO,EACzB,OAAO,EAAE,WAAW,CAAC,OAAO,GAAG,uBAAuB,GAAG,MAAM,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,eAAe,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,0BAiOnI"}
+{"version":3,"file":"switchFrame.d.ts","sourceRoot":"","sources":["../../../src/commands/browser/switchFrame.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,KAAK,KAAK,EAAe,MAAM,WAAW,CAAA;AAOhE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAA;AAE7D,KAAK,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,UAAU,CAAC,GAAG;IAAE,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,CAAA;AAG3F;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsDG;AACH,wBAAsB,WAAW,CAC7B,IAAI,EAAE,WAAW,CAAC,OAAO,EACzB,OAAO,EAAE,WAAW,CAAC,OAAO,GAAG,uBAAuB,GAAG,MAAM,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,eAAe,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,0BA4OnI"}

package/build/commands/browser/switchWindow.d.ts

@@ -8,6 +8,9 @@
         // open url
         await browser.url('https://google.com')
 
+        // get window handle
+        const handle = await browser.getWindowHandle()
+
         // create new window
         await browser.newWindow('https://webdriver.io')
 
@@ -16,10 +19,13 @@
 
         // switch back via title match
         await browser.switchWindow('Next-gen browser and mobile automation test framework for Node.js')
+
+        // switch back via window handle
+        await browser.switchWindow(handle)
     });
  * </example>
  *
- * @param {String|RegExp}  matcher  String or regular expression that matches the title and url of the page or window name
+ * @param {String|RegExp}  matcher  String or regular expression that matches either the page title or URL, the window name, or the window handle
  *
  * @uses protocol/getWindowHandles, protocol/switchToWindow, protocol/getUrl, protocol/getTitle
  * @alias browser.switchTab

package/build/commands/browser/switchWindow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"switchWindow.d.ts","sourceRoot":"","sources":["../../../src/commands/browser/switchWindow.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAsB,YAAY,CAC9B,IAAI,EAAE,WAAW,CAAC,OAAO,EACzB,OAAO,EAAE,MAAM,GAAG,MAAM,mBAqD3B"}
+{"version":3,"file":"switchWindow.d.ts","sourceRoot":"","sources":["../../../src/commands/browser/switchWindow.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,wBAAsB,YAAY,CAC9B,IAAI,EAAE,WAAW,CAAC,OAAO,EACzB,OAAO,EAAE,MAAM,GAAG,MAAM,mBAkE3B"}

package/build/index.js

@@ -4139,17 +4139,25 @@ async function setWindowSize(width, height) {
 // src/commands/browser/switchWindow.ts
 async function switchWindow(matcher) {
   if (typeof matcher !== "string" && !(matcher instanceof RegExp)) {
-    throw new Error('Unsupported parameter for switchWindow, required is "string" or an RegExp');
+    throw new Error('Unsupported parameter for switchWindow, required is "string" or a RegExp');
   }
   const currentWindow = await this.getWindowHandle();
+  if (typeof matcher === "string" && currentWindow === matcher) {
+    return currentWindow;
+  }
+  const contextManager2 = getContextManager(this);
   const tabs = await this.getWindowHandles();
+  if (typeof matcher === "string" && tabs.includes(matcher)) {
+    await this.switchToWindow(matcher);
+    contextManager2.setCurrentContext(matcher);
+    return matcher;
+  }
   const matchesTarget = (target) => {
     if (typeof matcher === "string") {
       return target.includes(matcher);
     }
     return !!target.match(matcher);
   };
-  const contextManager2 = getContextManager(this);
   for (const tab of tabs) {
     await this.switchToWindow(tab);
     contextManager2.setCurrentContext(tab);
@@ -4170,7 +4178,7 @@ async function switchWindow(matcher) {
     }
   }
   await this.switchToWindow(currentWindow);
-  throw new Error(`No window found with title, url or name matching "${matcher}"`);
+  throw new Error(`No window found with title, url, name or window handle matching "${matcher}"`);
 }
 
 // src/commands/browser/switchFrame.ts
@@ -4178,6 +4186,9 @@ import logger13 from "@wdio/logger";
 import { ELEMENT_KEY as ELEMENT_KEY8 } from "webdriver";
 var log13 = logger13("webdriverio:switchFrame");
 async function switchFrame(context) {
+  function isPossiblyUnresolvedElement(input) {
+    return Boolean(input) && typeof input === "object" && typeof input.getElement === "function";
+  }
   if (!this.isBidi) {
     if (typeof context === "function") {
       throw new Error("Cannot use a function to fetch a context in WebDriver Classic");
@@ -4185,6 +4196,13 @@ async function switchFrame(context) {
     if (typeof context === "string") {
       throw new Error("Cannot use a string to fetch a context in WebDriver Classic");
     }
+    if (isPossiblyUnresolvedElement(context)) {
+      const element = await context.getElement();
+      await element.waitForExist({
+        timeoutMsg: `Can't switch to frame with selector ${element.selector} because it doesn't exist`
+      });
+      return switchToFrame(this, element);
+    }
     return switchToFrame(this, context);
   }
   if (context === null) {
@@ -4289,7 +4307,7 @@ async function switchFrame(context) {
     }
     return newContextId;
   }
-  if (typeof context === "object" && typeof context.getElement === "function") {
+  if (isPossiblyUnresolvedElement(context)) {
     const element = await context.getElement();
     await element.waitForExist({
       timeoutMsg: `Can't switch to frame with selector ${element.selector} because it doesn't exist`
@@ -5178,6 +5196,7 @@ var ShadowRootManager = class {
   #browser;
   #initialize;
   #shadowRoots = /* @__PURE__ */ new Map();
+  #documentElement;
   #frameDepth = 0;
   constructor(browser) {
     this.#browser = browser;
@@ -5246,7 +5265,8 @@ var ShadowRootManager = class {
         ,
         shadowElem,
         rootElem,
-        isDocument
+        isDocument,
+        documentElement
       ] = args;
       if (!this.#shadowRoots.has(logEntry.source.context)) {
         if (!rootElem.sharedId) {
@@ -5262,6 +5282,7 @@ var ShadowRootManager = class {
           this.#shadowRoots.set(logEntry.source.context, new ShadowRootTree(rootElem.sharedId));
         }
       }
+      this.#documentElement = documentElement;
       const tree = this.#shadowRoots.get(logEntry.source.context);
       if (!tree) {
         throw new Error(`Couldn't find tree for context id ${logEntry.source.context}`);
@@ -5297,14 +5318,20 @@ var ShadowRootManager = class {
     if (!tree) {
       return [];
     }
+    let documentElement;
     if (scope) {
       const subTree = tree.find(scope);
       if (subTree) {
         tree = subTree;
       }
+    } else {
+      documentElement = this.#documentElement?.sharedId;
     }
     const elements = tree.getAllLookupScopes();
-    return [...new Set(elements).values()];
+    return [
+      ...documentElement ? [documentElement] : [],
+      ...new Set(elements).values()
+    ];
   }
   getShadowElementPairsByContextId(contextId, scope) {
     let tree = this.#shadowRoots.get(contextId);

package/build/scripts/customElement.js

@@ -8,7 +8,7 @@ function customElementWrapper() {
       while (parentNode.parentNode) {
         parentNode = parentNode.parentNode;
       }
-      console.debug("[WDIO]", "newShadowRoot", this, parentNode, parentNode === document);
+      console.debug("[WDIO]", "newShadowRoot", this, parentNode, parentNode === document, document.documentElement);
       return origConnectedCallback?.call(this);
     };
     const origDisconnectedCallback = Constructor.prototype.disconnectedCallback;
@@ -25,7 +25,7 @@ function customElementWrapper() {
     while (parentNode.parentNode) {
       parentNode = parentNode.parentNode;
     }
-    console.debug("[WDIO]", "newShadowRoot", this, parentNode, parentNode === document);
+    console.debug("[WDIO]", "newShadowRoot", this, parentNode, parentNode === document, document.documentElement);
     return shadowRoot;
   };
 }

package/build/shadowRoot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shadowRoot.d.ts","sourceRoot":"","sources":["../src/shadowRoot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,WAAW,CAAA;AAStC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,qBAShE;AAED;;;;GAIG;AACH,qBAAa,iBAAiB;;gBAMd,OAAO,EAAE,WAAW,CAAC,OAAO;IAyBlC,UAAU;IA2BhB;;;OAGG;IACH,aAAa;IAIb;;OAEG;IACH,cAAc,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ;IA2FvC,4BAA4B,CAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE;IAwB1E,gCAAgC,CAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EAAE;IAgBpG,qBAAqB,CAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IActF,gBAAgB,CAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;CAOvD;AAED,qBAAa,cAAc;IACvB,OAAO,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,IAAI,CAAC,EAAE,cAAc,CAAA;IACrB,QAAQ,sBAA4B;gBAEvB,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,cAAc;IAMxE;;OAEG;IACH,gBAAgB,CAAE,IAAI,EAAE,cAAc,GAAG,IAAI;IAC7C;;;;;OAKG;IACH,gBAAgB,CAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG,IAAI;IA6B5D,IAAI,CAAE,OAAO,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAelD,cAAc,CAAE,UAAU,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAe/D,kBAAkB,IAAK,MAAM,EAAE;IAO/B,IAAI,IAAK,cAAc,EAAE;IAIzB,MAAM,CAAE,OAAO,EAAE,MAAM,GAAG,OAAO;CAepC"}
+{"version":3,"file":"shadowRoot.d.ts","sourceRoot":"","sources":["../src/shadowRoot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,WAAW,CAAA;AAStC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,qBAShE;AAED;;;;GAIG;AACH,qBAAa,iBAAiB;;gBAOd,OAAO,EAAE,WAAW,CAAC,OAAO;IAyBlC,UAAU;IA2BhB;;;OAGG;IACH,aAAa;IAIb;;OAEG;IACH,cAAc,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ;IAgGvC,4BAA4B,CAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE;IAkC1E,gCAAgC,CAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EAAE;IAgBpG,qBAAqB,CAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IActF,gBAAgB,CAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;CAOvD;AAED,qBAAa,cAAc;IACvB,OAAO,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,IAAI,CAAC,EAAE,cAAc,CAAA;IACrB,QAAQ,sBAA4B;gBAEvB,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,cAAc;IAMxE;;OAEG;IACH,gBAAgB,CAAE,IAAI,EAAE,cAAc,GAAG,IAAI;IAC7C;;;;;OAKG;IACH,gBAAgB,CAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG,IAAI;IA6B5D,IAAI,CAAE,OAAO,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAelD,cAAc,CAAE,UAAU,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAe/D,kBAAkB,IAAK,MAAM,EAAE;IAO/B,IAAI,IAAK,cAAc,EAAE;IAIzB,MAAM,CAAE,OAAO,EAAE,MAAM,GAAG,OAAO;CAepC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "webdriverio",
   "description": "Next-gen browser and mobile automation test framework for Node.js",
-  "version": "9.2.8",
+  "version": "9.2.12",
   "homepage": "https://webdriver.io",
   "author": "Christian Bromann <mail@bromann.dev>",
   "license": "MIT",
@@ -110,5 +110,5 @@
       "optional": true
     }
   },
-  "gitHead": "f02604aee33fb785a1737db3c9092bacfc99a1f3"
+  "gitHead": "5283e03d12615050ba8e1c54a9903e171068d143"
 }