change popup selectors structure

Author: OlehStefanyshyn

app/selenium_ui/bitbucket/pages/pages.py

@@ -103,9 +103,7 @@ def wait_for_navigation_panel(self):
 class PopupManager(BasePage):
 
     def dismiss_default_popup(self):
-        return self.dismiss_popup(PopupLocators.default_popup, PopupLocators.popup_1, PopupLocators.popup_2,
-                                  PopupLocators.popup_3, PopupLocators.popup_4, PopupLocators.popup_5,
-                                  PopupLocators.popup_6, PopupLocators.popup_7)
+        return self.dismiss_popup(PopupLocators.popup_selectors)
 
 
 class Repository(BasePage):

app/selenium_ui/bitbucket/pages/selectors.py

@@ -75,14 +75,16 @@ def projects_url(self):
 
 
 class PopupLocators:
-    default_popup = '.feature-discovery-close'
-    popup_1 = '.css-1it7f5o'
-    popup_2 = 'button.aui-button-link.feature-discovery-close'
-    popup_3 = '.css-15p34h1'
-    popup_4 = '.css-1dqf51u'
-    popup_5 = '.css-1kflcxk'
-    popup_6 = '.css-1gh2dqy'
-    popup_7 = "[data-testid='whats-new-modal'] button[aria-label='Close modal'] > span > span[aria-hidden='true']"
+    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']")
+    ]
 
 
 class LoginPageLocators:

app/selenium_ui/confluence/pages/pages.py

@@ -82,11 +82,7 @@ class AllUpdates(BasePage):
 class PopupManager(BasePage):
 
     def dismiss_default_popup(self):
-        return self.dismiss_popup(PopupLocators.timezone_popups, PopupLocators.skip_onbording_1,
-                                  PopupLocators.skip_onboarding_2,
-                                  PopupLocators.time_saving_template,
-                                  PopupLocators.welcome_to_confluence,
-                                  PopupLocators.dark_theme_popup)
+        return self.dismiss_popup(PopupLocators.popup_selectors)
 
 
 class Page(BasePage):

app/selenium_ui/confluence/pages/selectors.py

@@ -29,12 +29,14 @@ def logout_url(self):
 
 
 class PopupLocators:
-    timezone_popups = '.button-panel-button .set-timezone-button'
-    skip_onbording_1 = '.aui-button aui-button-link .skip-onboarding'
-    skip_onboarding_2 = '.aui-button.aui-button-link.skip-onboarding'
-    time_saving_template = '#closeDisDialog'
-    welcome_to_confluence = '.aui-button.aui-button-primary.show-onboarding'
-    dark_theme_popup = 'button[aria-label="Close this modal"]'
+    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']")
+    ]
 
 
 class LoginPageLocators:

app/selenium_ui/jira/pages/pages.py

@@ -12,7 +12,7 @@
 class PopupManager(BasePage):
 
     def dismiss_default_popup(self):
-        return self.dismiss_popup(PopupLocators.default_popup, PopupLocators.popup_1, PopupLocators.popup_2)
+        return self.dismiss_popup(PopupLocators.popup_selectors)
 
 
 class Login(BasePage):

app/selenium_ui/jira/pages/selectors.py

@@ -3,9 +3,11 @@
 
 
 class PopupLocators:
-    default_popup = '.aui-message .icon-close'
-    popup_1 = 'form.tip-footer>.helptip-close'
-    popup_2 = '.aui-inline-dialog-contents .cancel'
+    popup_selectors = [
+        ("css", ".aui-message .icon-close"),
+        ("css", "form.tip-footer>.helptip-close"),
+        ("css", ".aui-inline-dialog-contents .cancel")
+    ]
 
 
 class UrlManager: