[JS]add support to switch frame by name (SeleniumHQ#10670)

elgatov · Jun 27, 2022 · 050be81 · 050be81
1 parent 589471e
commit 050be81
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/javascript/node/selenium-webdriver/lib/webdriver.js b/javascript/node/selenium-webdriver/lib/webdriver.js
@@ -2167,16 +2167,18 @@ class TargetLocator {
    *     when the driver has changed focus to the specified frame.
    */
   frame(id) {
-    let frameReference = id;
-
-    if (typeof id === "string") {
-      frameReference = this.driver_.findElement({
-        id: id
-      });
+    let frameReference = id
+    if (typeof id === 'string') {
+      frameReference = this.driver_
+        .findElement({ id })
+        .catch((_) => this.driver_.findElement({ name: id }))
     }
 
     return this.driver_.execute(
-      new command.Command(command.Name.SWITCH_TO_FRAME).setParameter('id', frameReference)
+      new command.Command(command.Name.SWITCH_TO_FRAME).setParameter(
+        'id',
+        frameReference
+      )
     )
   }
 

diff --git a/javascript/node/selenium-webdriver/test/frame_test.js b/javascript/node/selenium-webdriver/test/frame_test.js
@@ -64,4 +64,18 @@ test.suite(function (env) {
       'This page has iframes'
     )
   })
+
+  it('can switch to a frame by name', async function () {
+    await driver.get(test.Pages.iframePage)
+    await driver.switchTo().frame('iframe1-name')
+    assert.strictEqual(
+      await driver.executeScript('return document.title'),
+      'We Leave From Here'
+    )
+    await driver.switchTo().parentFrame()
+    assert.strictEqual(
+      await driver.executeScript('return document.title'),
+      'This page has iframes'
+    )
+  })
 })