upd logic

Author: OlehStefanyshyn

app/selenium_ui/base_page.py

@@ -134,18 +134,14 @@ def __wait_until(self, expected_condition, locator, time_out=timeout):
 
     def dismiss_popup(self, popup_selectors):
         for selector_type, selector_value in popup_selectors:
-            if selector_type.lower() == "css":
-                if self.driver.find_elements(by=By.CSS_SELECTOR, value=selector_value):
-                    try:
+            if self.driver.find_elements(by=selector_type, value=selector_value):
+                try:
+                    if selector_type == By.CSS_SELECTOR:
                         self.driver.execute_script(f"document.querySelector('{selector_value}').click()")
-                    except (WebDriverException, Exception):
-                        pass
-            elif selector_type.lower() == "xpath":
-                if self.driver.find_elements(by=By.XPATH, value=selector_value):
-                    try:
-                        self.driver.find_element(by=By.XPATH, value=selector_value).click()
-                    except (WebDriverException, Exception):
-                        pass
+                    elif selector_type == By.XPATH:
+                        self.driver.find_element(by=selector_type, value=selector_value).click()
+                except (WebDriverException, Exception):
+                    pass
 
     def return_to_parent_frame(self):
         return self.driver.switch_to.parent_frame()

app/selenium_ui/bitbucket/pages/selectors.py

@@ -76,14 +76,14 @@ def projects_url(self):
 
 class PopupLocators:
     popup_selectors = [
-        ("css", ".feature-discovery-close"),
-        ("css", ".css-1it7f5o"),
-        ("css", "button.aui-button-link.feature-discovery-close"),
-        ("css", ".css-15p34h1"),
-        ("css", ".css-1dqf51u"),
-        ("css", ".css-1kflcxk"),
-        ("css", ".css-1gh2dqy"),
-        ("css", "[data-testid='whats-new-modal'] button[aria-label='Close modal'] > span > span[aria-hidden='true']")
+        (By.CSS_SELECTOR, ".feature-discovery-close"),
+        (By.CSS_SELECTOR, ".css-1it7f5o"),
+        (By.CSS_SELECTOR, "button.aui-button-link.feature-discovery-close"),
+        (By.CSS_SELECTOR, ".css-15p34h1"),
+        (By.CSS_SELECTOR, ".css-1dqf51u"),
+        (By.CSS_SELECTOR, ".css-1kflcxk"),
+        (By.CSS_SELECTOR, ".css-1gh2dqy"),
+        (By.CSS_SELECTOR, "[data-testid='whats-new-modal'] button[aria-label='Close modal'] > span > span[aria-hidden='true']")
     ]
 
 

app/selenium_ui/confluence/pages/selectors.py

@@ -30,12 +30,12 @@ def logout_url(self):
 
 class PopupLocators:
     popup_selectors = [
-        ("css", ".button-panel-button .set-timezone-button"),
-        ("css", ".aui-button aui-button-link .skip-onboarding"),
-        ("css", ".aui-button.aui-button-link.skip-onboarding"),
-        ("css", "#closeDisDialog"),
-        ("css", ".aui-button.aui-button-primary.show-onboarding"),
-        ("css", "button[aria-label='Close this modal']")
+        (By.CSS_SELECTOR, ".button-panel-button .set-timezone-button"),
+        (By.CSS_SELECTOR, ".aui-button aui-button-link .skip-onboarding"),
+        (By.CSS_SELECTOR, ".aui-button.aui-button-link.skip-onboarding"),
+        (By.CSS_SELECTOR, "#closeDisDialog"),
+        (By.CSS_SELECTOR, ".aui-button.aui-button-primary.show-onboarding"),
+        (By.CSS_SELECTOR, "button[aria-label='Close this modal']")
     ]
 
 

app/selenium_ui/jira/pages/selectors.py

@@ -4,9 +4,9 @@
 
 class PopupLocators:
     popup_selectors = [
-        ("css", ".aui-message .icon-close"),
-        ("css", "form.tip-footer>.helptip-close"),
-        ("css", ".aui-inline-dialog-contents .cancel")
+        (By.CSS_SELECTOR, ".aui-message .icon-close"),
+        (By.CSS_SELECTOR, "form.tip-footer>.helptip-close"),
+        (By.CSS_SELECTOR, ".aui-inline-dialog-contents .cancel")
     ]
 
 

app/selenium_ui/jsm/pages/agent_selectors.py

@@ -4,15 +4,15 @@
 
 class PopupLocators:
     popup_selectors = [
-        ("css", ".aui-message .icon-close"),
-        ("css", "form.tip-footer>.helptip-close"),
-        ("css", ".aui-inline-dialog-contents .cancel"),
-        ("css", ".aui-close-button"),
-        ("css", ".aui-button aui-button-link"),
-        ("css", ".buttons-container > div > a"),
-        ("css", ".css-19r5em7"),
-        ("css", ".css-178ag6o"),
-        ("xpath", "//button[contains(text(),'Got it')]")
+        (By.CSS_SELECTOR, ".aui-message .icon-close"),
+        (By.CSS_SELECTOR, "form.tip-footer>.helptip-close"),
+        (By.CSS_SELECTOR, ".aui-inline-dialog-contents .cancel"),
+        (By.CSS_SELECTOR, ".aui-close-button"),
+        (By.CSS_SELECTOR, ".aui-button aui-button-link"),
+        (By.CSS_SELECTOR, ".buttons-container > div > a"),
+        (By.CSS_SELECTOR, ".css-19r5em7"),
+        (By.CSS_SELECTOR, ".css-178ag6o"),
+        (By.XPATH, "//button[contains(text(),'Got it')]")
     ]