addressing PR comments

Author: adrianoaru-nhs

pages/screening_subject_search/advance_episode_page.py

@@ -114,7 +114,7 @@ def __init__(self, page: Page):
             "button",
             name="Refer Another Diagnostic Test after return from Symptomatic Referral",
         )
-        self.refer_to_survelliance_after_symptomatic_referral_button = (
+        self.refer_to_surveillance_after_symptomatic_referral_button = (
             self.page.get_by_role(
                 "button", name="Refer to Surveillance after Symptomatic Referral"
             )
@@ -463,12 +463,12 @@ def click_lnpcp_result_from_symptomatic_procedure_button(self) -> None:
         """Click the 'LNPCP Result from Symptomatic Procedure' button."""
         self.safe_accept_dialog(self.lnpcp_result_from_symptomatic_procedure_button)
 
-    def click_refer_to_survelliance_after_symptomatic_referral_button(
+    def click_refer_to_surveillance_after_symptomatic_referral_button(
         self,
     ) -> None:
         """Click the 'Refer to Surveillance after Symptomatic Referral' button."""
         self.safe_accept_dialog(
-            self.refer_to_survelliance_after_symptomatic_referral_button
+            self.refer_to_surveillance_after_symptomatic_referral_button
         )
 
     def click_redirect_to_rerecord_the_outcome_of_symptomatic_referral_button(

pages/screening_subject_search/discharge_from_surveillance_page.py

@@ -1,4 +1,4 @@
-from playwright.sync_api import Page, expect
+from playwright.sync_api import Page
 from pages.base_page import BasePage
 from datetime import datetime
 from utils.calendar_picker import CalendarPicker
@@ -22,7 +22,7 @@ def __init__(self, page: Page):
         self.notes_field = self.page.locator("#UI_NOTES")
         self.save_button = self.page.get_by_role("button", name="Save")
 
-    def enter_date_decition_made(self, date: datetime) -> None:
+    def enter_date_decision_made(self, date: datetime) -> None:
         """
         Enter a date into the 'Date Decision Made' field
         Args:
@@ -73,9 +73,9 @@ def complete_discharge_from_surveillance_form(
         """
         Completes the discharge from surveillance form.
         Args:
-            include_screening_consultant (bool): Wether or not to include a screening consultant in the form
+            include_screening_consultant (bool): Whether or not to include a screening consultant in the form
         """
-        self.enter_date_decition_made(datetime.today())
+        self.enter_date_decision_made(datetime.today())
         if include_screening_consultant:
             self.select_screening_consultant_from_index(-1)
         self.select_screening_pracitioner_from_index(1)

tests/regression/regression_tests/fobt_regression_tests/test_fobt_scenario_14.py

@@ -819,7 +819,7 @@ def test_scenario_14(page: Page) -> None:
 
     AdvanceFOBTScreeningEpisodePage(
         page
-    ).click_refer_to_survelliance_after_symptomatic_referral_button()
+    ).click_refer_to_surveillance_after_symptomatic_referral_button()
 
     # Then my subject has been updated as follows:
     subject_assertion(
@@ -1009,7 +1009,7 @@ def test_scenario_14(page: Page) -> None:
     SubjectScreeningSummaryPage(page).click_advance_fobt_screening_episode_button()
     AdvanceFOBTScreeningEpisodePage(
         page
-    ).click_refer_to_survelliance_after_symptomatic_referral_button()
+    ).click_refer_to_surveillance_after_symptomatic_referral_button()
     # Then my subject has been updated as follows:
     subject_assertion(
         nhs_no,
@@ -1084,7 +1084,7 @@ def test_scenario_14(page: Page) -> None:
     SubjectScreeningSummaryPage(page).click_advance_fobt_screening_episode_button()
     AdvanceFOBTScreeningEpisodePage(
         page
-    ).click_refer_to_survelliance_after_symptomatic_referral_button()
+    ).click_refer_to_surveillance_after_symptomatic_referral_button()
     # Then my subject has been updated as follows:
     subject_assertion(
         nhs_no,

tests/regression/regression_tests/surveillance_regression_tests/test_surveillance_scenario_2.py

@@ -139,7 +139,7 @@ def test_scenario_2(page: Page, general_properties: dict) -> None:
     screening_subject_page_searcher.navigate_to_subject_summary_page(page, nhs_no)
 
     # And I choose to book a practitioner clinic for my subject
-    SubjectScreeningSummaryPage(page=page).click_book_practitioner_clinic_button()
+    SubjectScreeningSummaryPage(page).click_book_practitioner_clinic_button()
 
     # And I set the practitioner appointment date to "today"
     # And I book the earliest available post investigation appointment on this date
@@ -158,13 +158,6 @@ def test_scenario_2(page: Page, general_properties: dict) -> None:
         nhs_no, "X610", "Surveillance Appointment Invitation Letter", True
     )
 
-    # When I switch users to BCSS "England" as user role "Screening Centre Manager"
-    LogoutPage(page).log_out(close_page=False)
-    BasePage(page).go_to_log_in_page()
-    user_role = UserTools.user_login(page, "Screening Centre Manager at BCS001", True)
-    if user_role is None:
-        raise ValueError("The current user cannot be assigned a user role")
-
     # And I view the subject
     screening_subject_page_searcher.navigate_to_subject_summary_page(page, nhs_no)
 

utils/generate_health_check_forms_util.py

@@ -1,4 +1,3 @@
-import pytest
 from playwright.sync_api import Page
 from pages.base_page import BasePage
 from pages.surveillance.surveillance_page import SurveillancePage
@@ -28,11 +27,15 @@ def invite_surveillance_subjects_early(self, screening_centre_id: str) -> str:
         surveillance_due_count_date = ProduceHealthCheckFormsPage(
             self.page
         ).return_surveillance_due_count_date_value()
-        nhs_no = self.find_early_invite_subjects(screening_centre_id, surveillance_due_count_date)
+        nhs_no = self.find_early_invite_subjects(
+            screening_centre_id, surveillance_due_count_date
+        )
         ProduceHealthCheckFormsPage(self.page).click_generate_healthcheck_forms_button()
         return nhs_no
 
-    def find_early_invite_subjects(self, screening_centre_id: str, surveillance_due_count_date: str) -> str:
+    def find_early_invite_subjects(
+        self, screening_centre_id: str, surveillance_due_count_date: str
+    ) -> str:
         """
         Find an early invite subject for surveillance based on the surveillance due count date.
         Args: