Merge pull request #564 from mozilla/Hani/refactor_pass_manager_batch1

Hani/ Passwors manager first batch refactor

Author: sv-hyacoub

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")

tests/password_manager/test_autocomplete_dropdown_is_toggled_for_focused_login_fields_on_page_load.py

@@ -27,6 +27,7 @@ def test_autocomplete_dropdown_is_toggled_for_focused_login_fields_on_page_load(
     """
     C2240907 - Verify that autocomplete dropdown is toggled for focused login fields on page load
     """
+    # Instantiate objects
     tabs = TabBar(driver)
     about_logins = AboutLogins(driver)
     login_autofill = LoginAutofill(driver)

tests/password_manager/test_can_view_password_when_PP_enabled.py

@@ -17,11 +17,12 @@ def test_password_can_be_shown(driver: Firefox):
     C2264688: Verify that the Show Password button prompts for the Primary Password before revealing the saved login
     """
     # instantiate object
-    about_logins = AboutLogins(driver).open()
+    about_logins = AboutLogins(driver)
     about_prefs = AboutPrefs(driver, category="privacy")
     ba = BrowserActions(driver)
 
-    # Click on the "Add password" button
+    # Open about:login 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.
@@ -52,7 +53,7 @@ def test_password_can_be_shown(driver: Firefox):
         alert = about_prefs.get_alert()
         alert.accept()
 
-    about_logins = AboutLogins(driver).open()
+    about_logins.open()
     show_password_button = about_logins.get_element("show-password-checkbox")
     show_password_button.click()
 

tests/password_manager/test_changes_made_in_edit_mode_are_saved.py

@@ -14,9 +14,10 @@ def test_changes_made_in_edit_mode_are_saved(driver: Firefox):
     C2241121 - Verify that changes made in Edit Mode are saved
     """
     # instantiate object
-    about_logins = AboutLogins(driver).open()
+    about_logins = AboutLogins(driver)
 
-    # Add a new login
+    # Open about:logins and add a new login
+    about_logins.open()
     about_logins.click_add_login_button()
     about_logins.create_new_login(
         {

tests/password_manager/test_delete_login.py

@@ -17,10 +17,12 @@ def test_delete_login(driver_and_saved_logins):
     # Adds 6 fake logins in about:login
     driver, usernames, logins = driver_and_saved_logins
 
-    about_logins = AboutLogins(driver).open()
+    # Instantiate objects
+    about_logins = AboutLogins(driver)
     login_autofill = LoginAutofill(driver)
 
-    # Verify the initial number of saved passwords
+    # Open about:logins and verify the initial number of saved passwords
+    about_logins.open()
     password_count = about_logins.get_element("password-count")
     login_autofill.wait.until(
         lambda _: password_count.get_attribute("innerText") == "6 passwords"

tests/password_manager/test_multiple_saved_logins.py

@@ -38,6 +38,7 @@ def test_multiple_saved_logins(driver: Firefox, temp_selectors):
     # Instantiate objects
     about_logins = AboutLogins(driver)
     keyboard = Controller()
+    autofill_popup = AutofillPopup(driver)
 
     # Save 3 sets of credentials for facebook
     about_logins.open()
@@ -71,7 +72,6 @@ def test_multiple_saved_logins(driver: Firefox, temp_selectors):
     # Open saucedemo.com
     web_page = GenericPage(driver, url=SAUCEDEMO_URL).open()
     web_page.elements |= temp_selectors
-    autofill_popup = AutofillPopup(driver)
 
     # Verify that all 3 credentials and "Manage Passwords" footer are in the pop-up
     web_page.click_on("username-field")

tests/password_manager/test_never_save_login_via_doorhanger.py

@@ -24,13 +24,15 @@ def test_never_save_login_via_doorhanger(driver: Firefox):
     login form. Additionally, confirm that the demo page is correctly added to the 'Exceptions - Saved Passwords'
     list in the browser's preferences.
     """
-
-    login_autofill = LoginAutofill(driver).open()
+    # Instantiate objects
+    login_autofill = LoginAutofill(driver)
     autofill_popup_panel = AutofillPopup(driver)
     nav = Navigation(driver)
     ba = BrowserActions(driver)
+    about_prefs = AboutPrefs(driver, category="privacy")
 
     # Creating an instance of the LoginForm within the LoginAutofill page object
+    login_autofill.open()
     login_form = LoginAutofill.LoginForm(login_autofill)
 
     # Fill in the login form in demo page, opt for Never Save the credentials via doorhanger and see the doorhanger is
@@ -55,7 +57,7 @@ def test_never_save_login_via_doorhanger(driver: Firefox):
     login_autofill.wait.until(lambda _: password_element.get_attribute("value") == "")
 
     # Navigate to about:preferences#privacy and open Exceptions - Saved Passwords modal
-    about_prefs = AboutPrefs(driver, category="privacy").open()
+    about_prefs.open()
     iframe = about_prefs.get_password_exceptions_popup_iframe()
     ba.switch_to_iframe_context(iframe)
 

tests/password_manager/test_primary_password_triggered_on_about_logins_access.py

@@ -28,13 +28,14 @@ def test_primary_password_triggered_on_about_logins_access_via_hamburger_menu(
     """
 
     # Instantiate objects
-    about_prefs = AboutPrefs(driver, category="privacy").open()
+    about_prefs = AboutPrefs(driver, category="privacy")
     ba = BrowserActions(driver)
     panel_ui = PanelUi(driver)
     tabs = TabBar(driver)
     about_logins = AboutLogins(driver)
 
     # Enable the setup for primary password
+    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)

tests/password_manager/test_save_login_via_doorhanger.py

@@ -22,13 +22,14 @@ def test_save_login_via_doorhanger(driver: Firefox):
     C2243016 -  Verify that Firefox successfully saves login credentials via the save password doorhanger and
     autofill them on subsequent access
     """
-
-    login_autofill = LoginAutofill(driver).open()
+    # Instantiate objects
+    login_autofill = LoginAutofill(driver)
     autofill_popup_panel = AutofillPopup(driver)
     nav = Navigation(driver)
     context_menu = ContextMenu(driver)
 
     # Creating an instance of the LoginForm within the LoginAutofill page object
+    login_autofill.open()
     login_form = LoginAutofill.LoginForm(login_autofill)
 
     # Fill in the login form in demo page, save the login credentials via the doorhanger and see the doorhanger is

tests/password_manager/test_saved_hyperlink_redirects_to_corresponding_page.py

@@ -22,10 +22,12 @@ def test_saved_hyperlink_redirects_to_corresponding_page(driver: Firefox):
     """
     C2241089 - Verify that a saved hyperlink redirects to the corresponding page
     """
-    about_logins = AboutLogins(driver).open()
+    # Instantiate objects
+    about_logins = AboutLogins(driver)
     login_autofill = LoginAutofill(driver)
 
     # Add a new login
+    about_logins.open()
     about_logins.click_add_login_button()
     about_logins.create_new_login(
         {

tests/password_manager/test_update_login_via_doorhanger.py

@@ -22,13 +22,14 @@ def test_update_login_via_doorhanger(driver: Firefox):
     C2243013 - Verify that Firefox successfully updates login credentials via the update password doorhanger and
     autofill them on subsequent access
     """
-
-    login_autofill = LoginAutofill(driver).open()
+    # Instantiate objects
+    login_autofill = LoginAutofill(driver)
     autofill_popup_panel = AutofillPopup(driver)
     nav = Navigation(driver)
     context_menu = ContextMenu(driver)
 
     # Creating an instance of the LoginForm within the LoginAutofill page object
+    login_autofill.open()
     login_form = LoginAutofill.LoginForm(login_autofill)
 
     # Fill in the login form in demo page and save the login credentials via the doorhanger