Better error-handling output
This commit is contained in:
Michael Mintz
parent
43b7e0a525
commit
63e571b86f
|
|
@ -230,7 +230,11 @@ class BaseCase(unittest.TestCase):
|
|||
self.__shadow_click(selector, timeout)
|
||||
return
|
||||
element = page_actions.wait_for_element_visible(
|
||||
self.driver, selector, by, timeout=timeout
|
||||
self.driver,
|
||||
selector,
|
||||
by,
|
||||
timeout=timeout,
|
||||
original_selector=original_selector,
|
||||
)
|
||||
self.__demo_mode_highlight_if_active(original_selector, original_by)
|
||||
if scroll and not self.demo_mode and not self.slow_mode:
|
||||
|
|
@ -280,7 +284,11 @@ class BaseCase(unittest.TestCase):
|
|||
self.wait_for_ready_state_complete()
|
||||
time.sleep(0.16)
|
||||
element = page_actions.wait_for_element_visible(
|
||||
self.driver, selector, by, timeout=timeout
|
||||
self.driver,
|
||||
selector,
|
||||
by,
|
||||
timeout=timeout,
|
||||
original_selector=original_selector,
|
||||
)
|
||||
try:
|
||||
self.__scroll_to_element(element, selector, by)
|
||||
|
|
@ -297,7 +305,11 @@ class BaseCase(unittest.TestCase):
|
|||
self.wait_for_ready_state_complete()
|
||||
time.sleep(0.1)
|
||||
element = page_actions.wait_for_element_visible(
|
||||
self.driver, selector, by, timeout=timeout
|
||||
self.driver,
|
||||
selector,
|
||||
by,
|
||||
timeout=timeout,
|
||||
original_selector=original_selector,
|
||||
)
|
||||
href = None
|
||||
new_tab = False
|
||||
|
|
@ -344,7 +356,11 @@ class BaseCase(unittest.TestCase):
|
|||
except Exception:
|
||||
# One more attempt to click on the element
|
||||
element = page_actions.wait_for_element_visible(
|
||||
self.driver, selector, by, timeout=timeout
|
||||
self.driver,
|
||||
selector,
|
||||
by,
|
||||
timeout=timeout,
|
||||
original_selector=original_selector,
|
||||
)
|
||||
element.click()
|
||||
latest_window_count = len(self.driver.window_handles)
|
||||
|
|
@ -410,7 +426,11 @@ class BaseCase(unittest.TestCase):
|
|||
original_by = by
|
||||
selector, by = self.__recalculate_selector(selector, by)
|
||||
element = page_actions.wait_for_element_visible(
|
||||
self.driver, selector, by, timeout=timeout
|
||||
self.driver,
|
||||
selector,
|
||||
by,
|
||||
timeout=timeout,
|
||||
original_selector=original_selector,
|
||||
)
|
||||
self.__demo_mode_highlight_if_active(original_selector, original_by)
|
||||
if not self.demo_mode and not self.slow_mode:
|
||||
|
|
@ -418,7 +438,11 @@ class BaseCase(unittest.TestCase):
|
|||
self.wait_for_ready_state_complete()
|
||||
# Find the element one more time in case scrolling hid it
|
||||
element = page_actions.wait_for_element_visible(
|
||||
self.driver, selector, by, timeout=timeout
|
||||
self.driver,
|
||||
selector,
|
||||
by,
|
||||
timeout=timeout,
|
||||
original_selector=original_selector,
|
||||
)
|
||||
pre_action_url = self.driver.current_url
|
||||
try:
|
||||
|
|
@ -1906,7 +1930,7 @@ class BaseCase(unittest.TestCase):
|
|||
selector = self.convert_to_css_selector(selector, By.XPATH)
|
||||
by = By.CSS_SELECTOR
|
||||
self.wait_for_element_visible(
|
||||
selector, by=by, timeout=settings.SMALL_TIMEOUT
|
||||
original_selector, by=original_by, timeout=settings.SMALL_TIMEOUT
|
||||
)
|
||||
self.__demo_mode_highlight_if_active(original_selector, original_by)
|
||||
self.scroll_to(selector, by=by)
|
||||
|
|
@ -1971,7 +1995,7 @@ class BaseCase(unittest.TestCase):
|
|||
click_selector, click_by
|
||||
)
|
||||
dropdown_element = self.wait_for_element_visible(
|
||||
hover_selector, by=hover_by, timeout=timeout
|
||||
original_selector, by=original_by, timeout=timeout
|
||||
)
|
||||
self.__demo_mode_highlight_if_active(original_selector, original_by)
|
||||
self.scroll_to(hover_selector, by=hover_by)
|
||||
|
|
@ -2073,7 +2097,7 @@ class BaseCase(unittest.TestCase):
|
|||
click_selector, click_by
|
||||
)
|
||||
dropdown_element = self.wait_for_element_visible(
|
||||
hover_selector, by=hover_by, timeout=timeout
|
||||
original_selector, by=original_by, timeout=timeout
|
||||
)
|
||||
self.__demo_mode_highlight_if_active(original_selector, original_by)
|
||||
self.scroll_to(hover_selector, by=hover_by)
|
||||
|
|
@ -4421,9 +4445,11 @@ class BaseCase(unittest.TestCase):
|
|||
timeout = settings.SMALL_TIMEOUT
|
||||
if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
|
||||
timeout = self.__get_new_timeout(timeout)
|
||||
original_selector = selector
|
||||
original_by = by
|
||||
selector, by = self.__recalculate_selector(selector, by)
|
||||
element = self.wait_for_element_visible(
|
||||
selector, by=by, timeout=timeout
|
||||
original_selector, by=original_by, timeout=timeout
|
||||
)
|
||||
try:
|
||||
scroll_distance = js_utils.get_scroll_distance_to_element(
|
||||
|
|
@ -4437,7 +4463,7 @@ class BaseCase(unittest.TestCase):
|
|||
self.wait_for_ready_state_complete()
|
||||
time.sleep(0.12)
|
||||
element = self.wait_for_element_visible(
|
||||
selector, by=by, timeout=timeout
|
||||
original_selector, by=original_by, timeout=timeout
|
||||
)
|
||||
self.__slow_scroll_to_element(element)
|
||||
|
||||
|
|
@ -6798,11 +6824,16 @@ class BaseCase(unittest.TestCase):
|
|||
timeout = settings.LARGE_TIMEOUT
|
||||
if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
|
||||
timeout = self.__get_new_timeout(timeout)
|
||||
original_selector = selector
|
||||
selector, by = self.__recalculate_selector(selector, by)
|
||||
if self.__is_shadow_selector(selector):
|
||||
return self.__wait_for_shadow_element_visible(selector, timeout)
|
||||
return page_actions.wait_for_element_visible(
|
||||
self.driver, selector, by, timeout
|
||||
self.driver,
|
||||
selector,
|
||||
by,
|
||||
timeout=timeout,
|
||||
original_selector=original_selector,
|
||||
)
|
||||
|
||||
def wait_for_element_not_present(
|
||||
|
|
@ -6819,9 +6850,14 @@ class BaseCase(unittest.TestCase):
|
|||
timeout = settings.LARGE_TIMEOUT
|
||||
if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
|
||||
timeout = self.__get_new_timeout(timeout)
|
||||
original_selector = selector
|
||||
selector, by = self.__recalculate_selector(selector, by)
|
||||
return page_actions.wait_for_element_absent(
|
||||
self.driver, selector, by, timeout
|
||||
self.driver,
|
||||
selector,
|
||||
by,
|
||||
timeout=timeout,
|
||||
original_selector=original_selector,
|
||||
)
|
||||
|
||||
def assert_element_not_present(
|
||||
|
|
@ -9230,11 +9266,16 @@ class BaseCase(unittest.TestCase):
|
|||
timeout = settings.LARGE_TIMEOUT
|
||||
if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
|
||||
timeout = self.__get_new_timeout(timeout)
|
||||
original_selector = selector
|
||||
selector, by = self.__recalculate_selector(selector, by)
|
||||
if self.__is_shadow_selector(selector):
|
||||
return self.__wait_for_shadow_element_present(selector, timeout)
|
||||
return page_actions.wait_for_element_present(
|
||||
self.driver, selector, by, timeout
|
||||
self.driver,
|
||||
selector,
|
||||
by,
|
||||
timeout=timeout,
|
||||
original_selector=original_selector,
|
||||
)
|
||||
|
||||
def wait_for_element(self, selector, by=By.CSS_SELECTOR, timeout=None):
|
||||
|
|
@ -9801,9 +9842,14 @@ class BaseCase(unittest.TestCase):
|
|||
timeout = settings.LARGE_TIMEOUT
|
||||
if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
|
||||
timeout = self.__get_new_timeout(timeout)
|
||||
original_selector = selector
|
||||
selector, by = self.__recalculate_selector(selector, by)
|
||||
return page_actions.wait_for_element_absent(
|
||||
self.driver, selector, by, timeout
|
||||
self.driver,
|
||||
selector,
|
||||
by,
|
||||
timeout=timeout,
|
||||
original_selector=original_selector,
|
||||
)
|
||||
|
||||
def assert_element_absent(
|
||||
|
|
@ -9837,9 +9883,14 @@ class BaseCase(unittest.TestCase):
|
|||
timeout = settings.LARGE_TIMEOUT
|
||||
if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
|
||||
timeout = self.__get_new_timeout(timeout)
|
||||
original_selector = selector
|
||||
selector, by = self.__recalculate_selector(selector, by)
|
||||
return page_actions.wait_for_element_not_visible(
|
||||
self.driver, selector, by, timeout
|
||||
self.driver,
|
||||
selector,
|
||||
by,
|
||||
timeout=timeout,
|
||||
original_selector=original_selector,
|
||||
)
|
||||
|
||||
def assert_element_not_visible(
|
||||
|
|
|
|||
|
|
@ -279,7 +279,11 @@ def hover_element_and_double_click(
|
|||
|
||||
|
||||
def wait_for_element_present(
|
||||
driver, selector, by=By.CSS_SELECTOR, timeout=settings.LARGE_TIMEOUT
|
||||
driver,
|
||||
selector,
|
||||
by=By.CSS_SELECTOR,
|
||||
timeout=settings.LARGE_TIMEOUT,
|
||||
original_selector=None,
|
||||
):
|
||||
"""
|
||||
Searches for the specified element by the given selector. Returns the
|
||||
|
|
@ -291,6 +295,7 @@ def wait_for_element_present(
|
|||
selector - the locator for identifying the page element (required)
|
||||
by - the type of selector being used (Default: By.CSS_SELECTOR)
|
||||
timeout - the time to wait for elements in seconds
|
||||
original_selector - handle pre-converted ":contains(TEXT)" selector
|
||||
@Returns
|
||||
A web element object
|
||||
"""
|
||||
|
|
@ -311,16 +316,28 @@ def wait_for_element_present(
|
|||
if timeout == 1:
|
||||
plural = ""
|
||||
if not element:
|
||||
if (
|
||||
original_selector
|
||||
and ":contains(" in original_selector
|
||||
and "contains(." in selector
|
||||
):
|
||||
selector = original_selector
|
||||
message = "Element {%s} was not present after %s second%s!" % (
|
||||
selector,
|
||||
timeout,
|
||||
plural,
|
||||
)
|
||||
timeout_exception(NoSuchElementException, message)
|
||||
else:
|
||||
return element
|
||||
|
||||
|
||||
def wait_for_element_visible(
|
||||
driver, selector, by=By.CSS_SELECTOR, timeout=settings.LARGE_TIMEOUT
|
||||
driver,
|
||||
selector,
|
||||
by=By.CSS_SELECTOR,
|
||||
timeout=settings.LARGE_TIMEOUT,
|
||||
original_selector=None,
|
||||
):
|
||||
"""
|
||||
Searches for the specified element by the given selector. Returns the
|
||||
|
|
@ -334,6 +351,7 @@ def wait_for_element_visible(
|
|||
selector - the locator for identifying the page element (required)
|
||||
by - the type of selector being used (Default: By.CSS_SELECTOR)
|
||||
timeout - the time to wait for elements in seconds
|
||||
original_selector - handle pre-converted ":contains(TEXT)" selector
|
||||
@Returns
|
||||
A web element object
|
||||
"""
|
||||
|
|
@ -360,6 +378,12 @@ def wait_for_element_visible(
|
|||
if timeout == 1:
|
||||
plural = ""
|
||||
if not element and by != By.LINK_TEXT:
|
||||
if (
|
||||
original_selector
|
||||
and ":contains(" in original_selector
|
||||
and "contains(." in selector
|
||||
):
|
||||
selector = original_selector
|
||||
if not is_present:
|
||||
# The element does not exist in the HTML
|
||||
message = "Element {%s} was not present after %s second%s!" % (
|
||||
|
|
@ -375,13 +399,15 @@ def wait_for_element_visible(
|
|||
plural,
|
||||
)
|
||||
timeout_exception(ElementNotVisibleException, message)
|
||||
if not element and by == By.LINK_TEXT:
|
||||
elif not element and by == By.LINK_TEXT:
|
||||
message = "Link text {%s} was not visible after %s second%s!" % (
|
||||
selector,
|
||||
timeout,
|
||||
plural,
|
||||
)
|
||||
timeout_exception(ElementNotVisibleException, message)
|
||||
else:
|
||||
return element
|
||||
|
||||
|
||||
def wait_for_text_visible(
|
||||
|
|
@ -406,6 +432,7 @@ def wait_for_text_visible(
|
|||
selector - the locator for identifying the page element (required)
|
||||
by - the type of selector being used (Default: By.CSS_SELECTOR)
|
||||
timeout - the time to wait for elements in seconds
|
||||
browser - used to handle a special edge case when using Safari
|
||||
@Returns
|
||||
A web element object that contains the text searched for
|
||||
"""
|
||||
|
|
@ -456,6 +483,8 @@ def wait_for_text_visible(
|
|||
% (text, selector, timeout, plural)
|
||||
)
|
||||
timeout_exception(ElementNotVisibleException, message)
|
||||
else:
|
||||
return element
|
||||
|
||||
|
||||
def wait_for_exact_text_visible(
|
||||
|
|
@ -480,6 +509,7 @@ def wait_for_exact_text_visible(
|
|||
selector - the locator for identifying the page element (required)
|
||||
by - the type of selector being used (Default: By.CSS_SELECTOR)
|
||||
timeout - the time to wait for elements in seconds
|
||||
browser - used to handle a special edge case when using Safari
|
||||
@Returns
|
||||
A web element object that contains the text searched for
|
||||
"""
|
||||
|
|
@ -532,6 +562,8 @@ def wait_for_exact_text_visible(
|
|||
"after %s second%s!" % (text, selector, timeout, plural)
|
||||
)
|
||||
timeout_exception(ElementNotVisibleException, message)
|
||||
else:
|
||||
return element
|
||||
|
||||
|
||||
def wait_for_attribute(
|
||||
|
|
@ -618,10 +650,16 @@ def wait_for_attribute(
|
|||
% (value, attribute, selector, timeout, plural, found_value)
|
||||
)
|
||||
timeout_exception(NoSuchAttributeException, message)
|
||||
else:
|
||||
return element
|
||||
|
||||
|
||||
def wait_for_element_absent(
|
||||
driver, selector, by=By.CSS_SELECTOR, timeout=settings.LARGE_TIMEOUT
|
||||
driver,
|
||||
selector,
|
||||
by=By.CSS_SELECTOR,
|
||||
timeout=settings.LARGE_TIMEOUT,
|
||||
original_selector=None,
|
||||
):
|
||||
"""
|
||||
Searches for the specified element by the given selector.
|
||||
|
|
@ -632,6 +670,7 @@ def wait_for_element_absent(
|
|||
selector - the locator for identifying the page element (required)
|
||||
by - the type of selector being used (Default: By.CSS_SELECTOR)
|
||||
timeout - the time to wait for elements in seconds
|
||||
original_selector - handle pre-converted ":contains(TEXT)" selector
|
||||
"""
|
||||
start_ms = time.time() * 1000.0
|
||||
stop_ms = start_ms + (timeout * 1000.0)
|
||||
|
|
@ -648,6 +687,12 @@ def wait_for_element_absent(
|
|||
plural = "s"
|
||||
if timeout == 1:
|
||||
plural = ""
|
||||
if (
|
||||
original_selector
|
||||
and ":contains(" in original_selector
|
||||
and "contains(." in selector
|
||||
):
|
||||
selector = original_selector
|
||||
message = "Element {%s} was still present after %s second%s!" % (
|
||||
selector,
|
||||
timeout,
|
||||
|
|
@ -657,7 +702,11 @@ def wait_for_element_absent(
|
|||
|
||||
|
||||
def wait_for_element_not_visible(
|
||||
driver, selector, by=By.CSS_SELECTOR, timeout=settings.LARGE_TIMEOUT
|
||||
driver,
|
||||
selector,
|
||||
by=By.CSS_SELECTOR,
|
||||
timeout=settings.LARGE_TIMEOUT,
|
||||
original_selector=None,
|
||||
):
|
||||
"""
|
||||
Searches for the specified element by the given selector.
|
||||
|
|
@ -668,6 +717,7 @@ def wait_for_element_not_visible(
|
|||
selector - the locator for identifying the page element (required)
|
||||
by - the type of selector being used (Default: By.CSS_SELECTOR)
|
||||
timeout - the time to wait for the element in seconds
|
||||
original_selector - handle pre-converted ":contains(TEXT)" selector
|
||||
"""
|
||||
start_ms = time.time() * 1000.0
|
||||
stop_ms = start_ms + (timeout * 1000.0)
|
||||
|
|
@ -687,6 +737,12 @@ def wait_for_element_not_visible(
|
|||
plural = "s"
|
||||
if timeout == 1:
|
||||
plural = ""
|
||||
if (
|
||||
original_selector
|
||||
and ":contains(" in original_selector
|
||||
and "contains(." in selector
|
||||
):
|
||||
selector = original_selector
|
||||
message = "Element {%s} was still visible after %s second%s!" % (
|
||||
selector,
|
||||
timeout,
|
||||
|
|
|
|||
Loading…
Reference in New Issue