Removed hardcoded values from Organisations page.

Added Organisations page POM
Added bowel_cancer_screening_page_title_contains_text function on BasePage

# Conflicts:
#	pages/base_page.py

Author: Andyg79

pages/base_page.py

@@ -1,6 +1,7 @@
 from playwright.sync_api import Page, expect
 import logging
 
+
 class BasePage:
     def __init__(self, page: Page):
         self.page = page
@@ -32,79 +33,87 @@ def __init__(self, page: Page):
         self.bowel_cancer_screening_system_header = self.page.locator("#ntshAppTitle")
         self.main_menu__header = self.page.locator("#ntshPageTitle")
 
-    def click_main_menu_link(self)->None:
+    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
 
-    def click_log_out_link(self)->None:
+    def click_log_out_link(self) -> None:
         self.click(self.log_out_link)
 
-    def click_sub_menu_link(self)->None:
+    def click_sub_menu_link(self) -> None:
         self.click(self.sub_menu_link)
 
-    def click_hide_sub_menu_link(self)->None:
+    def click_hide_sub_menu_link(self) -> None:
         self.click(self.hide_sub_menu_link)
 
-    def click_select_org_link(self)->None:
+    def click_select_org_link(self) -> None:
         self.click(self.select_org_link)
 
-    def click_back_button(self)->None:
+    def click_back_button(self) -> None:
         self.click(self.back_button)
 
-    def click_release_notes_link(self)->None:
+    def click_release_notes_link(self) -> None:
         self.click(self.release_notes_link)
 
-    def click_refresh_alerts_link(self)->None:
+    def click_refresh_alerts_link(self) -> None:
         self.click(self.refresh_alerts_link)
 
-    def click_user_guide_link(self)->None:
+    def click_user_guide_link(self) -> None:
         self.click(self.user_guide_link)
 
-    def click_help_link(self)->None:
+    def click_help_link(self) -> None:
         self.click(self.help_link)
 
-    def bowel_cancer_screening_system_header_is_displayed(self)->None:
+    def bowel_cancer_screening_system_header_is_displayed(self) -> None:
         expect(self.bowel_cancer_screening_system_header).to_contain_text("Bowel Cancer Screening System")
 
     def main_menu_header_is_displayed(self)->None:
         expect(self.main_menu__header).to_contain_text("Main Menu")
 
-    def go_to_contacts_list_page(self)->None:
+    def bowel_cancer_screening_page_title_contains_text(self, text: str) -> None:
+        """Asserts that the page title contains the specified text.
+
+            Args:
+                text (str): The expected text that you want to assert for the page title ("#ntshPageTitle") element.
+        """
+        expect(self.bowel_cancer_screening_page_header).to_contain_text(text)
+
+    def go_to_contacts_list_page(self) -> None:
         self.click(self.contacts_list_page)
 
-    def go_to_bowel_scope_page(self)->None:
+    def go_to_bowel_scope_page(self) -> None:
         self.click(self.bowel_scope_page)
 
-    def go_to_call_and_recall_page(self)->None:
+    def go_to_call_and_recall_page(self) -> None:
         self.click(self.call_and_recall_page)
 
-    def go_to_communications_production_page(self)->None:
+    def go_to_communications_production_page(self) -> None:
         self.click(self.communications_production_page)
 
-    def go_to_download_page(self)->None:
+    def go_to_download_page(self) -> None:
         self.click(self.download_page)
 
-    def go_to_fit_test_kits_page(self)->None:
+    def go_to_fit_test_kits_page(self) -> None:
         self.click(self.fit_test_kits_page)
 
     def go_to_gfobt_test_kits_page(self)->None:
         self.click(self.gfobt_test_kits_page)
 
-    def go_to_lynch_surveillance_page(self)->None:
+    def go_to_lynch_surveillance_page(self) -> None:
         self.click(self.lynch_surveillance_page)
 
-    def go_to_organisations_page(self)->None:
+    def go_to_organisations_page(self) -> None:
         self.click(self.organisations_page)
 
-    def go_to_reports_page(self)->None:
+    def go_to_reports_page(self) -> None:
         self.click(self.reports_page)
 
-    def go_to_screening_practitioner_appointments_page(self)->None:
+    def go_to_screening_practitioner_appointments_page(self) -> None:
         self.click(self.screening_practitioner_appointments_page)
 
-    def go_to_screening_subject_search_page(self)->None:
+    def go_to_screening_subject_search_page(self) -> None:
         self.click(self.screening_subject_search_page)
 
     def click(self, locator) -> None:

pages/organisations_page.py

@@ -0,0 +1,35 @@
+from playwright.sync_api import Page
+
+from pages.base_page import BasePage
+
+
+class OrganisationsPage(BasePage):
+    def __init__(self, page: Page):
+        super().__init__(page)
+        self.page = page
+
+        # Organisations page links
+        self.screening_centre_parameters_page = self.page.get_by_role("link", name="Screening Centre Parameters")
+        self.organisation_parameters_page = self.page.get_by_role("link", name="Organisation Parameters")
+        self.organisations_and_site_details_page = self.page.get_by_role("link", name="Organisation and Site Details")
+        self.gp_practice_endorsement_page = self.page.get_by_role("link", name="GP Practice Endorsement")
+        self.upload_nacs_data_bureau_page = self.page.get_by_role("link", name="Upload NACS data (Bureau)")
+        self.bureau_page = self.page.get_by_role("link", name="Bureau")
+
+    def go_to_screening_centre_parameters_page(self) -> None:
+        self.click(self.screening_centre_parameters_page)
+
+    def go_to_organisation_parameters_page(self) -> None:
+        self.click(self.organisation_parameters_page)
+
+    def go_to_organisations_and_site_details_page(self) -> None:
+        self.click(self.organisations_and_site_details_page)
+
+    def go_to_gp_practice_endorsement_page(self) -> None:
+        self.click(self.gp_practice_endorsement_page)
+
+    def go_to_upload_nacs_data_bureau_page(self) -> None:
+        self.click(self.upload_nacs_data_bureau_page)
+
+    def go_to_bureau_page(self) -> None:
+        self.click(self.bureau_page)

tests/test_organisations_page.py

@@ -1,10 +1,10 @@
-import pytest
 from sys import platform
+import pytest
+from jproperties import Properties
 from playwright.sync_api import Page, expect
-from utils.click_helper import click
 from pages.base_page import BasePage
+from pages.organisations_page import OrganisationsPage
 from utils.user_tools import UserTools
-from jproperties import Properties
 
 
 @pytest.fixture
@@ -40,46 +40,49 @@ def before_each(page: Page):
 
 
 @pytest.mark.smoke
+@pytest.mark.only
 def test_organisations_page_navigation(page: Page) -> None:
+    upload_nacs_data_bureau_link = page.get_by_text("Upload NACS data (Bureau)", exact=True)
+    bureau_page_link = page.get_by_text("Bureau", exact=True)
     """
     Confirms all menu items are displayed on the organisations page, and that the relevant pages
     are loaded when the links are clicked
     """
     # Screening centre parameters page loads as expected
-    click(page, page.get_by_role("link", name="Screening Centre Parameters"))
-    expect(page.locator("#ntshPageTitle")).to_contain_text("Screening Centre Parameters")
-    click(page, page.get_by_role("link", name="Back", exact=True))
+    OrganisationsPage(page).go_to_screening_centre_parameters_page()
+    BasePage(page).bowel_cancer_screening_page_title_contains_text("Screening Centre Parameters")
+    BasePage(page).click_back_button()
 
     # Organisation parameters page loads as expected
-    click(page, page.get_by_role("link", name="Organisation Parameters"))
-    expect(page.locator("#ntshPageTitle")).to_contain_text("System Parameters")
-    click(page, page.get_by_role("link", name="Back", exact=True))
+    OrganisationsPage(page).go_to_organisation_parameters_page()
+    BasePage(page).bowel_cancer_screening_page_title_contains_text("System Parameters")
+    BasePage(page).click_back_button()
 
     # Organisation and site details page loads as expected
-    click(page, page.get_by_role("link", name="Organisation and Site Details"))
-    expect(page.locator("#ntshPageTitle")).to_contain_text("Organisation and Site Details")
-    click(page, page.get_by_role("link", name="Back"))
+    OrganisationsPage(page).go_to_organisations_and_site_details_page()
+    BasePage(page).bowel_cancer_screening_page_title_contains_text("Organisation and Site Details")
+    BasePage(page).click_back_button()
 
     # The links below are visible (not clickable due to user role permissions)
-    expect(page.get_by_text("Upload NACS data (Bureau)")).to_be_visible()
-    expect(page.get_by_text("Bureau", exact=True)).to_be_visible()
+    expect(upload_nacs_data_bureau_link).to_be_visible()
+    expect(bureau_page_link).to_be_visible()
 
     # GP practice endorsement page loads as expected
-    click(page, page.get_by_role("link", name="GP Practice Endorsement"))
-    expect(page.locator("#ntshPageTitle")).to_contain_text("GP Practice Endorsement")
+    OrganisationsPage(page).go_to_gp_practice_endorsement_page()
+    BasePage(page).bowel_cancer_screening_page_title_contains_text("GP Practice Endorsement")
 
     # Return to main menu
-    click(page, page.get_by_role("link", name="Main Menu"))
-    expect(page.locator("#ntshPageTitle")).to_contain_text("Main Menu")
+    BasePage(page).click_main_menu_link()
+    BasePage(page).bowel_cancer_screening_page_title_contains_text("Main Menu")
 
 
 def test_view_an_organisations_system_parameters(page: Page, tests_properties: dict) -> None:
     """
     Confirms that an organisation's system parameters can be accessed and viewed
     """
     # Go to screening centre parameters page
-    click(page, page.get_by_role("link", name="Screening Centre Parameters"))
+    OrganisationsPage(page).go_to_screening_centre_parameters_page()
 
     # View an Organisation
     page.get_by_role("link", name=tests_properties["screening_centre_code"]).click()
-    expect(page.locator("#ntshPageTitle")).to_contain_text("System Parameters")
+    BasePage(page).bowel_cancer_screening_page_title_contains_text("System Parameters")