Merge branch 'main' of github.com:NHSDigital/bcss-playwright into feature/BCSS-21310-selenium-to-playwright-fobtregressiontests-scenario-7

# Conflicts:
#	pages/screening_subject_search/advance_fobt_screening_episode_page.py
#	pages/screening_subject_search/reopen_fobt_screening_episode_page.py

Author: adrianoaru-nhs

pages/screening_subject_search/advance_fobt_screening_episode_page.py

@@ -73,9 +73,7 @@ def __init__(self, page: Page):
 
     def click_suitable_for_endoscopic_test_button(self) -> None:
         """Click the 'Suitable for Endoscopic Test' button."""
-        AdvanceFOBTScreeningEpisodePage(self.page).safe_accept_dialog(
-            self.suitable_for_endoscopic_test_button
-        )
+        self.safe_accept_dialog(self.suitable_for_endoscopic_test_button)
 
     def click_calendar_button(self) -> None:
         """Click the calendar button to open the calendar picker."""
@@ -91,19 +89,15 @@ def select_test_type_dropdown_option_2(self, text: str) -> None:
 
     def click_invite_for_diagnostic_test_button(self) -> None:
         """Click the 'Invite for Diagnostic Test' button."""
-        AdvanceFOBTScreeningEpisodePage(self.page).safe_accept_dialog(
-            self.invite_for_diagnostic_test_button
-        )
+        self.safe_accept_dialog(self.invite_for_diagnostic_test_button)
 
     def click_attend_diagnostic_test_button(self) -> None:
         """Click the 'Attend Diagnostic Test' button."""
         self.click(self.attend_diagnostic_test_button)
 
     def click_other_post_investigation_button(self) -> None:
         """Click the 'Other Post-investigation' button."""
-        AdvanceFOBTScreeningEpisodePage(self.page).safe_accept_dialog(
-            self.other_post_investigation_button
-        )
+        self.safe_accept_dialog(self.other_post_investigation_button)
 
     def get_latest_event_status_cell(self, latest_event_status: str) -> Locator:
         """Get the cell containing the latest event status."""

pages/screening_subject_search/reopen_fobt_screening_episode_page.py

@@ -32,6 +32,8 @@ def click_reopen_episode_for_correction_button(self) -> None:
 
     def click_reopen_due_to_subject_or_patient_decision(self) -> None:
         """Click the 'Reopen due to subject or patient decision' button."""
+        self.safe_accept_dialog(self.reopen_due_to_subject_or_patient_decision)
 
     def click_reopen_following_non_response_button(self) -> None:
         """Click the 'Reopen following Non-Response' button."""
+        self.safe_accept_dialog(self.reopen_following_non_response_button)