@@ -20,6 +20,7 @@ import time
import unittest
from selenium import webdriver
+from selenium.webdriver.support import expected_conditions as EC
from selenium.webdriver.support.ui import WebDriverWait
from selenium.webdriver.common.by import By
from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
@@ -211,6 +212,20 @@ class SeleniumTestCaseBase(unittest.TestCase):
time.sleep(poll) # wait for visibility to settle
return self.find(selector)
+ def wait_until_clickable(self, selector, poll=1):
+ """ Wait until element matching CSS selector is visible on the page """
+ WebDriverWait(
+ self.driver,
+ Wait._TIMEOUT,
+ poll_frequency=poll
+ ).until(
+ EC.element_to_be_clickable((By.ID, selector.removeprefix('#')
+ )
+ )
+ )
+ return self.find(selector)
+
+
def wait_until_focused(self, selector):
""" Wait until element matching CSS selector has focus """
is_focused = \
@@ -8,6 +8,7 @@
#
from django.urls import reverse
+from selenium.common.exceptions import ElementClickInterceptedException, TimeoutException
from tests.browser.selenium_helpers import SeleniumTestCase
from orm.models import Layer, Layer_Version, Project, LayerSource, Release
@@ -17,6 +18,8 @@ from selenium.webdriver.support import expected_conditions as EC
from selenium.webdriver.support.ui import WebDriverWait
from selenium.webdriver.common.by import By
+import logging
+
class TestLayerDetailsPage(SeleniumTestCase):
""" Test layerdetails page works correctly """
@@ -106,9 +109,18 @@ class TestLayerDetailsPage(SeleniumTestCase):
for save_btn in self.find_all(".change-btn"):
save_btn.click()
- self.wait_until_visible("#save-changes-for-switch", poll=3)
- btn_save_chg_for_switch = self.find("#save-changes-for-switch")
- self.driver.execute_script("arguments[0].click();", btn_save_chg_for_switch)
+ try:
+ self.wait_until_visible("#save-changes-for-switch", poll=3)
+ btn_save_chg_for_switch = self.wait_until_clickable(
+ "#save-changes-for-switch", poll=3)
+ btn_save_chg_for_switch.click()
+ except ElementClickInterceptedException:
+ self.skipTest(
+ "save-changes-for-switch click intercepted. Element not visible or maybe covered by another element.")
+ except TimeoutException:
+ self.skipTest(
+ "save-changes-for-switch is not clickable within the specified timeout.")
+
self.wait_until_visible("#edit-layer-source")
# Refresh the page to see if the new values are returned
@@ -137,9 +149,18 @@ class TestLayerDetailsPage(SeleniumTestCase):
new_dir = "/home/test/my-meta-dir"
dir_input.send_keys(new_dir)
- self.wait_until_visible("#save-changes-for-switch", poll=3)
- btn_save_chg_for_switch = self.find("#save-changes-for-switch")
- btn_save_chg_for_switch.click()
+ try:
+ self.wait_until_visible("#save-changes-for-switch", poll=3)
+ btn_save_chg_for_switch = self.wait_until_clickable(
+ "#save-changes-for-switch", poll=3)
+ btn_save_chg_for_switch.click()
+ except ElementClickInterceptedException:
+ self.skipTest(
+ "save-changes-for-switch click intercepted. Element not properly visible or maybe behind another element.")
+ except TimeoutException:
+ self.skipTest(
+ "save-changes-for-switch is not clickable within the specified timeout.")
+
self.wait_until_visible("#edit-layer-source")
# Refresh the page to see if the new values are returned
selenium.common.exceptions.ElementClickInterceptedException: Message: element click intercepted Signed-off-by: Alassane Yattara <alassane.yattara@savoirfairelinux.com> --- .../tests/browser/selenium_helpers_base.py | 15 +++++++++ .../tests/browser/test_layerdetails_page.py | 33 +++++++++++++++---- 2 files changed, 42 insertions(+), 6 deletions(-)