Skip to content

Commit 871b5c4

Browse files
committed
Merge branch 'main' into feature/BCSS-19935-refactor-playwright-project-folder-structure
2 parents c15ece8 + a040eb5 commit 871b5c4

File tree

75 files changed

+1073
-417
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+1073
-417
lines changed
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
from playwright.sync_api import Page, expect
22
from pages.base_page import BasePage
33

4+
45
class AgeExtensionRolloutPlans(BasePage):
56
def __init__(self, page: Page):
67
super().__init__(page)
78
self.page = page
8-
#Age Extension Rollout Plans - page locators
9+
# Age Extension Rollout Plans - page locators
910
self.age_extension_rollout_plans_title = self.page.locator("#page-title")
1011

1112
def verify_age_extension_rollout_plans_title(self) -> None:
12-
expect(self.age_extension_rollout_plans_title).to_contain_text("Age Extension Rollout Plans")
13+
expect(self.age_extension_rollout_plans_title).to_contain_text(
14+
"Age Extension Rollout Plans"
15+
)
Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,23 @@
11
from playwright.sync_api import Page, expect
22
from pages.base_page import BasePage
33

4+
45
class BatchDownloadRequestAndRetrieval(BasePage):
56
def __init__(self, page: Page):
67
super().__init__(page)
78
self.page = page
8-
#Batch Download Request And Retrieval - page locators
9-
self.batch_download_request_and_retrieval_title = self.page.locator("#ntshPageTitle")
10-
self.page_form = self.page.locator("form[name=\"frm\"]")
9+
# Batch Download Request And Retrieval - page locators
10+
self.batch_download_request_and_retrieval_title = self.page.locator(
11+
"#ntshPageTitle"
12+
)
13+
self.page_form = self.page.locator('form[name="frm"]')
1114

1215
def expect_form_to_have_warning(self) -> None:
13-
expect(self.page_form).to_contain_text("Warning - FS Screening data will not be downloaded")
16+
expect(self.page_form).to_contain_text(
17+
"Warning - FS Screening data will not be downloaded"
18+
)
1419

1520
def verify_batch_download_request_and_retrieval_title(self) -> None:
16-
expect(self.batch_download_request_and_retrieval_title).to_contain_text("Batch Download Request and Retrieval")
21+
expect(self.batch_download_request_and_retrieval_title).to_contain_text(
22+
"Batch Download Request and Retrieval"
23+
)

pages/batch_list_page.py

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
from playwright.sync_api import Page, expect
22
from pages.base_page import BasePage
33

4+
45
class BatchList(BasePage):
56
def __init__(self, page: Page):
67
super().__init__(page)
78
self.page = page
8-
#Batch List - page filters
9+
# Batch List - page filters
910
self.id_filter = self.page.locator("#batchIdFilter")
1011
self.type_filter = self.page.locator("#batchTypeFilter")
1112
self.original_filter = self.page.locator("#originalBatchIdFilter")
@@ -15,51 +16,55 @@ def __init__(self, page: Page):
1516
self.screening_centre_filter = self.page.locator("#screeningCentreFilter")
1617
self.count_filter = self.page.locator("#countFilter")
1718
self.table_data = self.page.locator("td")
18-
self.batch_successfully_archived_msg = self.page.locator('text="Batch Successfully Archived and Printed"')
19+
self.batch_successfully_archived_msg = self.page.locator(
20+
'text="Batch Successfully Archived and Printed"'
21+
)
1922
self.batch_list_page_title = self.page.locator("#page-title")
2023

2124
def verify_batch_list_page_title(self, text) -> None:
2225
expect(self.batch_list_page_title).to_contain_text(text)
2326

24-
def verify_table_data(self, value)->None:
27+
def verify_table_data(self, value) -> None:
2528
expect(self.table_data.filter(has_text=value)).to_be_visible()
2629

27-
def enter_id_filter(self, search_text: str)->None:
30+
def enter_id_filter(self, search_text: str) -> None:
2831
self.id_filter.fill(search_text)
2932
self.id_filter.press("Enter")
3033

31-
def enter_type_filter(self, search_text: str)->None:
34+
def enter_type_filter(self, search_text: str) -> None:
3235
self.type_filter.fill(search_text)
3336
self.type_filter.press("Enter")
3437

35-
def enter_original_filter(self, search_text: str)->None:
38+
def enter_original_filter(self, search_text: str) -> None:
3639
self.original_filter.fill(search_text)
3740
self.original_filter.press("Enter")
3841

39-
def enter_event_code_filter(self, search_text: str)->None:
42+
def enter_event_code_filter(self, search_text: str) -> None:
4043
self.event_code_filter.fill(search_text)
4144
self.event_code_filter.press("Enter")
4245

43-
def enter_description_filter(self, search_text: str)->None:
46+
def enter_description_filter(self, search_text: str) -> None:
4447
self.description_filter.fill(search_text)
4548
self.description_filter.press("Enter")
4649

47-
def enter_batch_split_by_filter(self, search_text: str)->None:
50+
def enter_batch_split_by_filter(self, search_text: str) -> None:
4851
self.batch_split_by_filter.fill(search_text)
4952
self.batch_split_by_filter.press("Enter")
5053

51-
def enter_screening_centre_filter(self, search_text: str)->None:
54+
def enter_screening_centre_filter(self, search_text: str) -> None:
5255
self.screening_centre_filter.fill(search_text)
5356
self.screening_centre_filter.press("Enter")
5457

55-
def enter_count_filter(self, search_text: str)->None:
58+
def enter_count_filter(self, search_text: str) -> None:
5659
self.count_filter.fill(search_text)
5760
self.count_filter.press("Enter")
5861

62+
5963
class ActiveBatchList(BatchList):
6064
def __init__(self, page):
6165
super().__init__(page)
6266

67+
6368
class ArchivedBatchList(BatchList):
6469
def __init__(self, page):
6570
super().__init__(page)

pages/bowel_scope_appointments_page.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
from playwright.sync_api import Page, expect
22
from pages.base_page import BasePage
33

4+
45
class BowelScopeAppointments(BasePage):
56
def __init__(self, page: Page):
67
super().__init__(page)
78
self.page = page
8-
#Bowel Scope Appointments - page locators
9+
# Bowel Scope Appointments - page locators
910
self.page_title = self.page.locator("#ntshPageTitle")
1011

1112
def verify_page_title(self) -> None:

pages/bowel_scope_page.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
from playwright.sync_api import Page, expect, Locator
22
from pages.base_page import BasePage
33

4+
45
class BowelScope(BasePage):
56
def __init__(self, page: Page):
67
super().__init__(page)
78
self.page = page
8-
#Bowel Scope - page locators
9-
self.view_bowel_scope_appointments_page = self.page.get_by_role("link", name="View Bowel Scope Appointments")
9+
# Bowel Scope - page locators
10+
self.view_bowel_scope_appointments_page = self.page.get_by_role(
11+
"link", name="View Bowel Scope Appointments"
12+
)
1013

1114
def go_to_view_bowel_scope_appointments_page(self) -> None:
1215
self.click(self.view_bowel_scope_appointments_page)

pages/call_and_recall/create_a_plan_page.py

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,50 @@
11
from playwright.sync_api import Page, expect
22
from pages.base_page import BasePage
33

4+
45
class CreateAPlan(BasePage):
56
def __init__(self, page: Page):
67
super().__init__(page)
78
self.page = page
89
# Call and Recall - page links
910
self.set_all_button = self.page.get_by_role("link", name="Set all")
10-
self.daily_invitation_rate_field = self.page.get_by_placeholder("Enter daily invitation rate")
11-
self.weekly_invitation_rate_field = self.page.get_by_placeholder("Enter weekly invitation rate")
11+
self.daily_invitation_rate_field = self.page.get_by_placeholder(
12+
"Enter daily invitation rate"
13+
)
14+
self.weekly_invitation_rate_field = self.page.get_by_placeholder(
15+
"Enter weekly invitation rate"
16+
)
1217
self.update_button = self.page.get_by_role("button", name="Update")
1318
self.confirm_button = self.page.get_by_role("button", name="Confirm")
1419
self.save_button = self.page.get_by_role("button", name="Save")
1520
self.note_field = self.page.get_by_placeholder("Enter note")
16-
self.save_note_button = self.page.locator("#saveNote").get_by_role("button", name="Save")
21+
self.save_note_button = self.page.locator("#saveNote").get_by_role(
22+
"button", name="Save"
23+
)
1724
self.create_a_plan_title = self.page.locator("#page-title")
1825

19-
def click_set_all_button(self)->None:
26+
def click_set_all_button(self) -> None:
2027
self.click(self.set_all_button)
2128

22-
def fill_daily_invitation_rate_field(self, value: str)->None:
29+
def fill_daily_invitation_rate_field(self, value: str) -> None:
2330
self.daily_invitation_rate_field.fill(value)
2431

25-
def fill_weekly_invitation_rate_field(self, value)->None:
32+
def fill_weekly_invitation_rate_field(self, value) -> None:
2633
self.weekly_invitation_rate_field.fill(value)
2734

28-
def click_update_button(self)->None:
35+
def click_update_button(self) -> None:
2936
self.click(self.update_button)
3037

31-
def click_confirm_button(self)->None:
38+
def click_confirm_button(self) -> None:
3239
self.click(self.confirm_button)
3340

34-
def click_save_button(self)->None:
41+
def click_save_button(self) -> None:
3542
self.click(self.save_button)
3643

37-
def fill_note_field(self, value)->None:
44+
def fill_note_field(self, value) -> None:
3845
self.note_field.fill(value)
3946

40-
def click_save_note_button(self)->None:
47+
def click_save_note_button(self) -> None:
4148
self.click(self.save_note_button)
4249

4350
def verify_create_a_plan_title(self) -> None:
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
from playwright.sync_api import Page, expect
22
from pages.base_page import BasePage
33

4+
45
class InvitationsMonitoring(BasePage):
56
def __init__(self, page: Page):
67
super().__init__(page)
78
self.page = page
89
self.invitations_monitoring_title = self.page.locator("#page-title")
910

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

1314
def verify_invitations_monitoring_title(self) -> None:
14-
expect(self.invitations_monitoring_title).to_contain_text("Invitations Monitoring - Screening Centre")
15+
expect(self.invitations_monitoring_title).to_contain_text(
16+
"Invitations Monitoring - Screening Centre"
17+
)

pages/call_and_recall/invitations_plans_page.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
from playwright.sync_api import Page
22
from pages.base_page import BasePage
33

4+
45
class InvitationsPlans(BasePage):
56
def __init__(self, page: Page):
67
super().__init__(page)
78
self.page = page
89
# Call and Recall - page links
910
self.create_a_plan = self.page.get_by_role("button", name="Create a Plan")
10-
self.invitations_plans_title = self.page.locator('#page-title:has-text("Invitation Plans")')
11-
self.first_available_plan = self.page.get_by_role("row").nth(1).get_by_role("link")
11+
self.invitations_plans_title = self.page.locator(
12+
'#page-title:has-text("Invitation Plans")'
13+
)
14+
self.first_available_plan = (
15+
self.page.get_by_role("row").nth(1).get_by_role("link")
16+
)
1217

13-
def go_to_create_a_plan_page(self)->None:
18+
def go_to_create_a_plan_page(self) -> None:
1419
self.click(self.create_a_plan)
1520

1621
def go_to_first_available_plan(self) -> None:

pages/call_and_recall_page.py

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,39 @@
11
from playwright.sync_api import Page
22
from pages.base_page import BasePage
33

4+
45
class CallAndRecall(BasePage):
56
def __init__(self, page: Page):
67
super().__init__(page)
78
self.page = page
89
# Call and Recall - page links
9-
self.planning_and_monitoring_page = self.page.get_by_role("link", name="Planning and Monitoring")
10-
self.generate_invitations_page = self.page.get_by_role("link", name="Generate Invitations")
11-
self.invitation_generation_progress_page = self.page.get_by_role("link", name="Invitation Generation Progress")
12-
self.non_invitation_days_page = self.page.get_by_role("link", name="Non Invitation Days")
13-
self.age_extension_rollout_plans_page = self.page.get_by_role("link", name="Age Extension Rollout Plans")
10+
self.planning_and_monitoring_page = self.page.get_by_role(
11+
"link", name="Planning and Monitoring"
12+
)
13+
self.generate_invitations_page = self.page.get_by_role(
14+
"link", name="Generate Invitations"
15+
)
16+
self.invitation_generation_progress_page = self.page.get_by_role(
17+
"link", name="Invitation Generation Progress"
18+
)
19+
self.non_invitation_days_page = self.page.get_by_role(
20+
"link", name="Non Invitation Days"
21+
)
22+
self.age_extension_rollout_plans_page = self.page.get_by_role(
23+
"link", name="Age Extension Rollout Plans"
24+
)
1425

15-
def go_to_planning_and_monitoring_page(self)->None:
26+
def go_to_planning_and_monitoring_page(self) -> None:
1627
self.click(self.planning_and_monitoring_page)
1728

18-
def go_to_generate_invitations_page(self)->None:
29+
def go_to_generate_invitations_page(self) -> None:
1930
self.click(self.generate_invitations_page)
2031

21-
def go_to_invitation_generation_progress_page(self)->None:
32+
def go_to_invitation_generation_progress_page(self) -> None:
2233
self.click(self.invitation_generation_progress_page)
2334

24-
def go_to_non_invitation_days_page(self)->None:
35+
def go_to_non_invitation_days_page(self) -> None:
2536
self.click(self.non_invitation_days_page)
2637

27-
def go_to_age_extension_rollout_plans_page(self)->None:
38+
def go_to_age_extension_rollout_plans_page(self) -> None:
2839
self.click(self.age_extension_rollout_plans_page)

pages/cognito_login_page.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from playwright.sync_api import Page
22
from pages.base_page import BasePage
33

4+
45
class CognitoLoginPage(BasePage):
56
def __init__(self, page: Page):
67
super().__init__(page)

0 commit comments

Comments
 (0)