Merge branch 'main' of github.com:NHSDigital/bcss-playwright into feature/BCSS-20229-playwright-compartment4-page-object-models

# Conflicts:
#	utils/calendar_picker.py

Author: adrianoaru-nhs

pages/base_page.py

@@ -36,7 +36,7 @@ def __init__(self, page: Page):
         self.organisations_page = self.page.get_by_role("link", name="Organisations")
         self.reports_page = self.page.get_by_role("link", name="Reports")
         self.screening_practitioner_appointments_page = self.page.get_by_role(
-            "link", name="Screening Practitioner"
+            "link", name="Screening Practitioner Appointments"
         )
         self.screening_subject_search_page = self.page.get_by_role(
             "link", name="Screening Subject Search"
@@ -51,10 +51,8 @@ def __init__(self, page: Page):
         self.main_menu__header = self.page.locator("#ntshPageTitle")
 
     def click_main_menu_link(self) -> None:
-        for _ in range(3):  # Try up to 3 times
-            if self.main_menu_link.is_visible():
-                self.click(self.main_menu_link)
-                return  # Exit if successful
+        if self.main_menu_link.is_visible():
+            self.click(self.main_menu_link)
 
     def click_log_out_link(self) -> None:
         self.click(self.log_out_link)
@@ -144,15 +142,22 @@ def go_to_screening_subject_search_page(self) -> None:
         self.click(self.screening_subject_search_page)
 
     def click(self, locator: Locator) -> None:
+        # Alerts table locator
+        alerts_table = locator.get_by_role("table", name="cockpitalertbox")
         """
         This is used to click on a locator
         The reason for this being used over the normal playwright click method is due to:
         - BCSS sometimes takes a while to render and so the normal click function 'clicks' on a locator before its available
         - Increases the reliability of clicks to avoid issues with the normal click method
         """
+        if alerts_table.is_visible():
+            alerts_table.wait_for(state="attached")
+            alerts_table.wait_for(state="visible")
+
         try:
             self.page.wait_for_load_state("load")
             self.page.wait_for_load_state("domcontentloaded")
+            self.page.wait_for_load_state("networkidle")
             locator.wait_for(state="attached")
             locator.wait_for(state="visible")
             locator.click()

pages/fit_test_kits/fit_test_kits_page.py

@@ -36,6 +36,10 @@ def __init__(self, page: Page):
         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:
         expect(self.fit_test_kits_title).to_contain_text("FIT Test Kits")
 

pages/fit_test_kits/maintain_analysers_page.py

@@ -10,4 +10,4 @@ def __init__(self, page: Page):
         self.maintain_analysers_title = self.page.locator("#ntshPageTitle")
 
     def verify_maintain_analysers_title(self) -> None:
-        expect(self.maintain_analysers_title).to_contain_text("FIT QC Products")
+        expect(self.maintain_analysers_title).to_contain_text("Maintain Analysers")

pages/fit_test_kits/screening_incidents_list_page.py

@@ -11,5 +11,5 @@ def __init__(self, page: Page):
 
     def verify_screening_incidents_list_title(self) -> None:
         expect(self.screening_incidents_list_title).to_contain_text(
-            "Select Screening Centre"
+            "Screening Incidents List"
         )

pages/fit_test_kits/view_screening_centre_fit_configuration_page.py

@@ -8,6 +8,14 @@ def __init__(self, page: Page):
         self.page = page
         # View Screening Centre FIT Configuration - page locators
         self.view_screening_centre_body = self.page.locator("body")
+        self.screening_centre_fit_title = self.page.get_by_role(
+            "heading", name="View Screening Centre FIT"
+        )
 
     def verify_view_screening_centre_body(self) -> None:
         expect(self.view_screening_centre_body).to_contain_text("Maintain Analysers")
+
+    def verify_view_screening_centre_fit_title(self) -> None:
+        expect(self.screening_centre_fit_title).to_contain_text(
+            "View Screening Centre FIT Configuration"
+        )

pages/gfobt_test_kits/gfobt_test_kits_page.py

@@ -25,7 +25,7 @@ def go_to_test_kit_reading_page(self) -> None:
         self.click(self.test_kit_reading_page)
 
     def go_to_test_kit_result_page(self) -> None:
-        self.click(self.test_kit_reading_page)
+        self.click(self.test_kit_result_page)
 
     def go_to_create_qc_kit_page(self) -> None:
         self.click(self.create_qc_kit_page)

pages/cognito_login_page.py pages/login/cognito_login_page.pypages/cognito_login_page.py renamed to pages/login/cognito_login_page.py

@@ -153,7 +153,7 @@ def click_reports_pages_update_button(self) -> None:
     def go_to_date_report_last_requested_page(self) -> None:
         self.click(self.date_report_last_requested_link)
 
-    def go_to_screening_subjects_with_inactive_open_episode_link_page(self) -> None:
+    def go_to_screening_subjects_with_inactive_open_episode_page(self) -> None:
         self.click(self.screening_subjects_with_inactive_open_episode_link)
 
     def go_to_subjects_ceased_due_to_date_of_birth_changes_page(self) -> None:

pages/reports/reports_page.py

@@ -1,6 +1,7 @@
 from playwright.sync_api import Page, expect, Locator
 from pages.base_page import BasePage
 from enum import Enum
+import pytest
 
 
 class SubjectScreeningSummary(BasePage):

pages/screening_subject_search/subject_screening_summary.py

@@ -32,3 +32,4 @@ markers =
     compartment1: only for compartment 1
     compartment2: only for compartment 2
     compartment3: only for compartment 3
+    vpn_required: for tests that require a VPN connection