Responded to review comments

victor-soares-ibm · victor-soares-ibm · commit 567f7d01eafc · 2025-05-23T17:11:37.000+01:00
diff --git a/pages/bowel_scope/bowel_scope_appointments_page.py b/pages/bowel_scope/bowel_scope_appointments_page.py
@@ -8,11 +8,10 @@ class BowelScopeAppointmentsPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
-        # Bowel Scope Appointments - page locators
-        self.page_title = self.page.locator("#ntshPageTitle")
+        # Bowel Scope Appointments - page locators, methods
 
     def verify_page_title(self) -> None:
         """Verifies the page title of the Bowel Scope Appointments page"""
-        BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
+        self.bowel_cancer_screening_page_title_contains_text(
             "Appointment Calendar"
         )
diff --git a/pages/call_and_recall/age_extension_rollout_plans_page.py b/pages/call_and_recall/age_extension_rollout_plans_page.py
@@ -8,11 +8,10 @@ class AgeExtensionRolloutPlansPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
-        # Age Extension Rollout Plans - page locators
-        self.age_extension_rollout_plans_title = self.page.locator("#page-title")
+        # Age Extension Rollout Plans - page locators, methods
 
     def verify_age_extension_rollout_plans_title(self) -> None:
         """Verifies the page title of the Age Extension Rollout Plans page"""
-        BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
+        self.bowel_cancer_screening_page_title_contains_text(
             "Age Extension Rollout Plans"
         )
diff --git a/pages/call_and_recall/create_a_plan_page.py b/pages/call_and_recall/create_a_plan_page.py
@@ -23,7 +23,6 @@ def __init__(self, page: Page):
         self.save_note_button = self.page.locator("#saveNote").get_by_role(
             "button", name="Save"
         )
-        self.create_a_plan_title = self.page.locator("#page-title")
 
     def click_set_all_button(self) -> None:
         """Clicks the Set all button to set all values"""
@@ -59,6 +58,4 @@ def click_save_note_button(self) -> None:
 
     def verify_create_a_plan_title(self) -> None:
         """Verifies the Create a Plan page title"""
-        BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
-            "View a plan"
-        )
+        self.bowel_cancer_screening_page_title_contains_text("View a plan")
diff --git a/pages/call_and_recall/generate_invitations_page.py b/pages/call_and_recall/generate_invitations_page.py
@@ -18,7 +18,6 @@ def __init__(self, page: Page):
         self.refresh_button = self.page.get_by_role("button", name="Refresh")
         self.planned_invitations_total = self.page.locator("#col8_total")
         self.self_referrals_total = self.page.locator("#col9_total")
-        self.generate_invitations_title = self.page.locator("#ntshPageTitle")
 
     def click_generate_invitations_button(self) -> None:
         """This function is used to click the Generate Invitations button."""
@@ -30,13 +29,11 @@ def click_refresh_button(self) -> None:
 
     def verify_generate_invitations_title(self) -> None:
         """This function is used to verify the Generate Invitations page title."""
-        BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
-            "Generate Invitations"
-        )
+        self.bowel_cancer_screening_page_title_contains_text("Generate Invitations")
 
     def verify_invitation_generation_progress_title(self) -> None:
         """This function is used to verify the Invitation Generation Progress page title."""
-        BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
+        self.bowel_cancer_screening_page_title_contains_text(
             "Invitation Generation Progress"
         )
 
diff --git a/pages/call_and_recall/invitations_monitoring_page.py b/pages/call_and_recall/invitations_monitoring_page.py
@@ -8,12 +8,11 @@ class InvitationsMonitoringPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
-        self.invitations_monitoring_title = self.page.locator("#page-title")
 
     def go_to_invitation_plan_page(self, sc_id) -> None:
         self.click(self.page.get_by_role("link", name=sc_id))
 
     def verify_invitations_monitoring_title(self) -> None:
-        BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
+        self.bowel_cancer_screening_page_title_contains_text(
             "Invitations Monitoring - Screening Centre"
         )
diff --git a/pages/call_and_recall/non_invitations_days_page.py b/pages/call_and_recall/non_invitations_days_page.py
@@ -8,11 +8,8 @@ class NonInvitationDaysPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
-        # Non Invitation Days - page locators
-        self.non_invitations_days_title = self.page.locator("#ntshPageTitle")
+        # Non Invitation Days - page locators, methods
 
     def verify_non_invitation_days_tile(self) -> None:
         """Verifies the page title of the Non Invitation Days page"""
-        BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
-            "Non-Invitation Days"
-        )
+        self.bowel_cancer_screening_page_title_contains_text("Non-Invitation Days")
diff --git a/pages/communication_production/batch_list_page.py b/pages/communication_production/batch_list_page.py
@@ -23,7 +23,6 @@ def __init__(self, page: Page):
         self.batch_successfully_archived_msg = self.page.locator(
             'text="Batch Successfully Archived and Printed"'
         )
-        self.batch_list_page_title = self.page.locator("#page-title")
         self.deadline_calendar_picker = self.page.locator("i")
         self.deadline_date_filter = self.page.get_by_role("cell", name="").get_by_role(
             "textbox"
@@ -35,7 +34,7 @@ def __init__(self, page: Page):
 
     def verify_batch_list_page_title(self, text) -> None:
         """Verify the Batch List page title is displayed as expected"""
-        BasePage(self.page).bowel_cancer_screening_page_title_contains_text(text)
+        self.bowel_cancer_screening_page_title_contains_text(text)
 
     def verify_table_data(self, value) -> None:
         """Verify the table data is displayed as expected"""
diff --git a/pages/communication_production/electronic_communications_management_page.py b/pages/communication_production/electronic_communications_management_page.py
@@ -8,13 +8,10 @@ class ElectronicCommunicationManagementPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
-        # Electronic Communication Management - page locators
-        self.electronic_communication_management_title = self.page.locator(
-            "#page-title"
-        )
+        # Electronic Communication Management - page locators, methods
 
     def verify_electronic_communication_management_title(self) -> None:
         """Verify the Electronic Communication Management page title is displayed as expected"""
-        BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
+        self.bowel_cancer_screening_page_title_contains_text(
             "Electronic Communication Management"
         )
diff --git a/pages/communication_production/letter_library_index_page.py b/pages/communication_production/letter_library_index_page.py
@@ -8,11 +8,8 @@ class LetterLibraryIndexPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
-        # Letter Library Index - page locators
-        self.letter_library_index_title = self.page.locator("#ntshPageTitle")
+        # Letter Library Index - page locators, methods
 
     def verify_letter_library_index_title(self) -> None:
         """Verify the Letter Library Index page title is displayed as expected"""
-        BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
-            "Letter Library Index"
-        )
+        self.bowel_cancer_screening_page_title_contains_text("Letter Library Index")
diff --git a/pages/communication_production/letter_signatory_page.py b/pages/communication_production/letter_signatory_page.py
@@ -8,11 +8,10 @@ class LetterSignatoryPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
-        # Letter Signatory - page locators
-        self.letter_signatory_title = self.page.locator("#ntshPageTitle")
+        # Letter Signatory - page locators, methods
 
     def verify_letter_signatory_title(self) -> None:
         """Verify the Letter Signatory page title is displayed as expected"""
-        BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
+        self.bowel_cancer_screening_page_title_contains_text(
             "Letter Signatory"
         )
diff --git a/pages/contacts_list/edit_my_contact_details_page.py b/pages/contacts_list/edit_my_contact_details_page.py
@@ -8,11 +8,8 @@ class EditMyContactDetailsPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
-        # Edit My Contact Details - page locators
-        self.edit_my_contact_details_title = self.page.locator("#ntshPageTitle")
+        # Edit My Contact Details - page locators, methods
 
     def verify_edit_my_contact_details_title(self) -> None:
         """Verify the Edit My Contact Details page title is displayed correctly"""
-        BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
-            "Edit My Contact Details"
-        )
+        self.bowel_cancer_screening_page_title_contains_text("Edit My Contact Details")
diff --git a/pages/contacts_list/maintain_contacts_page.py b/pages/contacts_list/maintain_contacts_page.py
@@ -8,11 +8,8 @@ class MaintainContactsPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
-        # Maintain Contacts - page locators
-        self.maintain_contacts_title = self.page.locator("#ntshPageTitle")
+        # Maintain Contacts - page locators, methods
 
     def verify_maintain_contacts_title(self) -> None:
         """Verify the Maintain Contacts page title is displayed correctly"""
-        BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
-            "Maintain Contacts"
-        )
+        self.bowel_cancer_screening_page_title_contains_text("Maintain Contacts")
diff --git a/pages/contacts_list/my_preference_settings_page.py b/pages/contacts_list/my_preference_settings_page.py
@@ -8,11 +8,10 @@ class MyPreferenceSettingsPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
-        # My Preference Settings - page locators
-        self.my_preference_settings_title = self.page.locator("#ntshPageTitle")
+        # My Preference Settings - page locators, methods
 
     def verify_my_preference_settings_title(self) -> None:
         """Verify the My Preference Settings page title is displayed correctly"""
-        BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
+        self.bowel_cancer_screening_page_title_contains_text(
             "My Preference Settings"
         )
diff --git a/pages/contacts_list/view_contacts_page.py b/pages/contacts_list/view_contacts_page.py
@@ -8,11 +8,10 @@ class ViewContactsPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
-        # View Contacts - page locators
-        self.view_contacts_title = self.page.locator("#ntshPageTitle")
+        # View Contacts - page locators, methods
 
     def verify_view_contacts_title(self) -> None:
         """Verify the View Contacts page title is displayed correctly"""
-        BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
+        self.bowel_cancer_screening_page_title_contains_text(
             "View Contacts"
         )
diff --git a/pages/download/batch_download_request_and_retrieval_page.py b/pages/download/batch_download_request_and_retrieval_page.py
@@ -9,9 +9,6 @@ def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
         # Batch Download Request And Retrieval - page locators
-        self.batch_download_request_and_retrieval_title = self.page.locator(
-            "#ntshPageTitle"
-        )
         self.page_form = self.page.locator('form[name="frm"]')
 
     def expect_form_to_have_warning(self) -> None:
@@ -22,6 +19,6 @@ def expect_form_to_have_warning(self) -> None:
 
     def verify_batch_download_request_and_retrieval_title(self) -> None:
         """Verifies that the Batch Download Request and Retrieval page title is displayed correctly."""
-        BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
+        self.bowel_cancer_screening_page_title_contains_text(
             "Batch Download Request and Retrieval"
         )
diff --git a/pages/download/individual_download_request_and_retrieval_page.py b/pages/download/individual_download_request_and_retrieval_page.py
@@ -9,14 +9,11 @@ def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
         # Individual Download Request And Retrieval - page locators
-        self.individual_download_request_and_retrieval_title = self.page.locator(
-            "#ntshPageTitle"
-        )
         self.page_form = self.page.locator('form[name="frm"]')
 
     def verify_individual_download_request_and_retrieval_title(self) -> None:
         """Verifies that the Individual Download Request and Retrieval page title is displayed correctly."""
-        BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
+        self.bowel_cancer_screening_page_title_contains_text(
             "Individual Download Request and Retrieval"
         )
 
diff --git a/pages/download/list_of_individual_downloads_page.py b/pages/download/list_of_individual_downloads_page.py
@@ -8,11 +8,10 @@ class ListOfIndividualDownloadsPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
-        # List Of Individual Downloads - page locators
-        self.list_of_individual_downloads_title = self.page.locator("#ntshPageTitle")
+        # List Of Individual Downloads - page locators, methods
 
     def verify_list_of_individual_downloads_title(self) -> None:
         """Verifies that the List of Individual Downloads page title is displayed correctly."""
-        BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
+        self.bowel_cancer_screening_page_title_contains_text(
             "List of Individual Downloads"
         )
diff --git a/pages/fit_test_kits/fit_test_kits_page.py b/pages/fit_test_kits/fit_test_kits_page.py
@@ -36,17 +36,13 @@ def __init__(self, page: Page):
             "link", name="Maintain Analysers"
         )
         self.fit_device_id = self.page.get_by_role("textbox", name="FIT Device ID")
-        self.fit_test_kits_title = self.page.locator("#ntshPageTitle")
-
         self.sc_fit_configuration_page_screening_centre_dropdown = page.locator(
             "#screeningCentres"
         )
 
     def verify_fit_test_kits_title(self) -> None:
         """Verifies that the FIT Test Kits page title is displayed correctly."""
-        BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
-            "FIT Test Kits"
-        )
+        self.bowel_cancer_screening_page_title_contains_text("FIT Test Kits")
 
     def go_to_fit_rollout_summary_page(self) -> None:
         """Navigates to the FIT Rollout Summary page."""
diff --git a/pages/fit_test_kits/kit_result_audit_page.py b/pages/fit_test_kits/kit_result_audit_page.py
@@ -8,11 +8,10 @@ class KitResultAuditPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
-        # Kit Result Audit - page locators
-        self.kit_result_audit_title = self.page.locator("#page-title")
+        # Kit Result Audit - page locators, methods
 
     def verify_kit_result_audit_title(self) -> None:
         """Verifies that the Kit Result Audit page title is displayed correctly."""
-        BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
+        self.bowel_cancer_screening_page_title_contains_text(
             "Kit Result Audit"
         )
diff --git a/pages/fit_test_kits/kit_service_management_page.py b/pages/fit_test_kits/kit_service_management_page.py
@@ -8,11 +8,8 @@ class KitServiceManagementPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
-        # KIT Service Management - page locators
-        self.kit_service_management_title = self.page.locator("#page-title")
+        # KIT Service Management - page locators, methods
 
     def verify_kit_service_management_title(self) -> None:
         """Verifies that the Kit Service Management page title is displayed correctly."""
-        BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
-            "Kit Service Management"
-        )
+        self.bowel_cancer_screening_page_title_contains_text("Kit Service Management")
diff --git a/pages/fit_test_kits/log_devices_page.py b/pages/fit_test_kits/log_devices_page.py
@@ -33,7 +33,7 @@ def __init__(self, page: Page):
 
     def verify_log_devices_title(self) -> None:
         """Verifies that the Log Devices page title is displayed correctly."""
-        BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
+        self.bowel_cancer_screening_page_title_contains_text(
             "Scan Device"
         )
 
diff --git a/pages/fit_test_kits/maintain_analysers_page.py b/pages/fit_test_kits/maintain_analysers_page.py
@@ -8,11 +8,8 @@ class MaintainAnalysersPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
-        # Maintain Analysers - page locators
-        self.maintain_analysers_title = self.page.locator("#ntshPageTitle")
+        # Maintain Analysers - page locators, methods
 
     def verify_maintain_analysers_title(self) -> None:
         """Verify the Maintain Analysers page title is displayed correctly."""
-        BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
-            "Maintain Analysers"
-        )
+        self.bowel_cancer_screening_page_title_contains_text("Maintain Analysers")
diff --git a/pages/fit_test_kits/manage_qc_products_page.py b/pages/fit_test_kits/manage_qc_products_page.py
@@ -8,11 +8,10 @@ class ManageQCProductsPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
-        # Manage QC Products - page locators
-        self.manage_qc_products_title = self.page.locator("#page-title")
+        # Manage QC Products - page locators, methods
 
     def verify_manage_qc_products_title(self) -> None:
         """Verify the Manage QC Products page title is displayed correctly."""
-        BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
+        self.bowel_cancer_screening_page_title_contains_text(
             "FIT QC Products"
         )
diff --git a/pages/fit_test_kits/screening_incidents_list_page.py b/pages/fit_test_kits/screening_incidents_list_page.py
@@ -8,11 +8,10 @@ class ScreeningIncidentsListPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
-        # Screening Incidents List - page locators
-        self.screening_incidents_list_title = self.page.locator("#page-title")
+        # Screening Incidents List - page locators, methods
 
     def verify_screening_incidents_list_title(self) -> None:
         """Verify the Screening Incidents List page title is displayed correctly."""
-        BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
+        self.bowel_cancer_screening_page_title_contains_text(
             "Screening Incidents List"
         )
diff --git a/pages/gfobt_test_kits/gfobt_create_qc_kit_page.py b/pages/gfobt_test_kits/gfobt_create_qc_kit_page.py
@@ -23,7 +23,7 @@ def __init__(self, page: Page):
 
     def verify_create_qc_kit_title(self) -> None:
         """Verify the Create QC Kit page title contains text "Create QC Kit"."""
-        BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
+        self.bowel_cancer_screening_page_title_contains_text(
             "Create QC Kit"
         )
 
diff --git a/pages/gfobt_test_kits/gfobt_test_kit_logging_page.py b/pages/gfobt_test_kits/gfobt_test_kit_logging_page.py
@@ -8,10 +8,7 @@ class GFOBTTestKitLoggingPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
-        self.test_kit_logging_title = self.page.locator("#ntshPageTitle")
 
     def verify_test_kit_logging_title(self) -> None:
         """Verify the title of the GFOBT Test Kit Logging page."""
-        BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
-            "Test Kit Logging"
-        )
+        self.bowel_cancer_screening_page_title_contains_text("Test Kit Logging")
diff --git a/pages/gfobt_test_kits/gfobt_test_kit_quality_control_reading_page.py b/pages/gfobt_test_kits/gfobt_test_kit_quality_control_reading_page.py
@@ -8,12 +8,9 @@ class GFOBTTestKitQualityControlReadingPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
-        self.test_kit_quality_control_reading_title = self.page.locator(
-            "#ntshPageTitle"
-        )
 
     def verify_test_kit_logging_tile(self) -> None:
         """Verify the title of the GFOBT Test Kit Quality Control Reading page."""
-        BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
+        self.bowel_cancer_screening_page_title_contains_text(
             "Test Kit Quality Control Reading"
         )
diff --git a/pages/gfobt_test_kits/gfobt_view_test_kit_result_page.py b/pages/gfobt_test_kits/gfobt_view_test_kit_result_page.py
diff --git a/pages/lynch_surveillance/set_lynch_invitation_rates_page.py b/pages/lynch_surveillance/set_lynch_invitation_rates_page.py
diff --git a/pages/screening_practitioner_appointments/colonoscopy_assessment_appointments_page.py b/pages/screening_practitioner_appointments/colonoscopy_assessment_appointments_page.py
diff --git a/pages/screening_subject_search/subject_screening_summary_page.py b/pages/screening_subject_search/subject_screening_summary_page.py
diff --git a/tests/test_fit_test_kits_page.py b/tests/test_fit_test_kits_page.py
diff --git a/tests/test_screening_subject_search_page.py b/tests/test_screening_subject_search_page.py
