diff --git a/tests/ui/bans_page.py b/tests/ui/bans_page.py index 69015049b..97ee0d835 100644 --- a/tests/ui/bans_page.py +++ b/tests/ui/bans_page.py @@ -114,22 +114,21 @@ try: delete_ban_checkbox = safe_get_element(DRIVER, By.XPATH, "//input[@id='ban-item-2']") assert isinstance(delete_ban_checkbox, WebElement), "Delete checkbox is not WebElement" - DRIVER.execute_script("arguments[0].click()", delete_ban_checkbox) + DRIVER.execute_script(f"""document.querySelector('input[id="ban-item-2"]').click()""") log_info("Ban item id=2 checkbox clicked ...") unban_button = safe_get_element(DRIVER, By.XPATH, "//button[@data-unban-btn='']") assert isinstance(unban_button, WebElement), "Delete button is not WebElement" + DRIVER.execute_script(f"""document.querySelector('button[data-unban-btn]').click()""") - DRIVER.execute_script("arguments[0].click()", unban_button) - - log_info("Unban button clicked, access bans ...") + log_info("Unban button clicked, wait to check if delete ...") sleep(3) - access_page(DRIVER, False, "bans", False) + safe_get_element(DRIVER, By.XPATH, "//button[@data-unban-btn='']") - log_info("Acces page after delete action ...") + log_info("Start checking if delete action worked ...") try: entries = safe_get_element(DRIVER, By.XPATH, "//ul[@data-bans-list='']/li", multiple=True, error=True) diff --git a/tests/ui/global_config_page.py b/tests/ui/global_config_page.py index 910715fb0..5521de508 100644 --- a/tests/ui/global_config_page.py +++ b/tests/ui/global_config_page.py @@ -33,13 +33,13 @@ try: # Reset btn_keyword.send_keys("") - + no_errors = True retries = 0 while no_errors: try: log_info("Trying to save the global config without changing anything ...") - access_page(DRIVER, "//form[@id='form-edit-global-configs']//button[@type='submit']", "global config", False) + access_page(DRIVER, "//form[@id='form-edit-global-config']//button[@type='submit']", "global config", False) log_info("The page reloaded successfully, checking the message ...") assert_alert_message(DRIVER, "The global configuration was not edited because no values were changed.") @@ -71,7 +71,7 @@ try: input_worker.clear() input_worker.send_keys("ZZZ") - assert_button_click(DRIVER, "//form[@id='form-edit-global-configs']//button[@type='submit']") + assert_button_click(DRIVER, "//form[@id='form-edit-global-config']//button[@type='submit']") assert_alert_message(DRIVER, "The global configuration was not edited because no values were changed.") log_info("The form was not submitted, trying to edit the global config with good values ...") @@ -79,7 +79,7 @@ try: input_worker.clear() input_worker.send_keys("4096") - access_page(DRIVER, "//form[@id='form-edit-global-configs']//button[@type='submit']", "global config", False) + access_page(DRIVER, "//form[@id='form-edit-global-config']//button[@type='submit']", "global config", False) if TEST_TYPE == "linux": wait_for_service() diff --git a/tests/ui/services_page.py b/tests/ui/services_page.py index 7a10323b8..40d684071 100644 --- a/tests/ui/services_page.py +++ b/tests/ui/services_page.py @@ -354,8 +354,6 @@ try: if TEST_TYPE == "linux": wait_for_service() - assert_alert_message(DRIVER, "has been deleted.") - log_info("Service app3.example.com has been deleted, checking if it's still present ...") try: