Skip to content
Open
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion py/selenium/webdriver/remote/switch_to.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,14 @@ def frame(self, frame_reference: Union[str, int, WebElement]) -> None:
driver.switch_to.frame(driver.find_elements(By.TAG_NAME, "iframe")[0])
"""
if isinstance(frame_reference, str):
frame_name = frame_reference
try:
frame_reference = self._driver.find_element(By.ID, frame_reference)
except NoSuchElementException:
try:
frame_reference = self._driver.find_element(By.NAME, frame_reference)
except NoSuchElementException as exc:
raise NoSuchFrameException(frame_reference) from exc
raise NoSuchFrameException(frame_name) from exc

self._driver.execute(Command.SWITCH_TO_FRAME, {"id": frame_reference})

Expand Down
4 changes: 2 additions & 2 deletions py/selenium/webdriver/support/relative_locator.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from typing import NoReturn, Optional, Union, overload

from selenium.common.exceptions import WebDriverException
from selenium.webdriver.common.by import By, ByType
from selenium.webdriver.common.by import ByType
from selenium.webdriver.remote.webelement import WebElement


Expand Down Expand Up @@ -48,7 +48,7 @@ def with_tag_name(tag_name: str) -> "RelativeBy":
warnings.warn("This method is deprecated and may be removed in future versions. Please use `locate_with` instead.")
if not tag_name:
raise WebDriverException("tag_name can not be null")
return RelativeBy({By.CSS_SELECTOR: tag_name})
return RelativeBy({"css selector": tag_name})


def locate_with(by: ByType, using: str) -> "RelativeBy":
Expand Down