Grouped testrail scripts together

Author: svuser

l10n_CM/Unified/test_demo_ad_7a_capture_doorhanger_stored_data_name_org_fields.py

@@ -64,8 +64,6 @@ def test_demo_ad_name_org_captured_in_doorhanger_and_stored(
             if field_value not in saved_address_profile:
                 missing_fields.append(f"{field_name}: {field_value}")
 
-        assert not missing_fields, (
-            f"The following fields were not found in the saved address: {', '.join(missing_fields)}"
-        )
+        assert not missing_fields, f"The following fields were not found in the saved address: {', '.join(missing_fields)}"
     else:
         pytest.skip("Doorhanger not tested for Live Sites.")

l10n_CM/Unified/test_demo_ad_7b_capture_doorhanger_stored_data_address_fields.py

@@ -76,8 +76,6 @@ def test_demo_ad_address_data_captured_in_doorhanger_and_stored(
             if field_value not in saved_address_profile:
                 missing_fields.append(f"{field_name}: {field_value}")
 
-        assert not missing_fields, (
-            f"The following fields were not found in the saved address: {', '.join(missing_fields)}"
-        )
+        assert not missing_fields, f"The following fields were not found in the saved address: {', '.join(missing_fields)}"
     else:
         pytest.skip("Doorhanger not tested for Live Sites.")

l10n_CM/Unified/test_demo_ad_7c_capture_doorhanger_stored_data_phone_email.py

@@ -65,8 +65,6 @@ def test_demo_ad_email_phone_captured_in_doorhanger_and_stored(
             if field_value not in saved_address_profile:
                 missing_fields.append(f"{field_name}: {field_value}")
 
-        assert not missing_fields, (
-            f"The following fields were not found in the saved address: {', '.join(missing_fields)}"
-        )
+        assert not missing_fields, f"The following fields were not found in the saved address: {', '.join(missing_fields)}"
     else:
         pytest.skip("Doorhanger not tested for Live Sites.")

l10n_CM/Unified/test_demo_cc_7_capture_doorhanger_capture_and_stored_data.py

@@ -33,21 +33,21 @@ def test_demo_cc_data_captured_in_doorhanger_and_stored(
         credit_card_sample_data = credit_card_autofill.fill_and_save(door_hanger=False)
 
         # The "Save credit card?" doorhanger is displayed
-        assert autofill_popup.element_visible("doorhanger-save-button"), (
-            "Credit card save doorhanger is not visible"
-        )
+        assert autofill_popup.element_visible(
+            "doorhanger-save-button"
+        ), "Credit card save doorhanger is not visible"
 
         # Verify Credit Card Doorhanger Data
         doorhanger_text = autofill_popup.get_cc_doorhanger_data("cc-doorhanger-data")
-        assert credit_card_sample_data.card_number[-4:] in doorhanger_text, (
-            f"Expected last 4 digits '{credit_card_sample_data.card_number[-4:]}' but not found."
-        )
-        assert credit_card_sample_data.name in doorhanger_text, (
-            f"Expected name '{credit_card_sample_data.name}' but not found."
-        )
-        assert credit_card_sample_data.cvv not in doorhanger_text, (
-            f"CVV '{credit_card_sample_data.cvv}' should not be saved, but found in doorhanger."
-        )
+        assert (
+            credit_card_sample_data.card_number[-4:] in doorhanger_text
+        ), f"Expected last 4 digits '{credit_card_sample_data.card_number[-4:]}' but not found."
+        assert (
+            credit_card_sample_data.name in doorhanger_text
+        ), f"Expected name '{credit_card_sample_data.name}' but not found."
+        assert (
+            credit_card_sample_data.cvv not in doorhanger_text
+        ), f"CVV '{credit_card_sample_data.cvv}' should not be saved, but found in doorhanger."
 
         # Click the "Save" button using click_doorhanger_button
         autofill_popup.click_doorhanger_button("save")
@@ -63,14 +63,16 @@ def test_demo_cc_data_captured_in_doorhanger_and_stored(
         saved_cc_profile = [x.strip() for x in saved_cc_profiles[0].text.split(",")]
 
         # Validate stored values match expected values
-        assert saved_cc_profile[0].endswith(credit_card_sample_data.card_number[-4:]), (
-            f"Expected last 4 digits '{credit_card_sample_data.card_number[-4:]}' but got '{saved_cc_profile[0]}'"
-        )
-        assert saved_cc_profile[1] == credit_card_sample_data.name, (
-            f"Expected name '{credit_card_sample_data.name}' but got '{saved_cc_profile[1]}'"
-        )
-        assert credit_card_sample_data.cvv not in saved_cc_profile, (
-            f"CVV '{credit_card_sample_data.cvv}' should not be saved, but found in stored values."
-        )
+        assert saved_cc_profile[
+            0
+        ].endswith(
+            credit_card_sample_data.card_number[-4:]
+        ), f"Expected last 4 digits '{credit_card_sample_data.card_number[-4:]}' but got '{saved_cc_profile[0]}'"
+        assert (
+            saved_cc_profile[1] == credit_card_sample_data.name
+        ), f"Expected name '{credit_card_sample_data.name}' but got '{saved_cc_profile[1]}'"
+        assert (
+            credit_card_sample_data.cvv not in saved_cc_profile
+        ), f"CVV '{credit_card_sample_data.cvv}' should not be saved, but found in stored values."
     else:
         pytest.skip("Doorhanger not tested for Live Sites.")

modules/browser_object_tracker_panel.py

@@ -145,9 +145,7 @@ def verify_tracker_shield_indicator(self, nav: Navigation) -> BasePage:
             assert (
                 shield_icon.get_attribute("data-l10n-id")
                 == "tracking-protection-icon-active-container"
-            ), (
-                "The label detected did not correspond to the expected one: tracking-protection-icon-active-container"
-            )
+            ), "The label detected did not correspond to the expected one: tracking-protection-icon-active-container"
         return self
 
     def open_and_return_cross_site_trackers(self) -> List[WebElement]:

modules/page_base.py

@@ -462,9 +462,9 @@ def verify_opened_image_url(self, url_substr: str, pattern: str) -> Page:
         self.url_contains(url_substr)
         current_url = self.driver.current_url
 
-        assert re.match(pattern, current_url), (
-            f"URL does not match the expected pattern: {current_url}"
-        )
+        assert re.match(
+            pattern, current_url
+        ), f"URL does not match the expected pattern: {current_url}"
         return self
 
     def fill(
@@ -515,9 +515,9 @@ def fetch(self, reference: Union[str, tuple, WebElement], labels=[]) -> WebEleme
             return self.find_element(*reference)
         elif isinstance(reference, WebElement):
             return reference
-        assert False, (
-            "Bad fetch: only selectors, selector names, or WebElements allowed."
-        )
+        assert (
+            False
+        ), "Bad fetch: only selectors, selector names, or WebElements allowed."
 
     def click_on(self, reference: Union[str, tuple, WebElement], labels=[]) -> Page:
         """Click on an element, no matter the context, return the page"""

modules/page_object_autofill.py

@@ -244,9 +244,9 @@ def verify_form_data(self, sample_data: CreditCardBase | AutofillAddressBase):
                     expected_value = self.util.get_state_province_abbreviation(
                         expected_value
                     )
-                assert expected_value in autofilled_field_value, (
-                    f"{autofilled_field_value} is different from {expected_value}"
-                )
+                assert (
+                    expected_value in autofilled_field_value
+                ), f"{autofilled_field_value} is different from {expected_value}"
 
     def verify_field_autofill_dropdown(
         self,
@@ -388,14 +388,14 @@ def is_yellow_highlight(rgb_tuple):
 
                     # Assert based on expectation
                     if should_be_highlighted:
-                        assert is_field_highlighted, (
-                            f"Expected yellow highlight on '{field}', but none found."
-                        )
+                        assert (
+                            is_field_highlighted
+                        ), f"Expected yellow highlight on '{field}', but none found."
                         logging.info(f"Yellow highlight found in '{field}'.")
                     else:
-                        assert not is_field_highlighted, (
-                            f"Expected NO yellow highlight on '{field}', but found one."
-                        )
+                        assert (
+                            not is_field_highlighted
+                        ), f"Expected NO yellow highlight on '{field}', but found one."
                         logging.info(f"No yellow highlight in '{field}', as expected.")
                 else:
                     logging.info(
@@ -439,9 +439,9 @@ def verify_autofill_data_on_hover(
             raise ValueError("Given preview data is incomplete.")
         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."
-        )
+        assert all(
+            field in container_data.keys() for field in self.preview_fields
+        ), f"Not all fields present in preview data."
 
         # sanitize data
         if autofill_data.__class__ == CreditCardBase:
@@ -463,9 +463,7 @@ def verify_autofill_data_on_hover(
                 is_present = any(
                     [value in val for val in autofill_data.__dict__.values()]
                 )
-                assert is_present, (
-                    f"Mismatched data: {(field, value)} not in {autofill_data.__dict__.values()}."
-                )
+                assert is_present, f"Mismatched data: {(field, value)} not in {autofill_data.__dict__.values()}."
 
     def sanitize_preview_data(self, field, value):
         if field == "cc-number":

modules/page_object_prefs.py

@@ -170,9 +170,9 @@ def verify_cc_edit_saved_payments_profile(
                 field_value = element.get_attribute("value")
                 if field_value.isnumeric():
                     field_value = int(field_value)
-                assert field_value in expected_cc_data, (
-                    f"{(field_name, field_value)} not found in generated data."
-                )
+                assert (
+                    field_value in expected_cc_data
+                ), f"{(field_name, field_value)} not found in generated data."
                 assert field_value != expected_cvv, "CVV is displayed."
         select_elements = form_container.find_elements(By.TAG_NAME, "select")
         for element in select_elements:
@@ -183,9 +183,9 @@ def verify_cc_edit_saved_payments_profile(
                 field_value = val.first_selected_option.get_attribute("value")[-2:]
                 if field_value.isnumeric():
                     field_value = int(field_value)
-                assert field_value in expected_cc_data, (
-                    f"{(field_name, field_value)} not found in generated data."
-                )
+                assert (
+                    field_value in expected_cc_data
+                ), f"{(field_name, field_value)} not found in generated data."
                 assert field_value != expected_cvv, "CVV is displayed."
         return self