Skip to content

Commit e87ade3

Browse files
Editting all of the POMs to inherit the click method from the BasePage POM
1 parent 57491e5 commit e87ade3

20 files changed

+224
-205
lines changed

pages/base_page.py

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
from playwright.sync_api import Page, expect
2-
from utils.click_helper import click
32
import logging
43

54
class BasePage:
@@ -35,74 +34,74 @@ def __init__(self, page: Page):
3534
def click_main_menu_link(self)->None:
3635
for _ in range(3): # Try up to 3 times
3736
if self.main_menu_link.is_visible():
38-
click(self.page, self.main_menu_link)
37+
self.click(self.main_menu_link)
3938
return # Exit if successful
4039

4140
def click_log_out_link(self)->None:
42-
click(self.page, self.log_out_link)
41+
self.click(self.log_out_link)
4342

4443
def click_sub_menu_link(self)->None:
45-
click(self.page, self.sub_menu_link)
44+
self.click(self.sub_menu_link)
4645

4746
def click_hide_sub_menu_link(self)->None:
48-
click(self.page, self.hide_sub_menu_link)
47+
self.click(self.hide_sub_menu_link)
4948

5049
def click_select_org_link(self)->None:
51-
click(self.page, self.select_org_link)
50+
self.click(self.select_org_link)
5251

5352
def click_back_button(self)->None:
54-
click(self.page, self.back_button)
53+
self.click(self.back_button)
5554

5655
def click_release_notes_link(self)->None:
57-
click(self.page, self.release_notes_link)
56+
self.click(self.release_notes_link)
5857

5958
def click_refresh_alerts_link(self)->None:
60-
click(self.page, self.refresh_alerts_link)
59+
self.click(self.refresh_alerts_link)
6160

6261
def click_user_guide_link(self)->None:
63-
click(self.page, self.user_guide_link)
62+
self.click(self.user_guide_link)
6463

6564
def click_help_link(self)->None:
66-
click(self.page, self.help_link)
65+
self.click(self.help_link)
6766

6867
def bowel_cancer_screening_system_header_is_displayed(self)->None:
6968
expect(self.bowel_cancer_screening_system_header).to_contain_text("Bowel Cancer Screening System")
7069

7170
def go_to_contacts_list_page(self)->None:
72-
click(self.page, self.contacts_list_page)
71+
self.click(self.contacts_list_page)
7372

7473
def go_to_bowel_scope_page(self)->None:
75-
click(self.page, self.bowel_scope_page)
74+
self.click(self.bowel_scope_page)
7675

7776
def go_to_call_and_recall_page(self)->None:
78-
click(self.page, self.call_and_recall_page)
77+
self.click(self.call_and_recall_page)
7978

8079
def go_to_communications_production_page(self)->None:
81-
click(self.page, self.communications_production_page)
80+
self.click(self.communications_production_page)
8281

8382
def go_to_download_page(self)->None:
84-
click(self.page, self.download_page)
83+
self.click(self.download_page)
8584

8685
def go_to_fit_test_kits_page(self)->None:
87-
click(self.page, self.fit_test_kits_page)
86+
self.click(self.fit_test_kits_page)
8887

8988
def go_to_gfob_test_kits_page(self)->None:
90-
click(self.page, self.gfob_test_kits_page)
89+
self.click(self.gfob_test_kits_page)
9190

9291
def go_to_lynch_surveillance_page(self)->None:
93-
click(self.page, self.lynch_surveillance_page)
92+
self.click(self.lynch_surveillance_page)
9493

9594
def go_to_organisations_page(self)->None:
96-
click(self.page, self.organisations_page)
95+
self.click(self.organisations_page)
9796

9897
def go_to_reports_page(self)->None:
99-
click(self.page, self.reports_page)
98+
self.click(self.reports_page)
10099

101100
def go_to_screening_practitioner_appointments_page(self)->None:
102-
click(self.page, self.screening_practitioner_appointments_page)
101+
self.click(self.screening_practitioner_appointments_page)
103102

104103
def go_to_screening_subject_search_page(self)->None:
105-
click(self.page, self.screening_subject_search_page)
104+
self.click(self.screening_subject_search_page)
106105

107106
def click(self, locator) -> None:
108107
"""

pages/batch_list_page.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from playwright.sync_api import Page, expect
2-
from utils.click_helper import click
2+
from pages.base_page import BasePage
33

4-
5-
class BatchList:
4+
class BatchList(BasePage):
65
def __init__(self, page: Page):
6+
super().__init__(page)
77
self.page = page
88
#Batch List - page filters
99
self.id_filter = self.page.locator("#batchIdFilter")

pages/call_and_recall_page.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from playwright.sync_api import Page
2-
from utils.click_helper import click
2+
from pages.base_page import BasePage
33

4-
5-
class CallAndRecall:
4+
class CallAndRecall(BasePage):
65
def __init__(self, page: Page):
6+
super().__init__(page)
77
self.page = page
88
# Call and Recall - page links
99
self.planning_and_monitoring_page = self.page.get_by_role("link", name="Planning and Monitoring")
@@ -13,16 +13,16 @@ def __init__(self, page: Page):
1313
self.age_extension_rollout_plans_page = self.page.get_by_role("link", name="Age Extension Rollout Plans")
1414

1515
def go_to_planning_and_monitoring_page(self)->None:
16-
click(self.page, self.planning_and_monitoring_page)
16+
self.click(self.planning_and_monitoring_page)
1717

1818
def go_to_generate_invitations_page(self)->None:
19-
click(self.page, self.generate_invitations_page)
19+
self.click(self.generate_invitations_page)
2020

2121
def go_to_invitation_generation_progress_page(self)->None:
22-
click(self.page, self.invitation_generation_progress_page)
22+
self.click(self.invitation_generation_progress_page)
2323

2424
def go_to_non_invitation_days_page(self)->None:
25-
click(self.page, self.non_invitation_days_page)
25+
self.click(self.non_invitation_days_page)
2626

2727
def go_to_age_extension_rollout_plans_page(self)->None:
28-
click(self.page, self.age_extension_rollout_plans_page)
28+
self.click(self.age_extension_rollout_plans_page)

pages/cognito_login_page.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from playwright.sync_api import Page
2+
from pages.base_page import BasePage
23

3-
4-
class CognitoLoginPage:
5-
4+
class CognitoLoginPage(BasePage):
65
def __init__(self, page: Page):
6+
super().__init__(page)
77
self.page = page
88
self.username = page.get_by_role("textbox", name="Username")
99
self.password = page.get_by_role("textbox", name="Password")
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from playwright.sync_api import Page
2-
from utils.click_helper import click
2+
from pages.base_page import BasePage
33

4-
5-
class CommunicationsProduction:
4+
class CommunicationsProduction(BasePage):
65
def __init__(self, page: Page):
6+
super().__init__(page)
77
self.page = page
88
# Communication Production - page links
99
self.active_batch_list_page = self.page.get_by_role("link", name="Active Batch List")
@@ -13,16 +13,16 @@ def __init__(self, page: Page):
1313
self.electronic_communication_management_page = self.page.get_by_role("link", name="Electronic Communication Management")
1414

1515
def go_to_active_batch_list_page(self)->None:
16-
click(self.page, self.active_batch_list_page)
16+
self.click(self.active_batch_list_page)
1717

1818
def go_to_archived_batch_list_page(self)->None:
19-
click(self.page, self.archived_batch_list_page)
19+
self.click(self.archived_batch_list_page)
2020

2121
def go_to_letter_library_index_page(self)->None:
22-
click(self.page, self.letter_library_index_page)
22+
self.click(self.letter_library_index_page)
2323

2424
def go_to_letter_signatory_page(self)->None:
25-
click(self.page, self.letter_signatory_page)
25+
self.click(self.letter_signatory_page)
2626

2727
def go_to_electronic_communication_management_page(self)->None:
28-
click(self.page, self.electronic_communication_management_page)
28+
self.click(self.electronic_communication_management_page)

pages/contacts_list_page.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from playwright.sync_api import Page
2-
from utils.click_helper import click
2+
from pages.base_page import BasePage
33

4-
5-
class ContactsListPage:
4+
class ContactsListPage(BasePage):
65
def __init__(self, page: Page):
6+
super().__init__(page)
77
self.page = page
88
# ContactsList Page
99
self.view_contacts_page = self.page.get_by_role("link", name="View Contacts")
@@ -12,13 +12,13 @@ def __init__(self, page: Page):
1212
self.my_preference_settings_page = self.page.get_by_role("link", name="My Preference Settings")
1313

1414
def go_to_view_contacts_page(self)->None:
15-
click(self.page, self.view_contacts_page)
15+
self.click(self.view_contacts_page)
1616

1717
def go_to_edit_my_contact_details_page(self)->None:
18-
click(self.page, self.edit_my_contact_details_page)
18+
self.click(self.edit_my_contact_details_page)
1919

2020
def go_to_maintain_contacts_details_page(self)->None:
21-
click(self.page, self.maintain_contacts_page)
21+
self.click(self.maintain_contacts_page)
2222

2323
def go_to_my_preference_settings_page(self)->None:
24-
click(self.page, self.my_preference_settings_page)
24+
self.click(self.my_preference_settings_page)

pages/create_a_plan_page.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from playwright.sync_api import Page
2-
from utils.click_helper import click
2+
from pages.base_page import BasePage
33

4-
5-
class CreateAPlan:
4+
class CreateAPlan(BasePage):
65
def __init__(self, page: Page):
6+
super().__init__(page)
77
self.page = page
88
# Call and Recall - page links
99
self.set_all_button = self.page.get_by_role("link", name="Set all")
@@ -16,7 +16,7 @@ def __init__(self, page: Page):
1616
self.save_note_button = self.page.locator("#saveNote").get_by_role("button", name="Save")
1717

1818
def click_set_all_button(self)->None:
19-
click(self.page, self.set_all_button)
19+
self.click(self.set_all_button)
2020

2121
def fill_daily_invitation_rate_field(self, value: str)->None:
2222
self.daily_invitation_rate_field.fill(value)
@@ -25,16 +25,16 @@ def fill_weekly_invitation_rate_field(self, value)->None:
2525
self.weekly_invitation_rate_field.fill(value)
2626

2727
def click_update_button(self)->None:
28-
click(self.page, self.update_button)
28+
self.click(self.update_button)
2929

3030
def click_confirm_button(self)->None:
31-
click(self.page, self.confirm_button)
31+
self.click(self.confirm_button)
3232

3333
def click_save_button(self)->None:
34-
click(self.page, self.save_button)
34+
self.click(self.save_button)
3535

3636
def fill_note_field(self, value)->None:
3737
self.note_field.fill(value)
3838

3939
def click_save_note_button(self)->None:
40-
click(self.page, self.save_note_button)
40+
self.click(self.save_note_button)

pages/downloads_page.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from playwright.sync_api import Page
2-
from utils.click_helper import click
2+
from pages.base_page import BasePage
33

4-
5-
class DownloadsPage:
4+
class DownloadsPage(BasePage):
65
def __init__(self, page: Page):
6+
super().__init__(page)
77
self.page = page
88
# Downloads Page
99
self.individual_download_request_page = self.page.get_by_role("link", name="Individual Download Request")
@@ -12,13 +12,13 @@ def __init__(self, page: Page):
1212
self.list_of_batch_downloads_page = self.page.get_by_role("cell", name="List of Batch Downloads", exact=True)
1313

1414
def go_to_individual_download_request_page(self)->None:
15-
click(self.page, self.individual_download_request_page)
15+
self.click(self.individual_download_request_page)
1616

1717
def go_to_list_of_individual_downloads_page(self)->None:
18-
click(self.page, self.list_of_individual_downloads_page)
18+
self.click(self.list_of_individual_downloads_page)
1919

2020
def go_to_batch_download_request_and_page(self)->None:
21-
click(self.page, self.batch_download_request_and_page)
21+
self.click(self.batch_download_request_and_page)
2222

2323
def go_to_list_of_batch_downloads_page(self)->None:
24-
click(self.page, self.list_of_batch_downloads_page)
24+
self.click(self.list_of_batch_downloads_page)

pages/generate_invitations_page.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
from playwright.sync_api import Page, expect
2+
from pages.base_page import BasePage
23
import pytest
3-
from utils.click_helper import click
44
import logging
55

6-
7-
class GenerateInvitations:
6+
class GenerateInvitations(BasePage):
87
def __init__(self, page: Page):
8+
super().__init__(page)
99
self.page = page
1010
# Generate Invitations - page links
1111
self.generate_invitations_button = self.page.get_by_role("button", name="Generate Invitations")
@@ -15,10 +15,10 @@ def __init__(self, page: Page):
1515
self.self_referrals_total = self.page.locator("#col9_total")
1616

1717
def click_generate_invitations_button(self)->None:
18-
click(self.page, self.generate_invitations_button)
18+
self.click(self.generate_invitations_button)
1919

2020
def click_refresh_button(self)->None:
21-
click(self.page, self.refresh_button)
21+
self.click(self.refresh_button)
2222

2323
def wait_for_invitation_generation_complete(self) -> bool:
2424
"""
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
from playwright.sync_api import Page
2+
from pages.base_page import BasePage
23

3-
4-
class InvitationsMonitoring:
4+
class InvitationsMonitoring(BasePage):
55
def __init__(self, page: Page):
6+
super().__init__(page)
67
self.page = page
78

89
def go_to_invitation_plan_page(self, sc_id)->None:
9-
self.page.get_by_role("link", name=sc_id).click()
10+
self.click(self.page.get_by_role("link", name=sc_id))

0 commit comments

Comments
 (0)