From 4c3e356e781799b9ac4861abcdefd70a880afdc4 Mon Sep 17 00:00:00 2001 From: Jani Mikkonen Date: Thu, 23 Jan 2020 11:56:20 +0200 Subject: [PATCH] EventFiringWebElement support for ElementFinder Fixes #1538 --- .../event_firing_webdriver.robot | 9 ++++----- src/SeleniumLibrary/locators/elementfinder.py | 3 ++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/atest/acceptance/2-event_firing_webdriver/event_firing_webdriver.robot b/atest/acceptance/2-event_firing_webdriver/event_firing_webdriver.robot index f89cb36cb..32973833b 100644 --- a/atest/acceptance/2-event_firing_webdriver/event_firing_webdriver.robot +++ b/atest/acceptance/2-event_firing_webdriver/event_firing_webdriver.robot @@ -31,9 +31,8 @@ Event Firing Webdriver Input Text (WebElement) ... LOG 1:14 INFO After clear and send_keys Input Text //input[@name="textfield"] FooBar -Event Firing Webdriver Click Element (WebElement) +Event Firing Webdriver With Get WebElement (WebElement) [Tags] NoGrid - [Documentation] - ... LOG 1:5 INFO Before click - ... LOG 1:9 INFO After click - Click Element //input[@name="ok_button"] + Go To ${ROOT}/nested_divs.html + ${link}= Get WebElement //a[@id="needleC"] + Wait Until Element Contains ${link} top/c/needle diff --git a/src/SeleniumLibrary/locators/elementfinder.py b/src/SeleniumLibrary/locators/elementfinder.py index bc51ce7ae..ea29fd37e 100644 --- a/src/SeleniumLibrary/locators/elementfinder.py +++ b/src/SeleniumLibrary/locators/elementfinder.py @@ -17,6 +17,7 @@ from robot.api import logger from robot.utils import NormalizedDict from selenium.webdriver.remote.webelement import WebElement +from selenium.webdriver.support.event_firing_webdriver import EventFiringWebElement from SeleniumLibrary.base import ContextAware from SeleniumLibrary.errors import ElementNotFound @@ -102,7 +103,7 @@ def unregister(self, strategy_name): def _is_webelement(self, element): # Hook for unit tests - return isinstance(element, WebElement) + return isinstance(element, (WebElement, EventFiringWebElement)) def _disallow_webelement_parent(self, element): if self._is_webelement(element):