Hani/ Refactor Password Manager (#815)

* Refactor

* Skip failing test

* Edit bug number

---------

Co-authored-by: Hani Yacoub <[email protected]>

Author: sv-hyacoub

modules/page_object_about_pages.py

@@ -193,6 +193,12 @@ def remove_password_csv(self, downloads_dir):
             if delete_files_regex.match(file):
                 os.remove(passwords_csv)
 
+    def verify_csv_export(self, downloads_folder: str, filename: str):
+        """Wait until the exported CSV file is present in the target folder."""
+        csv_file = os.path.join(downloads_folder, filename)
+        self.wait.until(lambda _: os.path.exists(csv_file))
+        return csv_file
+
 
 class AboutPrivatebrowsing(BasePage):
     """

modules/page_object_autofill.py

@@ -807,6 +807,30 @@ def submit(self) -> None:
                 self.submit_button = self.parent.get_element("submit-button-login")
             self.submit_button.click()
 
+        def verify_password_value(self, expected_password: str, field: str = "password-login-field"):
+            """Wait until the password field contains the expected value."""
+            element = self.parent.get_element(field)
+            self.parent.wait.until(lambda _: element.get_attribute("value") == expected_password)
+            return element
+
+        def verify_username_value(self, expected_username: str, field: str = "username-login-field"):
+            """Wait until the username field contains the expected value."""
+            element = self.parent.get_element(field)
+            self.parent.wait.until(lambda _: element.get_attribute("value") == expected_username)
+            return element
+
+        def verify_password_length(self, expected_length: int = 8, field: str = "password-login-field"):
+            """Wait until the password field contains the expected number of characters."""
+            element = self.parent.get_element(field)
+            self.parent.wait.until(lambda _: len(element.get_attribute("value")) == expected_length)
+            return element
+
+        def verify_field_empty(self, field: str):
+            """Wait until the given field is empty."""
+            element = self.parent.get_element(field)
+            self.parent.wait.until(lambda _: element.get_attribute("value") == "")
+            return element
+
 
 class TextAreaFormAutofill(Autofill):
     """

tests/password_manager/test_add_primary_password.py

@@ -43,7 +43,6 @@ def test_add_primary_password(driver: Firefox):
     about_prefs.click_on("submit-password")
 
     # Check that the pop-up appears
-    with driver.context(driver.CONTEXT_CHROME):
-        alert = about_prefs.get_alert()
-        assert alert.text == ALERT_MESSAGE
-        alert.accept()
+    alert = about_prefs.get_alert()
+    assert alert.text == ALERT_MESSAGE
+    alert.accept()

tests/password_manager/test_auto_saved_generated_password_context_menu.py

@@ -52,13 +52,13 @@ def test_auto_saved_generated_password_context_menu(driver: Firefox):
     )
 
     # Verify the update doorhanger is displayed
-    with driver.context(driver.CONTEXT_CHROME):
-        sleep(3)
-        nav.click_on("password-notification-key")
-        autofill_popup_panel.expect(
-            lambda _: UPDATE_DOORHANGER_TEXT
-            in autofill_popup_panel.get_element("password-update-doorhanger").text
-        )
+    # with driver.context(driver.CONTEXT_CHROME):
+    sleep(3)
+    nav.click_on("password-notification-key")
+    autofill_popup_panel.expect(
+        lambda _: UPDATE_DOORHANGER_TEXT
+        in autofill_popup_panel.get_element("password-update-doorhanger").text
+    )
 
     # Navigate to about:logins page
     tabs.switch_to_new_tab()

tests/password_manager/test_can_view_password_when_PP_enabled.py

@@ -56,9 +56,9 @@ def test_password_can_be_shown(driver: Firefox):
     about_prefs.click_on("submit-password")
 
     # Check that the pop-up appears
-    with driver.context(driver.CONTEXT_CHROME):
-        alert = about_prefs.get_alert()
-        alert.accept()
+    # with driver.context(driver.CONTEXT_CHROME):
+    alert = about_prefs.get_alert()
+    alert.accept()
 
     about_logins.open()
     about_logins.click_on("show-password-checkbox")

tests/password_manager/test_never_save_login_via_doorhanger.py

@@ -53,12 +53,12 @@ def test_never_save_login_via_doorhanger(driver: Firefox):
     login_autofill.open()
 
     # Verify the username field is empty
-    username_element = login_autofill.get_element("username-login-field")
-    login_autofill.wait.until(lambda _: username_element.get_attribute("value") == "")
+    username_element = login_form.verify_field_empty("username-login-field")
+    assert username_element.get_attribute("value") == ""
 
     # Verify the password field is empty
-    password_element = login_autofill.get_element("password-login-field")
-    login_autofill.wait.until(lambda _: password_element.get_attribute("value") == "")
+    password_element = login_form.verify_field_empty("password-login-field")
+    assert password_element.get_attribute("value") == ""
 
     # Navigate to about:preferences#privacy and open Exceptions - Saved Passwords modal
     about_prefs.open()

tests/password_manager/test_password_csv_correctness.py

@@ -42,8 +42,8 @@ def test_password_csv_correctness(
     page.navigate_dialog_to_location(downloads_folder, PASSWORDS_FILE)
 
     # Verify the exported csv file is present in the target folder
-    csv_file = os.path.join(downloads_folder, PASSWORDS_FILE)
-    about_logins.wait.until(lambda _: os.path.exists(csv_file))
+    csv_file = about_logins.verify_csv_export(downloads_folder, "passwords.csv")
+    assert os.path.exists(csv_file)
 
     # Verify the contents of the exported csv file
     guid_pattern = re.compile(

tests/password_manager/test_password_csv_export.py

@@ -44,8 +44,8 @@ def test_password_csv_export(
     keyboard.tap(Key.enter)
 
     # Verify the exported csv file is present in the target folder
-    csv_file = os.path.join(downloads_folder, PASSWORDS_FILE)
-    about_logins.wait.until(lambda _: os.path.exists(csv_file))
+    csv_file = about_logins.verify_csv_export(downloads_folder, "passwords.csv")
+    assert os.path.exists(csv_file)
 
     # Delete the password.csv created
     about_logins.remove_password_csv(downloads_folder)

tests/password_manager/test_save_login_via_doorhanger.py

@@ -47,17 +47,11 @@ def test_save_login_via_doorhanger(driver: Firefox):
     # Verify the username field has the saved value
     login_autofill.open()
 
-    username_element = login_autofill.get_element("username-login-field")
-    login_autofill.wait.until(
-        lambda _: username_element.get_attribute("value") == USERNAME
-    )
+    login_form.verify_username_value(USERNAME)
 
     # Select Reveal password from password field context menu for headed run purpose only
     login_autofill.context_click("password-login-field")
     context_menu.click_and_hide_menu("context-menu-reveal-password")
 
     # Verify the password matches the password value
-    password_element = login_autofill.get_element("password-login-field")
-    login_autofill.wait.until(
-        lambda _: password_element.get_attribute("value") == PASSWORD
-    )
+    login_form.verify_password_value(PASSWORD)

tests/password_manager/test_saved_hyperlink_redirects_to_corresponding_page.py

@@ -49,17 +49,13 @@ def test_saved_hyperlink_redirects_to_corresponding_page(driver: Firefox):
     about_logins.switch_to_new_tab()
     about_logins.url_contains("mozilla.github")
 
-    # Verify that the saved login is recognized
+    # Creating an instance of the LoginForm within the LoginAutofill page object
     login_autofill.open()
+    login_form = LoginAutofill.LoginForm(login_autofill)
 
     # Verify the username field has the saved value
-    username_element = login_autofill.get_element("username-login-field")
-    login_autofill.wait.until(
-        lambda _: username_element.get_attribute("value") == USERNAME
-    )
+    login_form.verify_username_value(USERNAME)
 
     # Verify the password field is filled with a value that match the length of the saved password
-    password_element = login_autofill.get_element("password-login-field")
-    login_autofill.wait.until(
-        lambda _: len(password_element.get_attribute("value")) == 8
-    )
+    password_element = login_form.verify_password_length(8)
+    assert len(password_element.get_attribute("value")) == 8