Removing more hardcoded locators and adding them to the appropriate POMs

Altering the batch processing util to seperate it into multiple functions for easier visibility and understanding
Altering the click method in the BasePage POM so that it does not constantly throw warnings

Author: adrianoaru-nhs

pages/base_page.py

@@ -117,8 +117,8 @@ def click(self, locator) -> None:
         try:
             self.page.wait_for_load_state('load')
             self.page.wait_for_load_state('domcontentloaded')
-            locator.wait_for("attached")
-            locator.wait_for("visible")
+            locator.wait_for(state = "attached")
+            locator.wait_for(state = "visible")
             locator.click()
 
         except Exception as locatorClickError:

pages/batch_download_request_and_retrieval_page.py

@@ -0,0 +1,16 @@
+from playwright.sync_api import Page, expect
+from pages.base_page import BasePage
+
+class BatchDownloadRequestAndRetrieval(BasePage):
+    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:
+        expect(self.page_form).to_contain_text("Warning - FS Screening data will not be downloaded")
+
+    def verify_batch_download_request_and_retrieval_title(self) -> None:
+        expect(self.batch_download_request_and_retrieval_title).to_contain_text("Batch Download Request and Retrieval")

pages/bowel_scope_appointments_page.py

@@ -9,4 +9,4 @@ def __init__(self, page: Page):
         self.page_title = self.page.locator("#ntshPageTitle")
 
     def verify_page_title(self) -> None:
-        expect(self.page_title).to_contain_text("Appointment Calendar")
+        expect(self.page_title).to_contain_text("Appointment Calendar")

pages/bowel_scope_page.py

@@ -9,4 +9,4 @@ def __init__(self, page: Page):
         self.view_bowel_scope_appointments_page = self.page.get_by_role("link", name="View Bowel Scope Appointments")
 
     def go_to_view_bowel_scope_appointments_page(self) -> None:
-        self.click(self.view_bowel_scope_appointments_page)
+        self.click(self.view_bowel_scope_appointments_page)

pages/cognito_login_page.py

@@ -5,9 +5,9 @@ class CognitoLoginPage(BasePage):
     def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
-        self.username = page.get_by_role("textbox", name="Username")
-        self.password = page.get_by_role("textbox", name="Password")
-        self.submit_button = page.get_by_role("button", name="submit")
+        self.username = self.page.get_by_role("textbox", name="Username")
+        self.password = self.page.get_by_role("textbox", name="Password")
+        self.submit_button = self.page.get_by_role("button", name="submit")
 
     def login_as_user(self, username: str, password: str) -> None:
         """Logs in to bcss with specified user credentials

pages/contacts_list_page.py

@@ -1,4 +1,4 @@
-from playwright.sync_api import Page
+from playwright.sync_api import Page, expect
 from pages.base_page import BasePage
 
 class ContactsListPage(BasePage):
@@ -10,15 +10,23 @@ def __init__(self, page: Page):
         self.edit_my_contact_details_page = self.page.get_by_role("link", name="Edit My Contact Details")
         self.maintain_contacts_page = self.page.get_by_role("link", name="Maintain Contacts")
         self.my_preference_settings_page = self.page.get_by_role("link", name="My Preference Settings")
+        self.extract_contact_details_page = self.page.get_by_text("Extract Contact Details")
+        self.resect_and_discard_accredited_page = self.page.get_by_text("Resect and Discard Accredited")
 
     def go_to_view_contacts_page(self)->None:
         self.click(self.view_contacts_page)
 
     def go_to_edit_my_contact_details_page(self)->None:
         self.click(self.edit_my_contact_details_page)
 
-    def go_to_maintain_contacts_details_page(self)->None:
+    def go_to_maintain_contacts_page(self)->None:
         self.click(self.maintain_contacts_page)
 
     def go_to_my_preference_settings_page(self)->None:
         self.click(self.my_preference_settings_page)
+
+    def verify_extract_contact_details_page_visible(self) -> None:
+        expect(self.extract_contact_details_page).to_be_visible()
+
+    def verify_resect_and_discard_accredited_page_visible(self) -> None:
+        expect(self.resect_and_discard_accredited_page).to_be_visible()

pages/edit_my_contact_details_page.py

@@ -0,0 +1,12 @@
+from playwright.sync_api import Page, expect
+from pages.base_page import BasePage
+
+class EditMyContactDetails(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")
+
+    def verify_edit_my_contact_details_title(self) -> None:
+        expect(self.edit_my_contact_details_title).to_contain_text("Edit My Contact Details")

pages/electronic_communications_management.py

@@ -6,7 +6,7 @@ def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
         #Electronic Communication Management - page locators
-        self.electronic_communication_management_title = page.locator("#page-title")
+        self.electronic_communication_management_title = self.page.locator("#page-title")
 
     def verify_electronic_communication_management_title(self) -> None:
         expect(self.electronic_communication_management_title).to_contain_text("Electronic Communication Management")

pages/fit_rollout_summary_page.py

@@ -0,0 +1,12 @@
+from playwright.sync_api import Page, expect
+from pages.base_page import BasePage
+
+class FITRolloutSummary(BasePage):
+    def __init__(self, page: Page):
+        super().__init__(page)
+        self.page = page
+        #FIT Rollout Summary - page locators
+        self.fit_rollout_summary_body = self.page.locator("body")
+
+    def verify_fit_rollout_summary_body(self) -> None:
+        expect(self.fit_rollout_summary_body).to_contain_text("FIT Rollout Summary")

pages/fit_test_kits_page.py

@@ -1,4 +1,4 @@
-from playwright.sync_api import Page
+from playwright.sync_api import Page, expect
 from pages.base_page import BasePage
 
 class FITTestKits(BasePage):
@@ -17,6 +17,10 @@ def __init__(self, page: Page):
         self.manage_qc_products_page = self.page.get_by_role("link", name="Manage QC Products")
         self.maintain_analysers_page = self.page.get_by_role("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")
+
+    def verify_fit_test_kits_title(self) -> None:
+        expect(self.fit_test_kits_title).to_contain_text("FIT Test Kits")
 
     def go_to_fit_rollout_summary_page(self)->None:
         self.click(self.fit_rollout_summary_page)