Adding more scenarios and ifxing subject selection query builder for temporary addresses

Author: adrianoaru-nhs

pages/base_page.py

@@ -249,20 +249,24 @@ def safe_accept_dialog(self, locator: Locator) -> None:
         except Exception as e:
             logging.error(f"Click failed: {e}")
 
-
     def assert_dialog_text(self, expected_text: str) -> None:
         """
         Asserts that a dialog appears and contains the expected text.
         If no dialog appears, logs an error.
         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

@@ -143,11 +143,10 @@ def update_temporary_address(self, dict: dict) -> None:
                           Expected keys: 'valid_from', 'valid_to', 'address_line_1',
                           'address_line_2', 'address_line_3', 'address_line_4', 'address_line_5'.
         """
-        if not dict:
-            raise ValueError("The 'dict' argument cannot be None or empty")
-
         # Click the link to show the temporary address fields
-        self.click(self.temporary_address_show_link)
+        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:

pytest.ini

@@ -39,3 +39,5 @@ markers =
     vpn_required: for tests that require a VPN connection
     regression: tests that are part of the regression test suite
     call_and_recall: tests that are part of the call and recall 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