Utilities/common
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 'condition' in 'locate' function

Browse Source
This commit is contained in:
break27
2026-04-22 18:18:19 +08:00
parent 480f08b547
commit 42a31c916f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/utils/selenium.py
View File

@@ -26,7 +26,7 @@ def sleep(seconds: float):
try: WebDriverWait(driver, seconds, seconds).until(lambda _: False) try: WebDriverWait(driver, seconds, seconds).until(lambda _: False)
except: pass except: pass
def locate(selector: str, wait=True, condition=None) -> WebElement: def locate(selector: str, wait=True, condition=True) -> WebElement:
while True: while True:
try: try:
locator = (By.CSS_SELECTOR, selector) locator = (By.CSS_SELECTOR, selector)
@@ -36,16 +36,16 @@ def locate(selector: str, wait=True, condition=None) -> WebElement:
element = WebDriverWait(driver, timeout).until(presence, 'Timeout') element = WebDriverWait(driver, timeout).until(presence, 'Timeout')
driver.execute_script("arguments[0].scrollIntoView({ block: 'center', inline: 'nearest' });", element) driver.execute_script("arguments[0].scrollIntoView({ block: 'center', inline: 'nearest' });", element)
if condition is not None: if condition is not None and condition != False:
predicate = condition or EC.visibility_of_element_located predicate = condition if callable(condition) else EC.visibility_of_element_located
element = WebDriverWait(driver, timeout).until(predicate(locator), 'Timeout') element = WebDriverWait(driver, timeout).until(predicate(locator), 'Timeout')
return element return element
except StaleElementReferenceException: except StaleElementReferenceException:
pass pass
def click(selector: str|WebElement, wait=True, condition=None): def click(selector: str|WebElement, wait=True, condition=False):
predicate = condition if condition is not None else EC.element_to_be_clickable predicate = None if condition is None else condition or EC.element_to_be_clickable
identity = ''.join(random.choices(string.ascii_uppercase + string.digits, k=8)) identity = ''.join(random.choices(string.ascii_uppercase + string.digits, k=8))
element = locate(selector, wait, predicate) if isinstance(selector, str) else selector element = locate(selector, wait, predicate) if isinstance(selector, str) else selector
counter = lambda: int(element.get_attribute(identity) or 0) counter = lambda: int(element.get_attribute(identity) or 0)