Merge branch 'main' into vs/FR-CM-tests

ben-c-at-moz · ben-c-at-moz · commit 77e5d4746386 · 2025-06-05T08:27:41.000-07:00
diff --git a/.github/workflows/check-beta.yml b/.github/workflows/check-beta.yml
@@ -2,7 +2,7 @@ name: Check new beta version
 
 on:
   schedule:
-    - cron: "33 */1 * * *"
+    - cron: "34 */1 * * *"
 env:
   LATEST: ""
 permissions:
diff --git a/Pipfile b/Pipfile
@@ -7,7 +7,7 @@ name = "pypi"
 faker = "26.3.0"
 selenium = "<4.24"
 pynput = "1.7.7"
-pytest = "<9.0"
+pytest = "<8.4"
 pytest-httpserver = "1.0.12"
 requests = "<3.0"
 pytest-xdist = "3.6.1"
diff --git a/l10n_CM/Unified/test_demo_ad_2c_preview_phone_email_fields.py b/l10n_CM/Unified/test_demo_ad_2c_preview_phone_email_fields.py
@@ -18,6 +18,9 @@ def test_hover_email_and_phone_autofill_preview(
     address_autofill: AddressFill,
     fill_and_save_address: AutofillAddressBase,
 ):
+    """
+    C2888568: Verify that hovering over phone/email fields will preview all fields
+    """
     # Create fake data
     address_autofill.open()
 
diff --git a/l10n_CM/Unified/test_demo_ad_3c_autofill_phone_email_fields.py b/l10n_CM/Unified/test_demo_ad_3c_autofill_phone_email_fields.py
@@ -17,7 +17,7 @@ def test_demo_ad_autofill_phone_email(
     fill_and_save_address: AutofillAddressBase,
 ):
     """
-    C2888569 - Verify Autofill functionality when selecting an entry from the dropdown for tele/email fields
+    C2888569 - Verify Autofill functionality when selecting an entry from the dropdown for phone/email fields
     """
     # Create fake data
     address_autofill.open()
diff --git a/l10n_CM/Unified/test_demo_ad_5c_clear_phone_email_fields.py b/l10n_CM/Unified/test_demo_ad_5c_clear_phone_email_fields.py
@@ -17,7 +17,7 @@ def test_demo_ad_clear_tel_email(
     fill_and_save_address: AutofillAddressBase,
 ):
     """
-    C2888571 - Verify clear functionality after selecting an entry from tele/email fields
+    C2888571 - Verify clear functionality after selecting an entry from phone/email fields
     """
     # Create fake data and fill it in
     address_autofill.open()
diff --git a/l10n_CM/Unified/test_demo_ad_7c_capture_doorhanger_stored_data_phone_email.py b/l10n_CM/Unified/test_demo_ad_7c_capture_doorhanger_stored_data_phone_email.py
@@ -8,7 +8,7 @@
 
 @pytest.fixture()
 def test_case():
-    return "2886581"
+    return "2888704"
 
 
 def test_demo_ad_email_phone_captured_in_doorhanger_and_stored(
@@ -20,7 +20,7 @@ def test_demo_ad_email_phone_captured_in_doorhanger_and_stored(
     is_live_site: str,
 ):
     """
-    C2888704 - Verify tele/email data are captured in the Capture Doorhanger and stored in about:preferences
+    C2888704 - Verify phone/email data are captured in the Capture Doorhanger and stored in about:preferences
     """
     if not is_live_site:
         # Create fake data and fill it in
diff --git a/l10n_CM/Unified/test_demo_cc_0_add_new_credit_card.py b/l10n_CM/Unified/test_demo_cc_0_add_new_credit_card.py
@@ -9,7 +9,7 @@
 
 @pytest.fixture()
 def test_case():
-    return "2886595"
+    return "3056980"
 
 
 def test_create_new_cc_profile(
@@ -19,7 +19,7 @@ def test_create_new_cc_profile(
     populate_saved_payments: CreditCardBase,
 ):
     """
-    C2886595 - Tests you can create and save a new Credit Card profile
+    C3056980 - Tests you can create and save a new Credit Card profile
     """
     # get sample data
     credit_card_sample_data = populate_saved_payments
diff --git a/l10n_CM/Unified/test_demo_cc_1_dropdown.py b/l10n_CM/Unified/test_demo_cc_1_dropdown.py
@@ -7,7 +7,7 @@
 
 @pytest.fixture()
 def test_case():
-    return "2886598"
+    return "3056983"
 
 
 def test_dropdown_presence_credit_card(
@@ -17,7 +17,7 @@ def test_dropdown_presence_credit_card(
     fill_and_save_payments: CreditCardBase,
 ):
     """
-    C2886598 - Verify autofill dropdown is displayed only for the eligible fields after a credit card is saved
+    C3056983 - Verify autofill dropdown is displayed only for the eligible fields after a credit card is saved
     """
     # Open credit card form page
     credit_card_autofill.open()
diff --git a/l10n_CM/Unified/test_demo_cc_2_preview.py b/l10n_CM/Unified/test_demo_cc_2_preview.py
@@ -9,7 +9,7 @@
 
 @pytest.fixture()
 def test_case():
-    return "2886599"
+    return "3056984"
 
 
 @pytest.fixture()
@@ -26,7 +26,7 @@ def test_cc_preview(
     fill_and_save_payments: CreditCardBase,
 ):
     """
-    C2886599 -  Verify that hovering over field will preview all eligible fields (except for the CVV field)
+    C3056984 -  Verify that hovering over field will preview all eligible fields (except for the CVV field)
     """
 
     # Open credit card form page
diff --git a/l10n_CM/Unified/test_demo_cc_3_autofill.py b/l10n_CM/Unified/test_demo_cc_3_autofill.py
@@ -8,7 +8,7 @@
 
 @pytest.fixture()
 def test_case():
-    return "2886600"
+    return "3056985"
 
 
 def test_cc_autofill_from_dropdown(
@@ -19,7 +19,7 @@ def test_cc_autofill_from_dropdown(
     region: str,
 ):
     """
-    Verify that saved credit card information is autofilled correctly when selected from the dropdown,
+    C3056985 - Verify that saved credit card information is autofilled correctly when selected from the dropdown,
     except for the CVV field.
     Arguments:
         credit_card_autofill: CreditCardFill instance
diff --git a/l10n_CM/Unified/test_demo_cc_4_highlight.py b/l10n_CM/Unified/test_demo_cc_4_highlight.py
@@ -7,7 +7,7 @@
 
 @pytest.fixture()
 def test_case():
-    return "2886601"
+    return "3056986"
 
 
 def test_cc_yellow_highlight(
@@ -17,7 +17,7 @@ def test_cc_yellow_highlight(
     fill_and_save_payments: CreditCardBase,
 ):
     """
-    C2886601 - Verify the yellow highlight appears on autofilled fields and make sure csv field is not highlighted
+    C3056986 - Verify the yellow highlight appears on autofilled fields and make sure csv field is not highlighted
     """
     # Open the credit card fill form and trigger the autofill option
     credit_card_autofill.open()
diff --git a/l10n_CM/Unified/test_demo_cc_5_clear.py b/l10n_CM/Unified/test_demo_cc_5_clear.py
@@ -7,7 +7,7 @@
 
 @pytest.fixture()
 def test_case():
-    return "2886602"
+    return "3056987"
 
 
 def test_cc_clear_form(
@@ -17,7 +17,7 @@ def test_cc_clear_form(
     fill_and_save_payments: CreditCardBase,
 ):
     """
-    C2886602 - Verify that clearing the form from any field results in all fields being emptied, regardless of the
+    C3056987 - Verify that clearing the form from any field results in all fields being emptied, regardless of the
     field from which the clear action was triggered.
     """
 
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
@@ -7,7 +7,7 @@
 
 @pytest.fixture()
 def test_case():
-    return "2889441"
+    return "3056981"
 
 
 def test_cc_check_door_hanger_is_displayed(
@@ -18,7 +18,7 @@ def test_cc_check_door_hanger_is_displayed(
     is_live_site: str,
 ):
     """
-    C2889441 - Ensures that the door hanger is displayed after filling credit card info
+    C3056981 - Ensures that the door hanger is displayed after filling credit card info
     """
     if not is_live_site:
         # Navigate to page
diff --git a/l10n_CM/Unified/test_demo_cc_7_capture_doorhanger_capture_and_stored_data.py b/l10n_CM/Unified/test_demo_cc_7_capture_doorhanger_capture_and_stored_data.py
@@ -8,7 +8,7 @@
 
 @pytest.fixture()
 def test_case():
-    return "2886597"
+    return "3056982"
 
 
 def test_demo_cc_data_captured_in_doorhanger_and_stored(
@@ -20,7 +20,7 @@ def test_demo_cc_data_captured_in_doorhanger_and_stored(
     is_live_site: str,
 ):
     """
-    C2889999 - Verify credit card data is captured in the Capture Doorhanger and stored in about:preferences
+    C3056982 - Verify credit card data is captured in the Capture Doorhanger and stored in about:preferences
     """
     if not is_live_site:
         # Navigate to page
diff --git a/modules/browser_object_navigation.py b/modules/browser_object_navigation.py
@@ -344,26 +344,24 @@ def bookmark_page_other(self) -> BasePage:
         return self
 
     @BasePage.context_chrome
-    def add_bookmark_advanced(
+    def add_bookmark_via_other_bookmark_context_menu(
         self, bookmark_data: Bookmark, ba: BrowserActions
     ) -> BasePage:
         iframe = self.get_element("bookmark-iframe")
         ba.switch_to_iframe_context(iframe)
         # fill name
-        if bookmark_data.name is not None:
-            self.actions.send_keys(bookmark_data.name).perform()
+        self.actions.send_keys(bookmark_data.name).perform()
         self.actions.send_keys(Keys.TAB).perform()
         # fill url
         self.actions.send_keys(bookmark_data.url + Keys.TAB).perform()
         # fill tags
-        if bookmark_data.tags is not None:
-            self.actions.send_keys(bookmark_data.tags).perform()
+        self.actions.send_keys(bookmark_data.tags).perform()
+        self.actions.send_keys(Keys.TAB).perform()
         self.actions.send_keys(Keys.TAB).perform()
         # fill keywords
-        if bookmark_data.keyword is not None:
-            self.actions.send_keys(bookmark_data.keyword).perform()
-        self.actions.send_keys(Keys.TAB, Keys.TAB, Keys.TAB, Keys.ENTER).perform()
-        ba.switch_to_content_context()
+        self.actions.send_keys(bookmark_data.keyword).perform()
+        # save the bookmark
+        self.actions.send_keys(Keys.ENTER).perform()
         return self
 
     @BasePage.context_chrome
diff --git a/modules/page_object_prefs.py b/modules/page_object_prefs.py
@@ -567,7 +567,7 @@ def import_bookmarks(self, browser_name: str, platform) -> BasePage:
         # There are two messages that indicate a successful migration
         self.wait.until(
             lambda _: self.get_element("migration-progress-header").text
-            in ["Data Imported Successfully", "Data Import Complete"]
+            in ["Data imported successfully", "Data import complete"]
         )
         self.actions.send_keys(" ").perform()
         return self
@@ -598,6 +598,7 @@ def choose_sidebar_option(self, option: str):
         """
         Clicks the corresponding sidebar option from the about:addons page.
         """
+        sleep(1)
         self.get_element("sidebar-options", labels=[option]).click()
 
     def activate_theme(
@@ -609,7 +610,7 @@ def activate_theme(
         Attributes
         ----------
         nav: Navigation
-            The navgiation object
+            The navigation object
         theme_name: str
             The name of the theme to press
         intended_color: str
@@ -653,7 +654,7 @@ def enabled_theme_matches(self, expected_theme: str) -> bool:
 
     def check_theme_has_changed(self, original_theme: str) -> BasePage:
         """
-        Ensure that the theme has changed.
+        Ensure the theme has changed.
         """
         assert not self.enabled_theme_matches(original_theme)
         return self
diff --git a/modules/testrail.py b/modules/testrail.py
@@ -200,11 +200,12 @@ def create_test_run_on_plan_entry(
         logging.info(f"run on plan entry configs {config_ids}")
         payload = {
             "config_ids": config_ids,
-            "description": description,
             "include_all": not bool(case_ids),
         }
         if case_ids:
             payload["case_ids"] = case_ids
+        if description:
+            payload["description"] = description
         logging.info(f"create run on entry payload:\n{payload}")
         return self.client.send_post(
             f"add_run_to_plan_entry/{plan_id}/{entry_id}", payload
diff --git a/modules/testrail_scripts/set_coverage_none_for_untriaged_suitable_unsuitable_disabled_automation.py b/modules/testrail_scripts/set_coverage_none_for_untriaged_suitable_unsuitable_disabled_automation.py
diff --git a/modules/testrail_scripts/set_empty_automation_status_to_untriaged.py b/modules/testrail_scripts/set_empty_automation_status_to_untriaged.py
diff --git a/tests/bookmarks_and_history/test_add_new_other_bookmark.py b/tests/bookmarks_and_history/test_add_new_other_bookmark.py
diff --git a/tests/bookmarks_and_history/test_delete_other_bookmarks.py b/tests/bookmarks_and_history/test_delete_other_bookmarks.py
diff --git a/tests/password_manager/test_add_password_save_valid_data.py b/tests/password_manager/test_add_password_save_valid_data.py
diff --git a/tests/security_and_privacy/test_blocking_social_media_trackers.py b/tests/security_and_privacy/test_blocking_social_media_trackers.py
