From 8aa8343d25d7e2d43d3e0dd445090bb8a5e85e8d Mon Sep 17 00:00:00 2001 From: Simon K Date: Wed, 8 Jun 2022 19:00:16 +0100 Subject: [PATCH] [py]: remove deprecated `find_element_by_` methods (#10712) --- py/selenium/webdriver/remote/webdriver.py | 383 ------------------ py/selenium/webdriver/remote/webelement.py | 376 ----------------- .../support/event_firing_webdriver.py | 130 ------ .../common/driver_element_finding_tests.py | 2 +- 4 files changed, 1 insertion(+), 890 deletions(-) diff --git a/py/selenium/webdriver/remote/webdriver.py b/py/selenium/webdriver/remote/webdriver.py index 8d9a24f928131..6dac03419f777 100644 --- a/py/selenium/webdriver/remote/webdriver.py +++ b/py/selenium/webdriver/remote/webdriver.py @@ -453,389 +453,6 @@ def title(self) -> str: resp = self.execute(Command.GET_TITLE) return resp['value'] if resp['value'] else "" - def find_element_by_id(self, id_) -> WebElement: - """Finds an element by id. - - :Args: - - id\\_ - The id of the element to be found. - - :Returns: - - WebElement - the element if it was found - - :Raises: - - NoSuchElementException - if the element wasn't found - - :Usage: - :: - - element = driver.find_element_by_id('foo') - """ - warnings.warn( - "find_element_by_* commands are deprecated. Please use find_element() instead", - DeprecationWarning, - stacklevel=2, - ) - return self.find_element(by=By.ID, value=id_) - - def find_elements_by_id(self, id_) -> List[WebElement]: - """ - Finds multiple elements by id. - - :Args: - - id\\_ - The id of the elements to be found. - - :Returns: - - list of WebElement - a list with elements if any was found. An - empty list if not - - :Usage: - :: - - elements = driver.find_elements_by_id('foo') - """ - warnings.warn( - "find_elements_by_id is deprecated. Please use find_elements(by=By.ID, value=id_) instead", - DeprecationWarning, - stacklevel=2, - ) - return self.find_elements(by=By.ID, value=id_) - - def find_element_by_xpath(self, xpath) -> WebElement: - """ - Finds an element by xpath. - - :Args: - - xpath - The xpath locator of the element to find. - - :Returns: - - WebElement - the element if it was found - - :Raises: - - NoSuchElementException - if the element wasn't found - - :Usage: - :: - - element = driver.find_element_by_xpath('//div/td[1]') - """ - warnings.warn( - "find_element_by_xpath is deprecated. Please use find_element(by=By.XPATH, value=xpath) instead", - DeprecationWarning, - stacklevel=2, - ) - return self.find_element(by=By.XPATH, value=xpath) - - def find_elements_by_xpath(self, xpath) -> List[WebElement]: - """ - Finds multiple elements by xpath. - - :Args: - - xpath - The xpath locator of the elements to be found. - - :Returns: - - list of WebElement - a list with elements if any was found. An - empty list if not - - :Usage: - :: - - elements = driver.find_elements_by_xpath("//div[contains(@class, 'foo')]") - """ - warnings.warn( - "find_elements_by_xpath is deprecated. Please use find_elements(by=By.XPATH, value=xpath) instead", - DeprecationWarning, - stacklevel=2, - ) - return self.find_elements(by=By.XPATH, value=xpath) - - def find_element_by_link_text(self, link_text) -> WebElement: - """ - Finds an element by link text. - - :Args: - - link_text: The text of the element to be found. - - :Returns: - - WebElement - the element if it was found - - :Raises: - - NoSuchElementException - if the element wasn't found - - :Usage: - :: - - element = driver.find_element_by_link_text('Sign In') - """ - warnings.warn( - "find_element_by_link_text is deprecated. Please use find_element(by=By.LINK_TEXT, value=link_text) instead", - DeprecationWarning, - stacklevel=2, - ) - return self.find_element(by=By.LINK_TEXT, value=link_text) - - def find_elements_by_link_text(self, text) -> List[WebElement]: - """ - Finds elements by link text. - - :Args: - - link_text: The text of the elements to be found. - - :Returns: - - list of webelement - a list with elements if any was found. an - empty list if not - - :Usage: - :: - - elements = driver.find_elements_by_link_text('Sign In') - """ - warnings.warn( - "find_elements_by_link_text is deprecated. Please use find_elements(by=By.LINK_TEXT, value=text) instead", - DeprecationWarning, - stacklevel=2, - ) - return self.find_elements(by=By.LINK_TEXT, value=text) - - def find_element_by_partial_link_text(self, link_text) -> WebElement: - """ - Finds an element by a partial match of its link text. - - :Args: - - link_text: The text of the element to partially match on. - - :Returns: - - WebElement - the element if it was found - - :Raises: - - NoSuchElementException - if the element wasn't found - - :Usage: - :: - - element = driver.find_element_by_partial_link_text('Sign') - """ - warnings.warn( - "find_element_by_partial_link_text is deprecated. Please use find_element(by=By.PARTIAL_LINK_TEXT, value=link_text) instead", - DeprecationWarning, - stacklevel=2, - ) - return self.find_element(by=By.PARTIAL_LINK_TEXT, value=link_text) - - def find_elements_by_partial_link_text(self, link_text) -> List[WebElement]: - """ - Finds elements by a partial match of their link text. - - :Args: - - link_text: The text of the element to partial match on. - - :Returns: - - list of webelement - a list with elements if any was found. an - empty list if not - - :Usage: - :: - - elements = driver.find_elements_by_partial_link_text('Sign') - """ - warnings.warn( - "find_elements_by_partial_link_text is deprecated. Please use find_elements(by=By.PARTIAL_LINK_TEXT, value=link_text) instead", - DeprecationWarning, - stacklevel=2, - ) - return self.find_elements(by=By.PARTIAL_LINK_TEXT, value=link_text) - - def find_element_by_name(self, name) -> WebElement: - """ - Finds an element by name. - - :Args: - - name: The name of the element to find. - - :Returns: - - WebElement - the element if it was found - - :Raises: - - NoSuchElementException - if the element wasn't found - - :Usage: - :: - - element = driver.find_element_by_name('foo') - """ - warnings.warn( - "find_element_by_name is deprecated. Please use find_element(by=By.NAME, value=name) instead", - DeprecationWarning, - stacklevel=2, - ) - return self.find_element(by=By.NAME, value=name) - - def find_elements_by_name(self, name) -> List[WebElement]: - """ - Finds elements by name. - - :Args: - - name: The name of the elements to find. - - :Returns: - - list of webelement - a list with elements if any was found. an - empty list if not - - :Usage: - :: - - elements = driver.find_elements_by_name('foo') - """ - warnings.warn( - "find_elements_by_name is deprecated. Please use find_elements(by=By.NAME, value=name)=By.NAME, value=name) instead", - DeprecationWarning, - stacklevel=2, - ) - return self.find_elements(by=By.NAME, value=name) - - def find_element_by_tag_name(self, name) -> WebElement: - """ - Finds an element by tag name. - - :Args: - - name - name of html tag (eg: h1, a, span) - - :Returns: - - WebElement - the element if it was found - - :Raises: - - NoSuchElementException - if the element wasn't found - - :Usage: - :: - - element = driver.find_element_by_tag_name('h1') - """ - warnings.warn( - "find_element_by_tag_name is deprecated. Please use find_element(by=By.TAG_NAME, value=name) instead", - DeprecationWarning, - stacklevel=2, - ) - return self.find_element(by=By.TAG_NAME, value=name) - - def find_elements_by_tag_name(self, name) -> List[WebElement]: - """ - Finds elements by tag name. - - :Args: - - name - name of html tag (eg: h1, a, span) - - :Returns: - - list of WebElement - a list with elements if any was found. An - empty list if not - - :Usage: - :: - - elements = driver.find_elements_by_tag_name('h1') - """ - warnings.warn( - "find_elements_by_tag_name is deprecated. Please use find_elements(by=By.TAG_NAME, value=name) instead", - DeprecationWarning, - stacklevel=2, - ) - return self.find_elements(by=By.TAG_NAME, value=name) - - def find_element_by_class_name(self, name) -> WebElement: - """ - Finds an element by class name. - - :Args: - - name: The class name of the element to find. - - :Returns: - - WebElement - the element if it was found - - :Raises: - - NoSuchElementException - if the element wasn't found - - :Usage: - :: - - element = driver.find_element_by_class_name('foo') - """ - warnings.warn( - "find_element_by_class_name is deprecated. Please use find_element(by=By.CLASS_NAME, value=name) instead", - DeprecationWarning, - stacklevel=2, - ) - return self.find_element(by=By.CLASS_NAME, value=name) - - def find_elements_by_class_name(self, name) -> List[WebElement]: - """ - Finds elements by class name. - - :Args: - - name: The class name of the elements to find. - - :Returns: - - list of WebElement - a list with elements if any was found. An - empty list if not - - :Usage: - :: - - elements = driver.find_elements_by_class_name('foo') - """ - warnings.warn( - "find_elements_by_class_name is deprecated. Please use find_elements(by=By.CLASS_NAME, value=name) instead", - DeprecationWarning, - stacklevel=2, - ) - return self.find_elements(by=By.CLASS_NAME, value=name) - - def find_element_by_css_selector(self, css_selector) -> WebElement: - """ - Finds an element by css selector. - - :Args: - - css_selector - CSS selector string, ex: 'a.nav#home' - - :Returns: - - WebElement - the element if it was found - - :Raises: - - NoSuchElementException - if the element wasn't found - - :Usage: - :: - - element = driver.find_element_by_css_selector('#foo') - """ - warnings.warn( - "find_element_by_css_selector is deprecated. Please use find_element(by=By.CSS_SELECTOR, value=css_selector) instead", - DeprecationWarning, - stacklevel=2, - ) - return self.find_element(by=By.CSS_SELECTOR, value=css_selector) - - def find_elements_by_css_selector(self, css_selector) -> List[WebElement]: - """ - Finds elements by css selector. - - :Args: - - css_selector - CSS selector string, ex: 'a.nav#home' - - :Returns: - - list of WebElement - a list with elements if any was found. An - empty list if not - - :Usage: - :: - - elements = driver.find_elements_by_css_selector('.foo') - """ - warnings.warn( - "find_elements_by_css_selector is deprecated. Please use find_elements(by=By.CSS_SELECTOR, value=css_selector) instead", - DeprecationWarning, - stacklevel=2, - ) - return self.find_elements(by=By.CSS_SELECTOR, value=css_selector) - def pin_script(self, script, script_key=None) -> ScriptKey: """ diff --git a/py/selenium/webdriver/remote/webelement.py b/py/selenium/webdriver/remote/webelement.py index 720a013f884b3..5937c167b8a28 100644 --- a/py/selenium/webdriver/remote/webelement.py +++ b/py/selenium/webdriver/remote/webelement.py @@ -186,382 +186,6 @@ def is_enabled(self) -> bool: """Returns whether the element is enabled.""" return self._execute(Command.IS_ELEMENT_ENABLED)['value'] - def find_element_by_id(self, id_): - """Finds element within this element's children by ID. - - :Args: - - id\\_ - ID of child element to locate. - - :Returns: - - WebElement - the element if it was found - - :Raises: - - NoSuchElementException - if the element wasn't found - - :Usage: - :: - - foo_element = element.find_element_by_id('foo') - """ - warnings.warn("find_element_by_id is deprecated. Please use find_element(by=By.ID, value=id_) instead", - DeprecationWarning, - stacklevel=2) - return self.find_element(by=By.ID, value=id_) - - def find_elements_by_id(self, id_): - """Finds a list of elements within this element's children by ID. - Will return a list of webelements if found, or an empty list if not. - - :Args: - - id\\_ - Id of child element to find. - - :Returns: - - list of WebElement - a list with elements if any was found. An - empty list if not - - :Usage: - :: - - elements = element.find_elements_by_id('foo') - """ - warnings.warn("find_elements_by_id is deprecated. Please use find_elements(by=By.ID, value=id_) instead", - DeprecationWarning, - stacklevel=2) - return self.find_elements(by=By.ID, value=id_) - - def find_element_by_name(self, name): - """Finds element within this element's children by name. - - :Args: - - name - name property of the element to find. - - :Returns: - - WebElement - the element if it was found - - :Raises: - - NoSuchElementException - if the element wasn't found - - :Usage: - :: - - element = element.find_element_by_name('foo') - """ - warnings.warn("find_element_by_name is deprecated. Please use find_element(by=By.NAME, value=name) instead", - DeprecationWarning, - stacklevel=2) - return self.find_element(by=By.NAME, value=name) - - def find_elements_by_name(self, name): - """Finds a list of elements within this element's children by name. - - :Args: - - name - name property to search for. - - :Returns: - - list of webelement - a list with elements if any was found. an - empty list if not - - :Usage: - :: - - elements = element.find_elements_by_name('foo') - """ - warnings.warn("find_elements_by_name is deprecated. Please use find_elements(by=By.NAME, value=name) instead", - DeprecationWarning, - stacklevel=2) - return self.find_elements(by=By.NAME, value=name) - - def find_element_by_link_text(self, link_text): - """Finds element within this element's children by visible link text. - - :Args: - - link_text - Link text string to search for. - - :Returns: - - WebElement - the element if it was found - - :Raises: - - NoSuchElementException - if the element wasn't found - - :Usage: - :: - - element = element.find_element_by_link_text('Sign In') - """ - warnings.warn( - "find_element_by_link_text is deprecated. Please use find_element(by=By.LINK_TEXT, value=link_text) instead", - DeprecationWarning, - stacklevel=2) - return self.find_element(by=By.LINK_TEXT, value=link_text) - - def find_elements_by_link_text(self, link_text): - """Finds a list of elements within this element's children by visible link text. - - :Args: - - link_text - Link text string to search for. - - :Returns: - - list of webelement - a list with elements if any was found. an - empty list if not - - :Usage: - :: - - elements = element.find_elements_by_link_text('Sign In') - """ - warnings.warn( - "find_elements_by_link_text is deprecated. Please use find_elements(by=By.LINK_TEXT, value=text) instead", - DeprecationWarning, - stacklevel=2) - return self.find_elements(by=By.LINK_TEXT, value=link_text) - - def find_element_by_partial_link_text(self, link_text): - """Finds element within this element's children by partially visible link text. - - :Args: - - link_text: The text of the element to partially match on. - - :Returns: - - WebElement - the element if it was found - - :Raises: - - NoSuchElementException - if the element wasn't found - - :Usage: - :: - - element = element.find_element_by_partial_link_text('Sign') - """ - warnings.warn( - "find_element_by_partial_link_text is deprecated. Please use find_element(by=By.PARTIAL_LINK_TEXT, value=link_text) instead", - DeprecationWarning, - stacklevel=2) - return self.find_element(by=By.PARTIAL_LINK_TEXT, value=link_text) - - def find_elements_by_partial_link_text(self, link_text): - """Finds a list of elements within this element's children by link text. - - :Args: - - link_text: The text of the element to partial match on. - - :Returns: - - list of webelement - a list with elements if any was found. an - empty list if not - - :Usage: - :: - - elements = element.find_elements_by_partial_link_text('Sign') - """ - warnings.warn( - "find_elements_by_partial_link_text is deprecated. Please use find_elements(by=By.PARTIAL_LINK_TEXT, value=link_text) instead", - DeprecationWarning, - stacklevel=2) - return self.find_elements(by=By.PARTIAL_LINK_TEXT, value=link_text) - - def find_element_by_tag_name(self, name): - """Finds element within this element's children by tag name. - - :Args: - - name - name of html tag (eg: h1, a, span) - - :Returns: - - WebElement - the element if it was found - - :Raises: - - NoSuchElementException - if the element wasn't found - - :Usage: - :: - - element = element.find_element_by_tag_name('h1') - """ - warnings.warn( - "find_element_by_tag_name is deprecated. Please use find_element(by=By.TAG_NAME, value=name) instead", - DeprecationWarning, - stacklevel=2) - return self.find_element(by=By.TAG_NAME, value=name) - - def find_elements_by_tag_name(self, name): - """Finds a list of elements within this element's children by tag name. - - :Args: - - name - name of html tag (eg: h1, a, span) - - :Returns: - - list of WebElement - a list with elements if any was found. An - empty list if not - - :Usage: - :: - - elements = element.find_elements_by_tag_name('h1') - """ - warnings.warn( - "find_elements_by_tag_name is deprecated. Please use find_elements(by=By.TAG_NAME, value=name) instead", - DeprecationWarning, - stacklevel=2) - return self.find_elements(by=By.TAG_NAME, value=name) - - def find_element_by_xpath(self, xpath): - """Finds element by xpath. - - :Args: - - xpath - xpath of element to locate. "//input[@class='myelement']" - - Note: The base path will be relative to this element's location. - - This will select the first link under this element. - - :: - - myelement.find_element_by_xpath(".//a") - - However, this will select the first link on the page. - - :: - - myelement.find_element_by_xpath("//a") - - :Returns: - - WebElement - the element if it was found - - :Raises: - - NoSuchElementException - if the element wasn't found - - :Usage: - :: - - element = element.find_element_by_xpath('//div/td[1]') - """ - warnings.warn("find_element_by_xpath is deprecated. Please use find_element(by=By.XPATH, value=xpath) instead", - DeprecationWarning, - stacklevel=2) - return self.find_element(by=By.XPATH, value=xpath) - - def find_elements_by_xpath(self, xpath): - """Finds elements within the element by xpath. - - :Args: - - xpath - xpath locator string. - - Note: The base path will be relative to this element's location. - - This will select all links under this element. - - :: - - myelement.find_elements_by_xpath(".//a") - - However, this will select all links in the page itself. - - :: - - myelement.find_elements_by_xpath("//a") - - :Returns: - - list of WebElement - a list with elements if any was found. An - empty list if not - - :Usage: - :: - - elements = element.find_elements_by_xpath("//div[contains(@class, 'foo')]") - - """ - warnings.warn( - "find_elements_by_xpath is deprecated. Please use find_elements(by=By.XPATH, value=xpath) instead", - DeprecationWarning, - stacklevel=2) - return self.find_elements(by=By.XPATH, value=xpath) - - def find_element_by_class_name(self, name): - """Finds element within this element's children by class name. - - :Args: - - name: The class name of the element to find. - - :Returns: - - WebElement - the element if it was found - - :Raises: - - NoSuchElementException - if the element wasn't found - - :Usage: - :: - - element = element.find_element_by_class_name('foo') - """ - warnings.warn( - "find_element_by_class_name is deprecated. Please use find_element(by=By.CLASS_NAME, value=name) instead", - DeprecationWarning, - stacklevel=2) - return self.find_element(by=By.CLASS_NAME, value=name) - - def find_elements_by_class_name(self, name): - """Finds a list of elements within this element's children by class name. - - :Args: - - name: The class name of the elements to find. - - :Returns: - - list of WebElement - a list with elements if any was found. An - empty list if not - - :Usage: - :: - - elements = element.find_elements_by_class_name('foo') - """ - warnings.warn( - "find_elements_by_class_name is deprecated. Please use find_elements(by=By.CLASS_NAME, value=name) instead", - DeprecationWarning) - return self.find_elements(by=By.CLASS_NAME, value=name) - - def find_element_by_css_selector(self, css_selector): - """Finds element within this element's children by CSS selector. - - :Args: - - css_selector - CSS selector string, ex: 'a.nav#home' - - :Returns: - - WebElement - the element if it was found - - :Raises: - - NoSuchElementException - if the element wasn't found - - :Usage: - :: - - element = element.find_element_by_css_selector('#foo') - """ - warnings.warn( - "find_element_by_css_selector is deprecated. Please use find_element(by=By.CSS_SELECTOR, value=css_selector) instead", - DeprecationWarning, - stacklevel=2) - return self.find_element(by=By.CSS_SELECTOR, value=css_selector) - - def find_elements_by_css_selector(self, css_selector): - """Finds a list of elements within this element's children by CSS selector. - - :Args: - - css_selector - CSS selector string, ex: 'a.nav#home' - - :Returns: - - list of WebElement - a list with elements if any was found. An - empty list if not - - :Usage: - :: - - elements = element.find_elements_by_css_selector('.foo') - """ - warnings.warn( - "find_elements_by_css_selector is deprecated. Please use find_elements(by=By.CSS_SELECTOR, value=css_selector) instead", - DeprecationWarning, - stacklevel=2) - return self.find_elements(by=By.CSS_SELECTOR, value=css_selector) - def send_keys(self, *value) -> None: """Simulates typing into the element. diff --git a/py/selenium/webdriver/support/event_firing_webdriver.py b/py/selenium/webdriver/support/event_firing_webdriver.py index 21929863464af..6099bc003fc88 100644 --- a/py/selenium/webdriver/support/event_firing_webdriver.py +++ b/py/selenium/webdriver/support/event_firing_webdriver.py @@ -16,8 +16,6 @@ # under the License. -import warnings - from selenium.common.exceptions import WebDriverException from selenium.webdriver.common.by import By from selenium.webdriver.remote.webdriver import WebDriver @@ -110,70 +108,6 @@ def find_element(self, by=By.ID, value=None): def find_elements(self, by=By.ID, value=None): return self._dispatch("find", (by, value, self._driver), "find_elements", (by, value)) - def find_element_by_id(self, id_): - warnings.warn("find_element_by_id is deprecated. Please use find_element(by=By.ID, value=id_) instead") - return self.find_element(by=By.ID, value=id_) - - def find_elements_by_id(self, id_): - warnings.warn("find_elements_by_id is deprecated. Please use find_elements(by=By.ID, value=id_) instead") - return self.find_elements(by=By.ID, value=id_) - - def find_element_by_xpath(self, xpath): - warnings.warn("find_element_by_xpath is deprecated. Please use find_element(by=By.XPATH, value=xpath) instead") - return self.find_element(by=By.XPATH, value=xpath) - - def find_elements_by_xpath(self, xpath): - warnings.warn("find_elements_by_xpath is deprecated. Please use find_elements(by=By.XPATH, value=xpath) instead") - return self.find_elements(by=By.XPATH, value=xpath) - - def find_element_by_link_text(self, link_text): - warnings.warn("find_element_by_link_text is deprecated. Please use find_element(by=By.LINK_TEXT, value=link_text) instead") - return self.find_element(by=By.LINK_TEXT, value=link_text) - - def find_elements_by_link_text(self, text): - warnings.warn("find_elements_by_link_text is deprecated. Please use find_elements(by=By.LINK_TEXT, value=text) instead") - return self.find_elements(by=By.LINK_TEXT, value=text) - - def find_element_by_partial_link_text(self, link_text): - warnings.warn("find_element_by_partial_link_text is deprecated. Please use find_element(by=By.PARTIAL_LINK_TEXT, value=link_text) instead") - return self.find_element(by=By.PARTIAL_LINK_TEXT, value=link_text) - - def find_elements_by_partial_link_text(self, link_text): - warnings.warn("find_elements_by_partial_link_text is deprecated. Please use find_elements(by=By.PARTIAL_LINK_TEXT, value=link_text) instead") - return self.find_elements(by=By.PARTIAL_LINK_TEXT, value=link_text) - - def find_element_by_name(self, name): - warnings.warn("find_element_by_name is deprecated. Please use find_element(by=By.NAME, value=name) instead") - return self.find_element(by=By.NAME, value=name) - - def find_elements_by_name(self, name): - warnings.warn("find_elements_by_name is deprecated. Please use find_elements(by=By.NAME, value=name) instead") - return self.find_elements(by=By.NAME, value=name) - - def find_element_by_tag_name(self, name): - warnings.warn("find_element_by_tag_name is deprecated. Please use find_element(by=By.TAG_NAME, value=name) instead") - return self.find_element(by=By.TAG_NAME, value=name) - - def find_elements_by_tag_name(self, name): - warnings.warn("find_elements_by_tag_name is deprecated. Please use find_elements(by=By.TAG_NAME, value=name) instead") - return self.find_elements(by=By.TAG_NAME, value=name) - - def find_element_by_class_name(self, name): - warnings.warn("find_element_by_class_name is deprecated. Please use find_element(by=By.CLASS_NAME, value=name) instead") - return self.find_element(by=By.CLASS_NAME, value=name) - - def find_elements_by_class_name(self, name): - warnings.warn("find_elements_by_class_name is deprecated. Please use find_elements(by=By.CLASS_NAME, value=name) instead") - return self.find_elements(by=By.CLASS_NAME, value=name) - - def find_element_by_css_selector(self, css_selector): - warnings.warn("find_element_by_css_selector is deprecated. Please use find_element(by=By.CSS_SELECTOR, value=css_selector) instead") - return self.find_element(by=By.CSS_SELECTOR, value=css_selector) - - def find_elements_by_css_selector(self, css_selector): - warnings.warn("find_elements_by_css_selector is deprecated. Please use find_elements(by=By.CSS_SELECTOR, value=css_selector) instead") - return self.find_elements(by=By.CSS_SELECTOR, value=css_selector) - def _dispatch(self, l_call, l_args, d_call, d_args): getattr(self._listener, "before_%s" % l_call)(*l_args) try: @@ -260,70 +194,6 @@ def find_element(self, by=By.ID, value=None): def find_elements(self, by=By.ID, value=None): return self._dispatch("find", (by, value, self._driver), "find_elements", (by, value)) - def find_element_by_id(self, id_): - warnings.warn("find_element_by_id is deprecated. Please use find_element(by=By.ID, value=id_) instead") - return self.find_element(by=By.ID, value=id_) - - def find_elements_by_id(self, id_): - warnings.warn("find_elements_by_id is deprecated. Please use find_elements(by=By.ID, value=id_) instead") - return self.find_elements(by=By.ID, value=id_) - - def find_element_by_name(self, name): - warnings.warn("find_element_by_name is deprecated. Please use find_element(by=By.NAME, value=name) instead") - return self.find_element(by=By.NAME, value=name) - - def find_elements_by_name(self, name): - warnings.warn("find_elements_by_name is deprecated. Please use find_elements(by=By.NAME, value=name)=By.NAME, value=name) instead") - return self.find_elements(by=By.NAME, value=name) - - def find_element_by_link_text(self, link_text): - warnings.warn("find_element_by_link_text is deprecated. Please use find_element(by=By.LINK_TEXT, value=link_text) instead") - return self.find_element(by=By.LINK_TEXT, value=link_text) - - def find_elements_by_link_text(self, link_text): - warnings.warn("find_elements_by_link_text is deprecated. Please use find_elements(by=By.LINK_TEXT, value=text) instead") - return self.find_elements(by=By.LINK_TEXT, value=link_text) - - def find_element_by_partial_link_text(self, link_text): - warnings.warn("find_element_by_partial_link_text is deprecated. Please use find_element(by=By.PARTIAL_LINK_TEXT, value=link_text) instead") - return self.find_element(by=By.PARTIAL_LINK_TEXT, value=link_text) - - def find_elements_by_partial_link_text(self, link_text): - warnings.warn("find_elements_by_partial_link_text is deprecated. Please use find_elements(by=By.PARTIAL_LINK_TEXT, value=link_text) instead") - return self.find_elements(by=By.PARTIAL_LINK_TEXT, value=link_text) - - def find_element_by_tag_name(self, name): - warnings.warn("find_element_by_tag_name is deprecated. Please use find_element(by=By.TAG_NAME, value=name) instead") - return self.find_element(by=By.TAG_NAME, value=name) - - def find_elements_by_tag_name(self, name): - warnings.warn("find_elements_by_tag_name is deprecated. Please use find_elements(by=By.TAG_NAME, value=name) instead") - return self.find_elements(by=By.TAG_NAME, value=name) - - def find_element_by_xpath(self, xpath): - warnings.warn("find_element_by_xpath is deprecated. Please use find_element(by=By.XPATH, value=xpath) instead") - return self.find_element(by=By.XPATH, value=xpath) - - def find_elements_by_xpath(self, xpath): - warnings.warn("find_elements_by_xpath is deprecated. Please use find_elements(by=By.XPATH, value=xpath) instead") - return self.find_elements(by=By.XPATH, value=xpath) - - def find_element_by_class_name(self, name): - warnings.warn("find_element_by_class_name is deprecated. Please use find_element(by=By.CLASS_NAME, value=name) instead") - return self.find_element(by=By.CLASS_NAME, value=name) - - def find_elements_by_class_name(self, name): - warnings.warn("find_elements_by_class_name is deprecated. Please use find_elements(by=By.CLASS_NAME, value=name) instead") - return self.find_elements(by=By.CLASS_NAME, value=name) - - def find_element_by_css_selector(self, css_selector): - warnings.warn("find_element_by_css_selector is deprecated. Please use find_element(by=By.CSS_SELECTOR, value=css_selector) instead") - return self.find_element(by=By.CSS_SELECTOR, value=css_selector) - - def find_elements_by_css_selector(self, css_selector): - warnings.warn("find_elements_by_css_selector is deprecated. Please use find_elements(by=By.CSS_SELECTOR, value=css_selector) instead") - return self.find_elements(by=By.CSS_SELECTOR, value=css_selector) - def _dispatch(self, l_call, l_args, d_call, d_args): getattr(self._listener, "before_%s" % l_call)(*l_args) try: diff --git a/py/test/selenium/webdriver/common/driver_element_finding_tests.py b/py/test/selenium/webdriver/common/driver_element_finding_tests.py index 083efcd0a2699..a94bf13d6032d 100755 --- a/py/test/selenium/webdriver/common/driver_element_finding_tests.py +++ b/py/test/selenium/webdriver/common/driver_element_finding_tests.py @@ -627,7 +627,7 @@ def test_should_be_able_to_find_ahidden_elements_by_name(driver, pages): assert element.get_attribute("name") == "hidden" -def test_should_not_be_able_to_find_an_element_on_ablank_page(driver, pages): +def test_should_not_be_able_to_find_an_element_on_a_blank_page(driver, pages): driver.get("about:blank") with pytest.raises(NoSuchElementException): driver.find_element(By.TAG_NAME, "a")