Added common click method to existing tests & POMs

Author: Victor Soares

pages/active_batch_list_page.py

@@ -1,4 +1,5 @@
 from playwright.sync_api import Page
+from utils.click_helper import click
 
 class ActiveBatchList:
     def __init__(self, page: Page):
@@ -15,41 +16,41 @@ def __init__(self, page: Page):
         self.batch_successfully_archived_msg = self.page.locator('text="Batch Successfully Archived and Printed"')
 
     def enter_id_filter(self, search_text: str):
-        self.id_filter.click()
+        click(self.page, self.id_filter)
         self.id_filter.fill(search_text)
         self.id_filter.press("Enter")
 
     def enter_type_filter(self, search_text: str):
-        self.type_filter.click()
+        click(self.page, self.type_filter)
         self.type_filter.fill(search_text)
         self.type_filter.press("Enter")
 
     def enter_original_filter(self, search_text: str):
-        self.original_filter.click()
+        click(self.page, self.original_filter)
         self.original_filter.fill(search_text)
         self.original_filter.press("Enter")
 
     def enter_event_code_filter(self, search_text: str):
-        self.event_code_filter.click()
+        click(self.page, self.event_code_filter)
         self.event_code_filter.fill(search_text)
         self.event_code_filter.press("Enter")
 
     def enter_description_filter(self, search_text: str):
-        self.description_filter.click()
+        click(self.page, self.description_filter)
         self.description_filter.fill(search_text)
         self.description_filter.press("Enter")
 
     def enter_batch_split_by_filter(self, search_text: str):
-        self.batch_split_by_filter.click()
+        click(self.page, self.batch_split_by_filter)
         self.batch_split_by_filter.fill(search_text)
         self.batch_split_by_filter.press("Enter")
 
     def enter_screening_centre_filter(self, search_text: str):
-        self.screening_centre_filter.click()
+        click(self.page, self.screening_centre_filter)
         self.screening_centre_filter.fill(search_text)
         self.screening_centre_filter.press("Enter")
 
     def enter_count_filter(self, search_text: str):
-        self.count_filter.click()
+        click(self.page, self.count_filter)
         self.count_filter.fill(search_text)
         self.count_filter.press("Enter")

pages/archived_batch_list_page.py

@@ -1,4 +1,5 @@
 from playwright.sync_api import Page,expect
+from utils.click_helper import click
 
 class ArchivedBatchList:
     def __init__(self, page: Page):
@@ -18,47 +19,47 @@ def verify_table_data(self,value):
         expect(self.table_data.filter(has_text=value)).to_be_visible()
 
     def text_id_filter(self, search_text: str):
-        self.text_filter.click()
+        click(self.page, self.text_filter)
         self.text_filter.fill(search_text)
         self.text_filter.press("Enter")
 
     def enter_id_filter(self, search_text: str):
-        self.id_filter.click()
+        click(self.page, self.id_filter)
         self.id_filter.fill(search_text)
         self.id_filter.press("Enter")
 
     def enter_type_filter(self, search_text: str):
-        self.type_filter.click()
+        click(self.page, self.type_filter)
         self.type_filter.fill(search_text)
         self.type_filter.press("Enter")
 
     def enter_original_filter(self, search_text: str):
-        self.original_filter.click()
+        click(self.page, self.original_filter)
         self.original_filter.fill(search_text)
         self.original_filter.press("Enter")
 
     def enter_event_code_filter(self, search_text: str):
-        self.event_code_filter.click()
+        click(self.page, self.event_code_filter)
         self.event_code_filter.fill(search_text)
         self.event_code_filter.press("Enter")
 
     def enter_description_filter(self, search_text: str):
-        self.description_filter.click()
+        click(self.page, self.description_filter)
         self.description_filter.fill(search_text)
         self.description_filter.press("Enter")
 
     def enter_batch_split_by_filter(self, search_text: str):
-        self.batch_split_by_filter.click()
+        click(self.page, self.batch_split_by_filter)
         self.batch_split_by_filter.fill(search_text)
         self.batch_split_by_filter.press("Enter")
 
     def enter_screening_centre_filter(self, search_text: str):
-        self.screening_centre_filter.click()
+        click(self.page, self.screening_centre_filter)
         self.screening_centre_filter.fill(search_text)
         self.screening_centre_filter.press("Enter")
 
     def enter_count_filter(self, search_text: str):
-        self.count_filter.click()
+        click(self.page, self.count_filter)
         self.count_filter.fill(search_text)
         self.count_filter.press("Enter")
 

pages/bcss_home_page.py

@@ -1,4 +1,5 @@
 from playwright.sync_api import Page, expect
+from utils.click_helper import click
 
 
 class BcssHomePage:
@@ -17,28 +18,28 @@ def __init__(self, page: Page):
         self.bowel_cancer_screening_system_header = self.page.locator("#ntshAppTitle")
 
     def click_sub_menu_link(self):
-        self.sub_menu_link.click()
+        click(self.page, self.sub_menu_link)
 
     def click_hide_sub_menu_link(self):
-        self.hide_sub_menu_link.click()
+        click(self.page, self.hide_sub_menu_link)
 
     def click_select_org_link(self):
-        self.select_org_link.click()
+        click(self.page, self.select_org_link)
 
     def click_back_button(self):
-        self.back_button.click()
+        click(self.page, self.back_button)
 
     def click_release_notes_link(self):
-        self.release_notes_link.click()
+        click(self.page, self.release_notes_link)
 
     def click_refresh_alerts_link(self):
-        self.refresh_alerts_link.click()
+        click(self.page, self.refresh_alerts_link)
 
     def click_user_guide_link(self):
-        self.user_guide_link.click()
+        click(self.page, self.user_guide_link)
 
     def click_help_link(self):
-        self.help_link.click()
+        click(self.page, self.help_link)
 
     def bowel_cancer_screening_system_header_is_displayed(self):
         expect(self.bowel_cancer_screening_system_header).to_contain_text("Bowel Cancer Screening System")
@@ -62,37 +63,37 @@ def __init__(self, page: Page):
         self.screening_subject_search_page = self.page.get_by_role("link", name="Screening Subject Search")
 
     def go_to_contacts_list_page(self):
-        self.contacts_list_page.click()
+        click(self.page, self.contacts_list_page)
 
     def go_to_bowel_scope_page(self):
-        self.bowel_scope_page.click()
+        click(self.page, self.bowel_scope_page)
 
     def go_to_call_and_recall_page(self):
-        self.call_and_recall_page.click()
+        click(self.page, self.call_and_recall_page)
 
     def go_to_communications_production_page(self):
-        self.communications_production_page.click()
+        click(self.page, self.communications_production_page)
 
     def go_to_download_page(self):
-        self.download_page.click()
+        click(self.page, self.download_page)
 
     def go_to_fit_test_kits_page(self):
-        self.fit_test_kits_page.click()
+        click(self.page, self.fit_test_kits_page)
 
     def go_to_gfob_test_kits_page(self):
-        self.gfob_test_kits_page.click()
+        click(self.page, self.gfob_test_kits_page)
 
     def go_to_lynch_surveillance_page(self):
-        self.lynch_surveillance_page.click()
+        click(self.page, self.lynch_surveillance_page)
 
     def go_to_organisations_page(self):
-        self.organisations_page.click()
+        click(self.page, self.organisations_page)
 
     def go_to_reports_page(self):
-        self.reports_page.click()
+        click(self.page, self.reports_page)
 
     def go_to_screening_practitioner_appointments_page(self):
-        self.screening_practitioner_appointments_page.click()
+        click(self.page, self.screening_practitioner_appointments_page)
 
     def go_to_screening_subject_search_page(self):
-        self.screening_subject_search_page.click()
+        click(self.page, self.screening_subject_search_page)

pages/call_and_recall_page.py

@@ -1,4 +1,6 @@
 from playwright.sync_api import Page
+from utils.click_helper import click
+
 
 class CallAndRecall:
     def __init__(self, page: Page):
@@ -12,16 +14,16 @@ def __init__(self, page: Page):
 
 
     def go_to_planning_and_monitoring_page(self):
-        self.planning_and_monitoring_page.click()
+        click(self.page, self.planning_and_monitoring_page)
 
     def go_to_generate_invitations_page(self):
-        self.generate_invitations_page.click()
+        click(self.page, self.generate_invitations_page)
 
     def go_to_invitation_generation_progress_page(self):
-        self.invitation_generation_progress_page.click()
+        click(self.page, self.invitation_generation_progress_page)
 
     def go_to_non_invitation_days_page(self):
-        self.non_invitation_days_page.click()
+        click(self.page, self.non_invitation_days_page)
 
     def go_to_age_extension_rollout_plans_page(self):
-        self.age_extension_rollout_plans_page.click()
+        click(self.page, self.age_extension_rollout_plans_page)

pages/communications_production_page.py

@@ -1,4 +1,5 @@
 from playwright.sync_api import Page
+from utils.click_helper import click
 
 class CommunicationsProduction:
     def __init__(self, page: Page):
@@ -12,16 +13,16 @@ def __init__(self, page: Page):
 
 
     def go_to_active_batch_list_page(self):
-        self.active_batch_list_page.click()
+        click(self.page, self.active_batch_list_page)
 
     def go_to_archived_batch_list_page(self):
-        self.archived_batch_list_page.click()
+        click(self.page, self.archived_batch_list_page)
 
     def go_to_letter_library_index_page(self):
-        self.letter_library_index_page.click()
+        click(self.page, self.letter_library_index_page)
 
     def go_to_letter_signatory_page(self):
-        self.letter_signatory_page.click()
+        click(self.page, self.letter_signatory_page)
 
     def go_to_electronic_communication_management_page(self):
-        self.electronic_communication_management_page.click()
+        click(self.page, self.electronic_communication_management_page)

pages/contacts_list_page.py

@@ -1,4 +1,5 @@
 from playwright.sync_api import Page
+from utils.click_helper import click
 
 
 class ContactsListPage:
@@ -12,15 +13,15 @@ def __init__(self, page: Page):
 
 
     def go_to_view_contacts_page(self):
-        self.view_contacts_page.click()
+        click(self.page, self.view_contacts_page)
 
     def go_to_edit_my_contact_details_page(self):
-        self.edit_my_contact_details_page.click()
+        click(self.page, self.edit_my_contact_details_page)
 
     def go_to_maintain_contacts_details_page(self):
-        self.maintain_contacts_page.click()
+        click(self.page, self.maintain_contacts_page)
 
     def go_to_my_preference_settings_page(self):
-        self.my_preference_settings_page.click()
+        click(self.page, self.my_preference_settings_page)
 
 

pages/create_a_plan_page.py

@@ -1,4 +1,5 @@
 from playwright.sync_api import Page
+from utils.click_helper import click
 
 class CreateAPlan:
     def __init__(self, page: Page):
@@ -11,10 +12,10 @@ def __init__(self, page: Page):
         self.confirm_button = self.page.get_by_role("button", name="Confirm")
         self.save_button = self.page.get_by_role("button", name="Save")
         self.note_field = self.page.get_by_placeholder("Enter note")
-        self.saveNote_button = self.page.locator("#saveNote").get_by_role("button", name="Save")
+        self.save_note_button = self.page.locator("#saveNote").get_by_role("button", name="Save")
 
     def click_set_all_button(self):
-        self.set_all_button.click()
+        click(self.page, self.set_all_button)
 
     def fill_daily_invitation_rate_field(self,value):
         self.daily_invitation_rate_field.fill(value)
@@ -23,19 +24,19 @@ def fill_weekly_invitation_rate_field(self,value):
         self.weekly_invitation_rate_field.fill(value)
 
     def click_update_button(self):
-        self.update_button.click()
+        click(self.page, self.update_button)
 
     def click_confirm_button(self):
-        self.confirm_button.click()
+        click(self.page, self.confirm_button)
 
     def click_save_button(self):
-        self.save_button.click()
+        click(self.page, self.save_button)
 
     def fill_note_field(self,value):
         self.note_field.fill(value)
 
-    def click_saveNote_button(self):
-        self.saveNote_button.click()
+    def click_save_note_button(self):
+        click(self.page, self.save_note_button)
 
 
 

pages/downloads_page.py

@@ -1,4 +1,5 @@
 from playwright.sync_api import Page
+from utils.click_helper import click
 
 
 class DownloadsPage:
@@ -12,16 +13,16 @@ def __init__(self, page: Page):
 
 
     def go_to_individual_download_request_page(self):
-        self.individual_download_request_page.click()
+        click(self.page, self.individual_download_request_page)
 
     def go_to_list_of_individual_downloads_page(self):
-        self.list_of_individual_downloads_page.click()
+        click(self.page, self.list_of_individual_downloads_page)
 
     def go_to_batch_download_request_and_page(self):
-        self.batch_download_request_and_page.click()
+        click(self.page, self.batch_download_request_and_page)
 
     def go_to_list_of_batch_downloads_page(self):
-        self.list_of_batch_downloads_page.click()
+        click(self.page, self.list_of_batch_downloads_page)