Merge branch 'main' into vs/Refactoring2

Author: vsangereanMOZ

modules/browser_object_panel_ui.py

@@ -39,14 +39,14 @@ def loaded(self):
             ]
             return all([EC.presence_of_element_located(el) for el in targeted])
 
+    @BasePage.context_chrome
     def open_panel_menu(self) -> BasePage:
         """
         Opens the PanelUi menu.
         """
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            panel_root = self.get_element("panel-ui-button")
-            panel_root.click()
-            self.menu = self.Menu(self, root=panel_root)
+        panel_root = self.get_element("panel-ui-button")
+        panel_root.click()
+        self.menu = self.Menu(self, root=panel_root)
         return self
 
     def select_panel_setting(self, name: str, *labels) -> BasePage:
@@ -181,13 +181,13 @@ def get_all_history(self) -> List[WebElement]:
             history_items = self.get_elements("bookmark-item")
             return history_items
 
+    @BasePage.context_chrome
     def redirect_to_about_logins_page(self) -> BasePage:
         """
         Opens the about:logins page by clicking the Password option in Hamburger Menu"
         """
         self.open_panel_menu()
-        with self.driver.context(self.driver.CONTEXT_CHROME):
-            self.get_element("password-button").click()
+        self.get_element("password-button").click()
         return self
 
     # Bookmarks section

modules/page_object_about_pages.py

@@ -12,6 +12,7 @@
 
 from modules.page_base import BasePage
 from modules.util import BrowserActions
+from selenium.webdriver import Firefox
 
 
 class AboutConfig(BasePage):
@@ -133,6 +134,10 @@ class AboutLogins(BasePage):
 
     URL_TEMPLATE = "about:logins"
 
+    def __init__(self, driver: Firefox, **kwargs):
+        super().__init__(driver, **kwargs)
+        self.ba = BrowserActions(self.driver)
+
     def click_add_login_button(self) -> Page:
         """Click the Add Login button"""
         self.get_element("create-login-button").click()
@@ -144,11 +149,10 @@ def create_new_login(self, form_info: dict) -> Page:
         Given a dict with keys that match the valid item types in the
         new login dialog, create a new login with those values through UI.
         """
-        ba = BrowserActions(self.driver)
         try:
             for item_type, value in form_info.items():
                 logging.info(f"Filling {item_type} with {value}")
-                ba.clear_and_fill(
+                self.ba.clear_and_fill(
                     self.get_element("login-item-type", labels=[item_type]), value
                 )
             logging.info("Clicking submit...")

tests/password_manager/test_about_logins_navigation_from_context_menu.py

@@ -16,7 +16,7 @@ def test_about_logins_navigation_from_login_form_context_menu(driver: Firefox):
     C2241087 - Verify that right-clicking the Username field in a login form and then the Manage Passwords option
     from context menu opens about:logins page in a new tab
     """
-
+    # Instantiate objects
     context_menu = ContextMenu(driver)
     tabs = TabBar(driver)
     login = LoginAutofill(driver).open()

tests/password_manager/test_about_logins_navigation_from_hamburger_menu.py

@@ -13,7 +13,7 @@ def test_about_logins_navigation_from_password_hamburger_menu(driver: Firefox):
     """
     C2241082 - Verify that clicking the Password option in Hamburger Menu opens about:logins page in a new tab
     """
-
+    # Instantiate objects
     panel_ui = PanelUi(driver)
     tabs = TabBar(driver)
 

tests/password_manager/test_about_logins_search_username.py

@@ -16,10 +16,11 @@ def test_about_logins_search_username(driver_and_saved_logins):
     """
     # Initializing objects
     (driver, usernames, logins) = driver_and_saved_logins
-    about_logins = AboutLogins(driver).open()
+    about_logins = AboutLogins(driver)
     ba = BrowserActions(driver)
 
-    # Search for a username with 2 results
+    # Open about:logins and search for a username with 2 results
+    about_logins.open()
     ba.clear_and_fill(about_logins.get_element("login-filter-input"), usernames[-1])
 
     # Check that only the correct 2 results are shown

tests/password_manager/test_about_logins_search_website.py

@@ -16,10 +16,11 @@ def test_about_logins_search_website(origins, driver_and_saved_logins):
     """
     # Initializing objects
     (driver, usernames, logins) = driver_and_saved_logins
-    about_logins = AboutLogins(driver).open()
+    about_logins = AboutLogins(driver)
     ba = BrowserActions(driver)
 
-    # Search for a website
+    # Open about:logins and search for a website
+    about_logins.open()
     ba.clear_and_fill(about_logins.get_element("login-filter-input"), origins[1])
 
     # Check that only the correct 1 result is shown

tests/password_manager/test_add_password_non_ascii_chars.py

@@ -13,10 +13,11 @@ def test_add_password_non_ascii_chars(driver: Firefox):
     """
     C2241113 Add password - non-ascii characters
     """
-    # instantiate object
-    about_logins = AboutLogins(driver).open()
+    # Instantiate object
+    about_logins = AboutLogins(driver)
 
-    # Click on the "Add password" button
+    # Open about:logins and click on the "Add password" button
+    about_logins.open()
     about_logins.click_add_login_button()
 
     # Complete all the fields with valid data and click the "Save" button.

tests/password_manager/test_add_password_save_valid_data.py

@@ -15,9 +15,10 @@ def test_add_password_save_valid_data(driver: Firefox):
     C2241112 Verify that a password can be added and saved
     """
     # instantiate object
-    about_logins = AboutLogins(driver).open()
+    about_logins = AboutLogins(driver)
 
-    # Click on the "Add password" button
+    # Open about:logins and click on the "Add password" button
+    about_logins.open()
     about_logins.click_add_login_button()
 
     # Complete all the fields with valid data and click the "Save" button.

tests/password_manager/test_add_primary_password.py

@@ -15,15 +15,19 @@ def hard_quit():
     return True
 
 
+PRIMARY_PASSWORD = "securePassword1"
+
+
 def test_add_primary_password(driver: Firefox):
     """
     C2245178: Verify that a primary password can be added in about:preferences#privacy
     """
     # Instantiate objects
-    about_prefs = AboutPrefs(driver, category="privacy").open()
+    about_prefs = AboutPrefs(driver, category="privacy")
     ba = BrowserActions(driver)
 
     # Select the "Use a primary password" check box to trigger the "Change Primary Password" window
+    about_prefs.open()
     about_prefs.click_on("use-primary-password")
     primary_pw_popup = about_prefs.get_element("browser-popup")
     ba.switch_to_iframe_context(primary_pw_popup)
@@ -32,8 +36,8 @@ def test_add_primary_password(driver: Firefox):
     about_prefs.element_attribute_contains("current-password", "disabled", "true")
 
     # Primary password can be changed
-    about_prefs.get_element("enter-new-password").send_keys("securePassword1")
-    about_prefs.get_element("reenter-new-password").send_keys("securePassword1")
+    about_prefs.get_element("enter-new-password").send_keys(PRIMARY_PASSWORD)
+    about_prefs.get_element("reenter-new-password").send_keys(PRIMARY_PASSWORD)
     about_prefs.click_on("submit-password")
 
     # Check that the pop-up appears

tests/password_manager/test_auto_saved_generated_password_context_menu.py

@@ -20,15 +20,16 @@ def test_auto_saved_generated_password_context_menu(driver: Firefox):
     """
     C2248176 - Securely Generated Password is auto-saved when generated from password field context menu
     """
-
+    # Instantiate objects
     context_menu = ContextMenu(driver)
     tabs = TabBar(driver)
-    login_autofill = LoginAutofill(driver).open()
+    login_autofill = LoginAutofill(driver)
     nav = Navigation(driver)
     about_logins = AboutLogins(driver)
     autofill_popup_panel = AutofillPopup(driver)
 
-    # Select "Suggest Strong Password..." from password field context menu
+    # Open login autofill test page and select "Suggest Strong Password..." from password field context menu
+    login_autofill.open()
     password_field = login_autofill.get_element("password-login-field")
     login_autofill.context_click(password_field)
     context_menu.click_and_hide_menu("context-menu-suggest-strong-password")