Merge pull request #580 from mozilla/as/grouped_scripts

soncuteanca · web-flow · commit 50cc400eed8a · 2025-05-15T16:55:14.000-04:00
Anca/ Grouped testrail scripts together
diff --git a/l10n_CM/Unified/test_demo_cc_1_dropdown.py b/l10n_CM/Unified/test_demo_cc_1_dropdown.py
@@ -2,7 +2,7 @@
 from selenium.webdriver import Firefox
 
 from modules.classes.credit_card import CreditCardBase
-from modules.page_object import AboutPrefs, CreditCardFill
+from modules.page_object import CreditCardFill
 
 
 @pytest.fixture()
diff --git a/l10n_CM/Unified/test_demo_cc_2_preview.py b/l10n_CM/Unified/test_demo_cc_2_preview.py
@@ -3,7 +3,7 @@
 
 from modules.browser_object_autofill_popup import AutofillPopup
 from modules.classes.credit_card import CreditCardBase
-from modules.page_object import AboutPrefs, CreditCardFill
+from modules.page_object import CreditCardFill
 from modules.util import Utilities
 
 
diff --git a/l10n_CM/Unified/test_demo_cc_3_autofill.py b/l10n_CM/Unified/test_demo_cc_3_autofill.py
@@ -4,7 +4,6 @@
 from modules.browser_object_autofill_popup import AutofillPopup
 from modules.classes.credit_card import CreditCardBase
 from modules.page_object import CreditCardFill
-from modules.util import Utilities
 
 
 @pytest.fixture()
diff --git a/l10n_CM/Unified/test_demo_cc_5_clear.py b/l10n_CM/Unified/test_demo_cc_5_clear.py
@@ -1,10 +1,8 @@
 import pytest
 from selenium.webdriver import Firefox
 
-from modules.browser_object_autofill_popup import AutofillPopup
 from modules.classes.credit_card import CreditCardBase
-from modules.page_object import AboutPrefs, CreditCardFill
-from modules.util import Utilities
+from modules.page_object import CreditCardFill
 
 
 @pytest.fixture()
diff --git a/l10n_CM/Unified/test_demo_cc_6_capture_doorhanger_appearance.py b/l10n_CM/Unified/test_demo_cc_6_capture_doorhanger_appearance.py
@@ -3,7 +3,6 @@
 
 from modules.browser_object_autofill_popup import AutofillPopup
 from modules.page_object_autofill import CreditCardFill
-from modules.util import Utilities
 
 
 @pytest.fixture()
diff --git a/modules/page_object_autofill.py b/modules/page_object_autofill.py
@@ -440,7 +440,7 @@ def verify_autofill_data_on_hover(
         container_data = container.get("fillMessageData", {}).get("profile", {})
         assert container_data, "No preview data available."
         assert all(field in container_data.keys() for field in self.preview_fields), (
-            f"Not all fields present in preview data."
+            "Not all fields present in preview data."
         )
 
         # sanitize data
diff --git a/modules/testrail_scripts/__init__.py b/modules/testrail_scripts/__init__.py
diff --git a/modules/testrail_scripts/testrail_script_set_null_automation_status_to_untriaged.py b/modules/testrail_scripts/testrail_script_set_null_automation_status_to_untriaged.py
diff --git a/modules/testrail_scripts/testrail_script_set_untriaged_suitable_to_null_coverage.py b/modules/testrail_scripts/testrail_script_set_untriaged_suitable_to_null_coverage.py
diff --git a/tests/address_bar_and_search/test_search_code_google_non_us.py b/tests/address_bar_and_search/test_search_code_google_non_us.py
@@ -1,6 +1,5 @@
 import pytest
 from selenium.webdriver import Firefox
-from selenium.webdriver.common.by import By
 
 from modules.browser_object import ContextMenu, Navigation, TabBar
 from modules.page_object import ExamplePage
diff --git a/tests/address_bar_and_search/test_search_code_google_us.py b/tests/address_bar_and_search/test_search_code_google_us.py
@@ -1,6 +1,5 @@
 import pytest
 from selenium.webdriver import Firefox
-from selenium.webdriver.common.by import By
 
 from modules.browser_object import ContextMenu, Navigation, TabBar
 from modules.page_object import ExamplePage
diff --git a/tests/address_bar_and_search/test_search_suggestions.py b/tests/address_bar_and_search/test_search_suggestions.py
@@ -36,12 +36,12 @@ def test_search_suggests_enabled(driver: Firefox):
 
     nonsponsored_checkbox = prefs.get_element("firefox-suggest-nonsponsored")
     assert nonsponsored_checkbox.is_selected(), (
-        f"'firefox-suggest-nonsponsored' checkbox not checked"
+        "'firefox-suggest-nonsponsored' checkbox not checked"
     )
 
     sponsored_checkbox = prefs.get_element("firefox-suggest-sponsored")
     assert sponsored_checkbox.is_selected(), (
-        f"'firefox-suggest-sponsored' checkbox not checked"
+        "'firefox-suggest-sponsored' checkbox not checked"
     )
 
     # Check for sponsored suggestion
@@ -75,4 +75,4 @@ def test_search_suggests_enabled(driver: Firefox):
         found_non_sponsored = any(
             "Wikipedia - wiki.phtml" in title.text for title in titles
         )
-    assert found_non_sponsored, f"Non-sponsored suggestion not found"
+    assert found_non_sponsored, "Non-sponsored suggestion not found"
diff --git a/tests/password_manager/test_about_logins_navigation_from_context_menu.py b/tests/password_manager/test_about_logins_navigation_from_context_menu.py
@@ -4,7 +4,6 @@
 from modules.browser_object import ContextMenu, TabBar
 from modules.page_object import LoginAutofill
 
-
 ABOUT_LOGINS_PAGE_TITLE = "Passwords"
 
 
diff --git a/tests/password_manager/test_about_logins_navigation_from_hamburger_menu.py b/tests/password_manager/test_about_logins_navigation_from_hamburger_menu.py
@@ -1,7 +1,7 @@
 import pytest
 from selenium.webdriver import Firefox
-from modules.browser_object import PanelUi, TabBar
 
+from modules.browser_object import PanelUi, TabBar
 
 ABOUT_LOGINS_PAGE_TITLE = "Passwords"
 
diff --git a/tests/password_manager/test_add_password_non_ascii_chars.py b/tests/password_manager/test_add_password_non_ascii_chars.py
@@ -3,7 +3,6 @@
 
 from modules.page_object import AboutLogins
 
-
 WEBSITE_ADDRESS = "mozilla.org"
 USERNAME = "Â£$Âµâ†’â€œ"
 PASSWORD = "Â£$Âµâ†’â€œ"
diff --git a/tests/password_manager/test_add_password_save_valid_data.py b/tests/password_manager/test_add_password_save_valid_data.py
@@ -4,7 +4,6 @@
 
 from modules.page_object import AboutLogins
 
-
 WEBSITE_ADDRESS = "mozilla.org"
 USERNAME = "username"
 PASSWORD = "password"
diff --git a/tests/password_manager/test_add_primary_password.py b/tests/password_manager/test_add_primary_password.py
@@ -4,7 +4,6 @@
 from modules.page_object import AboutPrefs
 from modules.util import BrowserActions
 
-
 PRIMARY_PASSWORD = "securePassword1"
 ALERT_MESSAGE = "Primary Password successfully changed."
 
diff --git a/tests/password_manager/test_auto_saved_generated_password_context_menu.py b/tests/password_manager/test_auto_saved_generated_password_context_menu.py
@@ -1,9 +1,9 @@
 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/"
 
diff --git a/tests/password_manager/test_autocomplete_dropdown_is_toggled_for_focused_login_fields_on_page_load.py b/tests/password_manager/test_autocomplete_dropdown_is_toggled_for_focused_login_fields_on_page_load.py
@@ -6,7 +6,6 @@
 from modules.page_object_autofill import LoginAutofill
 from modules.page_object_generics import GenericPage
 
-
 BSKY_URL = "https://bsky.app/"
 USERNAME = "username1"
 PASSWORD = "password1"
diff --git a/tests/password_manager/test_can_view_password_when_PP_enabled.py b/tests/password_manager/test_can_view_password_when_PP_enabled.py
@@ -6,7 +6,6 @@
 from modules.page_object_prefs import AboutPrefs
 from modules.util import BrowserActions
 
-
 URL_TO_TEST = "https://mozilla.github.io/"
 USERNAME = "username"
 PASSWORD = "password"
diff --git a/tests/password_manager/test_changes_made_in_edit_mode_are_saved.py b/tests/password_manager/test_changes_made_in_edit_mode_are_saved.py
@@ -1,7 +1,7 @@
 import pytest
 from selenium.webdriver import Firefox
-from modules.page_object_about_pages import AboutLogins
 
+from modules.page_object_about_pages import AboutLogins
 
 URL_TO_TEST = "https://mozilla.github.io/"
 USERNAME = "username"
@@ -38,7 +38,9 @@ def test_changes_made_in_edit_mode_are_saved(driver: Firefox):
 
     # Change username and the password
     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)
+    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")
diff --git a/tests/password_manager/test_delete_login.py b/tests/password_manager/test_delete_login.py
@@ -3,7 +3,6 @@
 from modules.page_object_about_pages import AboutLogins
 from modules.page_object_autofill import LoginAutofill
 
-
 PASSWORD_COUNT = "6 passwords"
 PASSWORD_COUNT_DECREASED = "5 passwords"
 
diff --git a/tests/password_manager/test_multiple_saved_logins.py b/tests/password_manager/test_multiple_saved_logins.py
@@ -7,7 +7,6 @@
 from modules.browser_object import AutofillPopup
 from modules.page_object import AboutLogins, GenericPage
 
-
 SAUCEDEMO_URL = "https://www.saucedemo.com/"
 USERNAME = "username1"
 PASSWORD = "password1"
diff --git a/tests/password_manager/test_never_save_login_via_doorhanger.py b/tests/password_manager/test_never_save_login_via_doorhanger.py
@@ -1,10 +1,10 @@
 import pytest
 from selenium.webdriver import Firefox
+
 from modules.browser_object import AutofillPopup, Navigation
 from modules.page_object import AboutPrefs, LoginAutofill
 from modules.util import BrowserActions
 
-
 USERNAME = "testUser"
 PASSWORD = "testPassword"
 TEST_URL = "https://mozilla.github.io"
@@ -67,7 +67,4 @@ def test_never_save_login_via_doorhanger(driver: Firefox):
 
     # Verify that the demo page used in the test appears in the Exceptions list
     password_exceptions_element = about_prefs.get_element("exceptions-item")
-    assert (
-        password_exceptions_element.get_attribute("origin")
-        == TEST_URL
-    )
+    assert password_exceptions_element.get_attribute("origin") == TEST_URL
diff --git a/tests/password_manager/test_password_csv_correctness.py b/tests/password_manager/test_password_csv_correctness.py
@@ -2,11 +2,14 @@
 import os
 import re
 import time
+
 import pytest
+
 from modules.page_object import AboutLogins, GenericPage
 
 PASSWORDS_FILE = "passwords.csv"
 
+
 @pytest.fixture()
 def test_case():
     return "2241522"
diff --git a/tests/password_manager/test_password_csv_export.py b/tests/password_manager/test_password_csv_export.py
@@ -1,9 +1,10 @@
 import os
 import time
+
 import pytest
 from pynput.keyboard import Controller, Key
-from modules.page_object import AboutLogins, GenericPage
 
+from modules.page_object import AboutLogins, GenericPage
 
 PASSWORDS_FILE = "passwords.csv"
 
diff --git a/tests/password_manager/test_primary_password_triggered_on_about_logins_access.py b/tests/password_manager/test_primary_password_triggered_on_about_logins_access.py
@@ -1,10 +1,10 @@
 import pytest
 from selenium.webdriver import Firefox, Keys
+
 from modules.browser_object import PanelUi, TabBar
 from modules.page_object import AboutLogins, AboutPrefs
 from modules.util import BrowserActions
 
-
 PRIMARY_PASSWORD = "securePassword1"
 TEST_PAGE_URL = "mozilla.org"
 PASSWORD = "password"
diff --git a/tests/password_manager/test_save_login_via_doorhanger.py b/tests/password_manager/test_save_login_via_doorhanger.py
@@ -1,10 +1,10 @@
 import pytest
 from selenium.webdriver import Firefox
+
 from modules.browser_object import ContextMenu, Navigation
 from modules.browser_object_autofill_popup import AutofillPopup
 from modules.page_object import LoginAutofill
 
-
 USERNAME = "testUser"
 PASSWORD = "testPassword"
 
diff --git a/tests/password_manager/test_saved_hyperlink_redirects_to_corresponding_page.py b/tests/password_manager/test_saved_hyperlink_redirects_to_corresponding_page.py
@@ -1,9 +1,9 @@
 import pytest
 from selenium.webdriver import Firefox
+
 from modules.page_object_about_pages import AboutLogins
 from modules.page_object_autofill import LoginAutofill
 
-
 TEST_PAGE_URL = "https://mozilla.github.io/form-fill-examples/password_manager/login_and_pw_change_forms.html"
 USERNAME = "username"
 PASSWORD = "password"
diff --git a/tests/password_manager/test_update_login_via_doorhanger.py b/tests/password_manager/test_update_login_via_doorhanger.py
@@ -1,10 +1,10 @@
 import pytest
 from selenium.webdriver import Firefox
+
 from modules.browser_object import ContextMenu, Navigation
 from modules.browser_object_autofill_popup import AutofillPopup
 from modules.page_object import LoginAutofill
 
-
 USERNAME = "testUser"
 PASSWORD = "testPassword"
 UPDATED_PASSWORD = "testPasswordUpdate"

Original file line number	Diff line number	Diff line change
`@@ -440,7 +440,7 @@ def verify_autofill_data_on_hover(`
`440`	`440`	`container_data = container.get("fillMessageData", {}).get("profile", {})`
`441`	`441`	`assert container_data, "No preview data available."`
`442`	`442`	`assert all(field in container_data.keys() for field in self.preview_fields), (`
`443`		`- f"Not all fields present in preview data."`
	`443`	`+ "Not all fields present in preview data."`
`444`	`444`	`)`
`445`	`445`
`446`	`446`	`# sanitize data`