Skip to content

Commit 57a6690

Browse files
committed
Simplify code for handling alerts
1 parent c331226 commit 57a6690

File tree

2 files changed

+32
-3
lines changed

2 files changed

+32
-3
lines changed

help_docs/method_summary.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -460,11 +460,14 @@ self.assert_text_not_visible(text, selector="html", by=By.CSS_SELECTOR, timeout=
460460

461461
############
462462

463-
self.wait_for_and_accept_alert(timeout=None)
463+
self.accept_alert(timeout=None)
464+
# Duplicates: self.wait_for_and_accept_alert(timeout=None)
464465

465-
self.wait_for_and_dismiss_alert(timeout=None)
466+
self.dismiss_alert(timeout=None)
467+
# Duplicates: self.wait_for_and_dismiss_alert(timeout=None)
466468

467-
self.wait_for_and_switch_to_alert(timeout=None)
469+
self.switch_to_alert(timeout=None)
470+
# Duplicates: self.wait_for_and_switch_to_alert(timeout=None)
468471

469472
############
470473

seleniumbase/fixtures/base_case.py

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4010,6 +4010,32 @@ def wait_for_and_switch_to_alert(self, timeout=None):
40104010

40114011
############
40124012

4013+
def accept_alert(self, timeout=None):
4014+
""" Same as wait_for_and_accept_alert(), but smaller default T_O """
4015+
if not timeout:
4016+
timeout = settings.SMALL_TIMEOUT
4017+
if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
4018+
timeout = self.__get_new_timeout(timeout)
4019+
return page_actions.wait_for_and_accept_alert(self.driver, timeout)
4020+
4021+
def dismiss_alert(self, timeout=None):
4022+
""" Same as wait_for_and_dismiss_alert(), but smaller default T_O """
4023+
if not timeout:
4024+
timeout = settings.SMALL_TIMEOUT
4025+
if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
4026+
timeout = self.__get_new_timeout(timeout)
4027+
return page_actions.wait_for_and_dismiss_alert(self.driver, timeout)
4028+
4029+
def switch_to_alert(self, timeout=None):
4030+
""" Same as wait_for_and_switch_to_alert(), but smaller default T_O """
4031+
if not timeout:
4032+
timeout = settings.SMALL_TIMEOUT
4033+
if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
4034+
timeout = self.__get_new_timeout(timeout)
4035+
return page_actions.wait_for_and_switch_to_alert(self.driver, timeout)
4036+
4037+
############
4038+
40134039
def __assert_eq(self, *args, **kwargs):
40144040
""" Minified assert_equal() using only the list diff. """
40154041
minified_exception = None

0 commit comments

Comments
 (0)