Merge branch 'main' into feature/BCSS-20605-regression-tests-subject-notes

# Conflicts:
#	pages/screening_subject_search/subject_screening_summary_page.py
#	pytest.ini

Author: mepr1

pages/base_page.py

@@ -256,12 +256,17 @@ def assert_dialog_text(self, expected_text: str) -> None:
         Args:
             expected_text (str): The text that should be present in the dialog.
         """
+        self._dialog_assertion_error = None
 
-        def handle_dialog(dialog):
+        def handle_dialog(dialog: Dialog):
+            logging.info(f"Dialog appeared with message: {dialog.message}")
             actual_text = dialog.message
-            assert (
-                actual_text == expected_text
-            ), f"Expected '{expected_text}', but got '{actual_text}'"
+            try:
+                assert (
+                    actual_text == expected_text
+                ), f"Expected '{expected_text}', but got '{actual_text}'"
+            except AssertionError as e:
+                self._dialog_assertion_error = e
             dialog.dismiss()  # Dismiss dialog
 
         self.page.once("dialog", handle_dialog)

pages/screening_subject_search/subject_demographic_page.py

@@ -18,6 +18,41 @@ def __init__(self, page: Page):
         self.update_subject_data_button = self.page.get_by_role(
             "button", name="Update Subject Data"
         )
+        self.temporary_address_show_link = (
+            self.page.locator("font")
+            .filter(has_text="Temporary Address show")
+            .get_by_role("link")
+        )
+        self.temporary_address_valid_from_calendar_button = self.page.locator(
+            "#UI_SUBJECT_ALT_FROM_0_LinkOrButton"
+        )
+        self.temporary_address_valid_to_calendar_button = self.page.locator(
+            "#UI_SUBJECT_ALT_TO_0_LinkOrButton"
+        )
+        self.temporary_address_valid_from_text_box = self.page.get_by_role(
+            "textbox", name="Valid from"
+        )
+        self.temporary_address_valid_to_text_box = self.page.get_by_role(
+            "textbox", name="Valid to"
+        )
+        self.temporary_address_address_line_1 = self.page.locator(
+            "#UI_SUBJECT_ALT_ADDR1_0"
+        )
+        self.temporary_address_address_line_2 = self.page.locator(
+            "#UI_SUBJECT_ALT_ADDR2_0"
+        )
+        self.temporary_address_address_line_3 = self.page.locator(
+            "#UI_SUBJECT_ALT_ADDR3_0"
+        )
+        self.temporary_address_address_line_4 = self.page.locator(
+            "#UI_SUBJECT_ALT_ADDR4_0"
+        )
+        self.temporary_address_address_line_5 = self.page.locator(
+            "#UI_SUBJECT_ALT_ADDR5_0"
+        )
+        self.temporary_address_postcode = self.page.locator(
+            "#UI_SUBJECT_ALT_POSTCODE_0"
+        )
 
     def is_forename_filled(self) -> bool:
         """
@@ -99,3 +134,53 @@ def get_dob_field_value(self) -> str:
             str: The subject's date of birth as a string
         """
         return self.dob_field.input_value()
+
+    def update_temporary_address(self, dict: dict) -> None:
+        """
+        Updates the temporary address fields with the provided dictionary values.
+        Args:
+            dict (dict): A dictionary containing the temporary address details.
+                Expected keys: 'valid_from', 'valid_to', 'address_line_1',
+                'address_line_2', 'address_line_3', 'address_line_4', 'address_line_5'.
+        """
+        # Click the link to show the temporary address fields
+        if self.temporary_address_show_link.is_visible():
+            # If the link is visible, click it to show the temporary address fields
+            self.click(self.temporary_address_show_link)
+
+        # Update the valid from date
+        if "valid_from" in dict:
+            if dict["valid_from"] is None:
+                self.temporary_address_valid_from_text_box.fill("")
+            else:
+                CalendarPicker(self.page).calendar_picker_ddmmyyyy(
+                    dict["valid_from"], self.temporary_address_valid_from_text_box
+                )
+
+        # Update the valid to date
+        if "valid_to" in dict:
+            if dict["valid_to"] is None:
+                self.temporary_address_valid_to_text_box.fill("")
+            else:
+                CalendarPicker(self.page).calendar_picker_ddmmyyyy(
+                    dict["valid_to"], self.temporary_address_valid_to_text_box
+                )
+
+        # Fill in the address lines
+        if "address_line_1" in dict:
+            self.temporary_address_address_line_1.fill(dict["address_line_1"])
+        if "address_line_2" in dict:
+            self.temporary_address_address_line_2.fill(dict["address_line_2"])
+        if "address_line_3" in dict:
+            self.temporary_address_address_line_3.fill(dict["address_line_3"])
+        if "address_line_4" in dict:
+            self.temporary_address_address_line_4.fill(dict["address_line_4"])
+        if "address_line_5" in dict:
+            self.temporary_address_address_line_5.fill(dict["address_line_5"])
+
+        # Fill in the postcode
+        if "postcode" in dict:
+            self.temporary_address_postcode.fill(dict["postcode"])
+
+        # Click the update subject data button to save changes
+        self.update_subject_data_button.click()

pages/screening_subject_search/subject_screening_summary_page.py

@@ -55,6 +55,11 @@ def __init__(self, page: Page):
             "button", name="Advance FOBT Screening Episode"
         )
         self.additional_care_note_link = self.page.get_by_role("link", name="(AN)")
+        self.temporary_address_icon = self.page.get_by_role(
+            "link", name="The person has a current"
+        )
+        self.temporary_address_popup = self.page.locator("#idTempAddress")
+        self.close_button = self.page.get_by_role("img", name="close")
 
     def wait_for_page_title(self) -> None:
         """Waits for the page to be the Subject Screening Summary"""
@@ -232,6 +237,37 @@ def verify_note_link_not_present(self, note_type_name: str) -> None:
             not note_link_locator.is_visible()
         ), f"'{note_type_name}' link is visible, but it should not be."
         logging.info(f"Verified: '{note_type_name}' link is not visible.")
+    def verify_temporary_address_popup_visible(self) -> None:
+        """Verify that the temporary address popup is visible."""
+        try:
+            expect(self.temporary_address_popup).to_be_visible()
+            logging.info("Temporary address popup is visible")
+        except Exception as e:
+            pytest.fail(f"Temporary address popup is not visible: {e}")
+
+    def click_temporary_address_icon(self) -> None:
+        """Click on the temporary address icon."""
+        self.click(self.temporary_address_icon)
+
+    def verify_temporary_address_icon_visible(self) -> None:
+        """Verify that the temporary address icon is visible."""
+        try:
+            expect(self.temporary_address_icon).to_be_visible()
+            logging.info("Temporary address icon is visible")
+        except Exception as e:
+            pytest.fail(f"Temporary address icon is not visible when it should be: {e}")
+
+    def verify_temporary_address_icon_not_visible(self) -> None:
+        """Verify that the temporary address icon is not visible."""
+        try:
+            expect(self.temporary_address_icon).not_to_be_visible()
+            logging.info("Temporary address icon is not visible as expected")
+        except Exception as e:
+            pytest.fail(f"Temporary address icon is visible when it should not be: {e}")
+
+    def click_close_button(self) -> None:
+        """Click on the close button in the temporary address popup."""
+        self.click(self.close_button)
 
 
 class ChangeScreeningStatusOptions(Enum):

pytest.ini

@@ -40,3 +40,5 @@ markers =
     regression: tests that are part of the regression test suite
     call_and_recall: tests that are part of the call and recall test suite
     notes_tests: tests that are part of the notes test suite
+    subject_tests: tests that are part of the subject tests suite
+    subject_search: tests that are part of the subject search test suite