Refactoring

Author: Andyg79

pages/reports_page.py

@@ -1,6 +1,7 @@
 from playwright.sync_api import Page
 from pages.base_page import BasePage
 
+
 class ReportsPage(BasePage):
     def __init__(self, page):
         super().__init__(page)
@@ -18,19 +19,28 @@ def __init__(self, page):
         self.generate_report_button = self.page.get_by_role("button", name="Generate Report")
         self.reports_update_button = self.page.get_by_role("button", name="Update")
         self.report_timestamp_element = self.page.locator("b")
+        self.set_patients_screening_centre_dropdown = self.page.locator("#cboScreeningCentre")
+
         # Failsafe Reports menu links
         self.date_report_last_requested_page = self.page.get_by_role("link", name="Date Report Last Requested")
-        self.screening_subjects_with_inactive_open_episode_link_page = self.page.get_by_role("link", name="Screening Subjects With")
-        self.subjects_ceased_due_to_date_of_birth_changes_page = self.page.get_by_role("link", name="Subjects Ceased Due to Date")
-        self.allocate_sc_for_patient_movements_within_hub_boundaries_page = self.page.get_by_role("link", name="Allocate SC for Patient Movements within Hub Boundaries")
-        self.allocate_sc_for_patient_movements_into_your_hub_page = self.page.get_by_role("link", name="Allocate SC for Patient Movements into your Hub")
+        self.screening_subjects_with_inactive_open_episode_link_page = self.page.get_by_role("link",
+                                                                                             name="Screening Subjects With")
+        self.subjects_ceased_due_to_date_of_birth_changes_page = self.page.get_by_role("link",
+                                                                                       name="Subjects Ceased Due to Date")
+        self.allocate_sc_for_patient_movements_within_hub_boundaries_page = self.page.get_by_role("link",
+                                                                                                  name="Allocate SC for Patient Movements within Hub Boundaries")
+        self.allocate_sc_for_patient_movements_into_your_hub_page = self.page.get_by_role("link",
+                                                                                          name="Allocate SC for Patient Movements into your Hub")
         self.identify_and_link_new_gp_page = self.page.get_by_role("link", name="Identify and link new GP")
         # Operational Reports menu links
         self.appointment_attendance_not_updated_page = self.page.get_by_role("link", name="Appointment Attendance Not")
         self.fobt_kits_logged_but_not_read_page = self.page.get_by_role("link", name="FOBT Kits Logged but Not Read")
-        self.demographic_update_inconsistent_with_manual_update_page = self.page.get_by_role("link", name="Demographic Update")
-        self.screening_practitioner_6_weeks_availability_not_set_up_report_page = page.get_by_role("link", name="Screening Practitioner 6")
-        self.screening_practitioner_appointments_page = self.page.get_by_role("link", name="Screening Practitioner Appointments")
+        self.demographic_update_inconsistent_with_manual_update_page = self.page.get_by_role("link",
+                                                                                             name="Demographic Update")
+        self.screening_practitioner_6_weeks_availability_not_set_up_report_page = page.get_by_role("link",
+                                                                                                   name="Screening Practitioner 6")
+        self.screening_practitioner_appointments_page = self.page.get_by_role("link",
+                                                                              name="Screening Practitioner Appointments")
 
     # Reports page main menu links
     def go_to_failsafe_reports_page(self) -> None:

tests/test_reports_page.py

@@ -195,21 +195,22 @@ def test_failsafe_reports_allocate_sc_for_patient_movements_within_hub_boundarie
     set_patients_screening_centre_dropdown = page.locator("#cboScreeningCentre")
 
     # Go to failsafe reports page
-    ReportsPage(page).go_to_failsafe_reports_page()
+    failsafe_report_page = ReportsPage(page)
+    failsafe_report_page.go_to_failsafe_reports_page()
 
     # Click on the "Allocate SC for Patient Movements within Hub Boundaries" link
-    ReportsPage(page).go_to_allocate_sc_for_patient_movements_within_hub_boundaries_page()
+    failsafe_report_page.go_to_allocate_sc_for_patient_movements_within_hub_boundaries_page()
 
     # Verify page title is "Allocate SC for Patient Movements within Hub Boundaries"
-    BasePage(page).bowel_cancer_screening_ntsh_page_title_contains_text(
+    failsafe_report_page.bowel_cancer_screening_ntsh_page_title_contains_text(
         "Allocate SC for Patient Movements within Hub Boundaries")
 
     # Click "Generate Report"
-    ReportsPage(page).click_generate_report_button()
+    failsafe_report_page.click_generate_report_button()
 
     # Verify timestamp has updated to current date and time
-    report_timestamp = DateTimeUtils.report_timestamp_date_format()
-    expect(report_timestamp_element).to_contain_text(report_timestamp)
+    # report_timestamp = DateTimeUtils.report_timestamp_date_format()
+    # expect(report_timestamp_element).to_contain_text(report_timestamp)
 
     # Open a screening subject record from the first row/first cell of the table
     nhs_number_link.click()
@@ -221,10 +222,10 @@ def test_failsafe_reports_allocate_sc_for_patient_movements_within_hub_boundarie
     set_patients_screening_centre_dropdown.select_option(tests_properties["coventry_and_warwickshire_bcs_centre"])
 
     # Click update
-    ReportsPage(page).click_reports_pages_update_button()
+    failsafe_report_page.click_reports_pages_update_button()
 
     # Verify new screening centre has saved
-    expect(set_patients_screening_centre_dropdown).to_have_value(
+    expect(ReportsPage(page).set_patients_screening_centre_dropdown).to_have_value(
         tests_properties["coventry_and_warwickshire_bcs_centre"])