more refactor

Author: Hani Yacoub

tests/password_manager/test_about_logins_navigation_from_context_menu.py

@@ -5,14 +5,14 @@
 from modules.page_object import LoginAutofill
 
 
+ABOUT_LOGINS_PAGE_TITLE = "Passwords"
+
+
 @pytest.fixture()
 def test_case():
     return "2241087"
 
 
-ABOUT_LOGINS_PAGE_TITLE = "Passwords"
-
-
 @pytest.mark.ci
 def test_about_logins_navigation_from_login_form_context_menu(driver: Firefox):
     """

tests/password_manager/test_about_logins_navigation_from_hamburger_menu.py

@@ -1,17 +1,16 @@
 import pytest
 from selenium.webdriver import Firefox
-
 from modules.browser_object import PanelUi, TabBar
 
 
+ABOUT_LOGINS_PAGE_TITLE = "Passwords"
+
+
 @pytest.fixture()
 def test_case():
     return "2241082"
 
 
-ABOUT_LOGINS_PAGE_TITLE = "Passwords"
-
-
 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

tests/password_manager/test_add_password_non_ascii_chars.py

@@ -4,14 +4,16 @@
 from modules.page_object import AboutLogins
 
 
+WEBSITE_ADDRESS = "mozilla.org"
+USERNAME = "£$µ→“"
+PASSWORD = "£$µ→“"
+
+
 @pytest.fixture()
 def test_case():
     return "2241113"
 
 
-WEBSITE_ADDRESS = "mozilla.org"
-
-
 def test_add_password_non_ascii_chars(driver: Firefox):
     """
     C2241113 Add password - non-ascii characters
@@ -26,14 +28,13 @@ def test_add_password_non_ascii_chars(driver: Firefox):
     # Complete all the fields with valid data and click the "Save" button.
     about_logins.create_new_login(
         {
-            "origin": "mozilla.org",
-            "username": "£$µ→“",
-            "password": "£$µ→“",
+            "origin": WEBSITE_ADDRESS,
+            "username": USERNAME,
+            "password": PASSWORD,
         }
     )
 
     # Check password added in the listbox
-    about_logins.get_element("login-list-item")
     logins = about_logins.get_elements("login-list-item")
     mozilla_login = next(
         login for login in logins if login.get_attribute("title") == WEBSITE_ADDRESS

tests/password_manager/test_add_password_save_valid_data.py

@@ -5,14 +5,16 @@
 from modules.page_object import AboutLogins
 
 
+WEBSITE_ADDRESS = "mozilla.org"
+USERNAME = "username"
+PASSWORD = "password"
+
+
 @pytest.fixture()
 def test_case():
     return "2241112"
 
 
-WEBSITE_ADDRESS = "mozilla.org"
-
-
 def test_add_password_save_valid_data(driver: Firefox):
     """
     C2241112 Verify that a password can be added and saved
@@ -27,14 +29,13 @@ def test_add_password_save_valid_data(driver: Firefox):
     # Complete all the fields with valid data and click the "Save" button.
     about_logins.create_new_login(
         {
-            "origin": "mozilla.org",
-            "username": "username",
-            "password": "password",
+            "origin": WEBSITE_ADDRESS,
+            "username": USERNAME,
+            "password": PASSWORD,
         }
     )
 
     # Check password added in the listbox
-    about_logins.get_element("login-list-item")
     logins = about_logins.get_elements("login-list-item")
     mozilla_login = next(
         login for login in logins if login.get_attribute("title") == WEBSITE_ADDRESS

tests/password_manager/test_add_primary_password.py

@@ -5,6 +5,10 @@
 from modules.util import BrowserActions
 
 
+PRIMARY_PASSWORD = "securePassword1"
+ALERT_MESSAGE = "Primary Password successfully changed."
+
+
 @pytest.fixture()
 def test_case():
     return "2245178"
@@ -15,10 +19,6 @@ def hard_quit():
     return True
 
 
-PRIMARY_PASSWORD = "securePassword1"
-ALERT_MESSAGE = "Primary Password successfully changed."
-
-
 def test_add_primary_password(driver: Firefox):
     """
     C2245178: Verify that a primary password can be added in about:preferences#privacy

tests/password_manager/test_auto_saved_generated_password_context_menu.py

@@ -1,10 +1,13 @@
 import pytest
 from selenium.webdriver import Firefox
-
 from modules.browser_object import AutofillPopup, ContextMenu, Navigation, TabBar
 from modules.page_object import AboutLogins, LoginAutofill
 
 
+UPDATE_DOORHANGER_TEXT = "Update password for mozilla.github.io?"
+TEST_WEBSITE = "https://mozilla.github.io/"
+
+
 @pytest.fixture()
 def test_case():
     return "2248176"
@@ -16,9 +19,6 @@ def add_to_prefs_list():
     return [("signon.rememberSignons", True)]
 
 
-UPDATE_DOORHANGER_TEXT = "Update password for mozilla.github.io?"
-
-
 def test_auto_saved_generated_password_context_menu(driver: Firefox):
     """
     C2248176 - Securely Generated Password is auto-saved when generated from password field context menu
@@ -40,8 +40,6 @@ def test_auto_saved_generated_password_context_menu(driver: Firefox):
     # is displayed
     with driver.context(driver.CONTEXT_CHROME):
         login_autofill.get_element("generated-securely-password").click()
-        login_autofill.click_on("generated-securely-password")
-        nav.element_visible("password-notification-key")
         nav.click_on("password-notification-key")
         update_doorhanger = autofill_popup_panel.get_element(
             "password-update-doorhanger"
@@ -54,7 +52,7 @@ def test_auto_saved_generated_password_context_menu(driver: Firefox):
 
     # Verify the website address saves the correct value
     about_logins.expect_element_attribute_contains(
-        "website-address", "href", "https://mozilla.github.io/"
+        "website-address", "href", TEST_WEBSITE
     )
 
     # Verify the username field has no value

tests/password_manager/test_autocomplete_dropdown_is_toggled_for_focused_login_fields_on_page_load.py

@@ -7,6 +7,13 @@
 from modules.page_object_generics import GenericPage
 
 
+BSKY_URL = "https://bsky.app/"
+USERNAME = "username1"
+PASSWORD = "password1"
+USERNAME2 = "username2"
+PASSWORD2 = "password2"
+
+
 @pytest.fixture()
 def test_case():
     return "2240907"
@@ -18,9 +25,6 @@ def add_to_prefs_list():
     return [("signon.rememberSignons", True)]
 
 
-BSKY_URL = "https://bsky.app/"
-
-
 def test_autocomplete_dropdown_is_toggled_for_focused_login_fields_on_page_load(
     driver: Firefox,
 ):
@@ -43,17 +47,17 @@ def test_autocomplete_dropdown_is_toggled_for_focused_login_fields_on_page_load(
     about_logins.click_add_login_button()
     about_logins.create_new_login(
         {
-            "origin": "https://bsky.app/",
-            "username": "username1",
-            "password": "password1",
+            "origin": BSKY_URL,
+            "username": USERNAME,
+            "password": PASSWORD,
         }
     )
     about_logins.click_add_login_button()
     about_logins.create_new_login(
         {
-            "origin": "https://bsky.app/",
-            "username": "username2",
-            "password": "password2",
+            "origin": BSKY_URL,
+            "username": USERNAME2,
+            "password": PASSWORD2,
         }
     )
 
@@ -63,4 +67,4 @@ def test_autocomplete_dropdown_is_toggled_for_focused_login_fields_on_page_load(
     generic_page.get_element("bsky-signin-button").click()
     with driver.context(driver.CONTEXT_CHROME):
         username_element = login_autofill.get_element("bsky-credentials")
-        assert username_element.get_attribute("ac-value") == "username1"
+        assert username_element.get_attribute("ac-value") == USERNAME

tests/password_manager/test_can_view_password_when_PP_enabled.py

@@ -7,6 +7,12 @@
 from modules.util import BrowserActions
 
 
+URL_TO_TEST = "https://mozilla.github.io/"
+USERNAME = "username"
+PASSWORD = "password"
+PRIMARY_PASSWORD = "securePassword1"
+
+
 @pytest.fixture()
 def test_case():
     return "2264688"
@@ -28,9 +34,9 @@ def test_password_can_be_shown(driver: Firefox):
     # Complete all the fields with valid data and click the "Save" button.
     about_logins.create_new_login(
         {
-            "origin": "mozilla.org",
-            "username": "username",
-            "password": "password",
+            "origin": URL_TO_TEST,
+            "username": USERNAME,
+            "password": PASSWORD,
         }
     )
 
@@ -46,8 +52,8 @@ def test_password_can_be_shown(driver: Firefox):
     )
 
     # 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
@@ -56,8 +62,7 @@ def test_password_can_be_shown(driver: Firefox):
         alert.accept()
 
     about_logins.open()
-    show_password_button = about_logins.get_element("show-password-checkbox")
-    show_password_button.click()
+    about_logins.click_on("show-password-checkbox")
 
     with driver.context(driver.CONTEXT_CHROME):
         driver.switch_to.window(driver.window_handles[-1])
@@ -68,7 +73,7 @@ def test_password_can_be_shown(driver: Firefox):
         primary_password_input_field = about_logins.get_element(
             "primary-password-dialog-input-field"
         )
-        primary_password_input_field.send_keys("securePassword1")
+        primary_password_input_field.send_keys(PRIMARY_PASSWORD)
         primary_password_input_field.send_keys(Keys.ENTER)
 
     # Verify that the password is unmasked by checking that the type is now text.

tests/password_manager/test_changes_made_in_edit_mode_are_saved.py

@@ -1,9 +1,16 @@
 import pytest
 from selenium.webdriver import Firefox
-
 from modules.page_object_about_pages import AboutLogins
 
 
+URL_TO_TEST = "https://mozilla.github.io/"
+USERNAME = "username"
+PASSWORD = "password"
+NEW_USERNAME = "Testuser"
+ADD_TO_PASSWORD = "123"
+NEW_PASSWORD = "password123"
+
+
 @pytest.fixture()
 def test_case():
     return "2241121"
@@ -21,30 +28,30 @@ def test_changes_made_in_edit_mode_are_saved(driver: Firefox):
     about_logins.click_add_login_button()
     about_logins.create_new_login(
         {
-            "origin": "https://mozilla.github.io/",
-            "username": "username",
-            "password": "password",
+            "origin": URL_TO_TEST,
+            "username": USERNAME,
+            "password": PASSWORD,
         }
     )
     # Click the "Edit" button
     about_logins.click_on("edit-login")
 
     # Change username and the password
-    about_logins.get_element("about-logins-page-username-field").send_keys("Testuser")
-    about_logins.get_element("about-logins-page-password-hidden").send_keys("123")
+    about_logins.get_element("about-logins-page-username-field").send_keys(NEW_USERNAME)
+    about_logins.get_element("about-logins-page-password-hidden").send_keys(ADD_TO_PASSWORD)
 
     # Click the "Save" button
     about_logins.click_on("save-edited-login")
 
     # Verify the username field is changed
     about_logins.expect_element_attribute_contains(
-        "about-logins-page-username-field", "value", "Testuser"
+        "about-logins-page-username-field", "value", NEW_USERNAME
     )
 
     # Click the "Show Password" button
     about_logins.click_on("show-password-checkbox")
 
     # Verify the newly entered password is correctly displayed
     about_logins.expect_element_attribute_contains(
-        "about-logins-page-password-revealed", "value", "password123"
+        "about-logins-page-password-revealed", "value", NEW_PASSWORD
     )

tests/password_manager/test_delete_login.py

@@ -4,6 +4,10 @@
 from modules.page_object_autofill import LoginAutofill
 
 
+PASSWORD_COUNT = "6 passwords"
+PASSWORD_COUNT_DECREASED = "5 passwords"
+
+
 @pytest.fixture()
 def test_case():
     return "2241120"
@@ -25,14 +29,14 @@ def test_delete_login(driver_and_saved_logins):
     about_logins.open()
     password_count = about_logins.get_element("password-count")
     login_autofill.wait.until(
-        lambda _: password_count.get_attribute("innerText") == "6 passwords"
+        lambda _: password_count.get_attribute("innerText") == PASSWORD_COUNT
     )
 
     # Delete the last saved login
-    about_logins.get_element("remove-login-button-main-page").click()
-    about_logins.get_element("remove-login-button-confirmation-dialog").click()
+    about_logins.click_on("remove-login-button-main-page")
+    about_logins.click_on("remove-login-button-confirmation-dialog")
 
     # Verify that the saved passwords count decreases by 1
     login_autofill.wait.until(
-        lambda _: password_count.get_attribute("innerText") == "5 passwords"
+        lambda _: password_count.get_attribute("innerText") == PASSWORD_COUNT_DECREASED
     )