Skip to content

Commit a040eb5

Browse files
Formatting code using the Black Formatter extension in VSCode (#10)
<!-- markdownlint-disable-next-line first-line-heading --> ## Description <!-- Describe your changes in detail. --> ## Context <!-- Why is this change required? What problem does it solve? --> Reformatting all the code using the Black Formatter VSCode extension ## Type of changes <!-- What types of changes does your code introduce? Put an `x` in all the boxes that apply. --> This was done to ensure consistency of formatting across the codebase - [x] Refactoring (non-breaking change) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would change existing functionality) - [ ] Bug fix (non-breaking change which fixes an issue) ## Checklist <!-- Go over all the following points, and put an `x` in all the boxes that apply. --> - [x] I am familiar with the [contributing guidelines](https://github.com/nhs-england-tools/playwright-python-blueprint/blob/main/CONTRIBUTING.md) - [x] I have followed the code style of the project - [ ] I have added tests to cover my changes (where appropriate) - [ ] I have updated the documentation accordingly - [ ] This PR is a result of pair or mob programming --- ## Sensitive Information Declaration To ensure the utmost confidentiality and protect your and others privacy, we kindly ask you to NOT including [PII (Personal Identifiable Information) / PID (Personal Identifiable Data)](https://digital.nhs.uk/data-and-information/keeping-data-safe-and-benefitting-the-public) or any other sensitive data in this PR (Pull Request) and the codebase changes. We will remove any PR that do contain any sensitive information. We really appreciate your cooperation in this matter. - [x] I confirm that neither PII/PID nor sensitive data are included in this PR and the codebase changes.
1 parent 0c03c0a commit a040eb5

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_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)
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 ColonoscopyAssessmentAppointments(BasePage):
56
def __init__(self, page: Page):
67
super().__init__(page)
78
self.page = page
8-
#Colonoscopy Assessment Appointments - page locators
9+
# Colonoscopy Assessment Appointments - page locators
910
self.page_header = self.page.locator("#page-title")
1011

1112
def verify_page_header(self) -> None:
12-
expect(self.page_header).to_contain_text("Patients that Require Colonoscopy Assessment Appointments")
13+
expect(self.page_header).to_contain_text(
14+
"Patients that Require Colonoscopy Assessment Appointments"
15+
)
Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,45 @@
11
from playwright.sync_api import Page, expect
22
from pages.base_page import BasePage
33

4+
45
class CommunicationsProduction(BasePage):
56
def __init__(self, page: Page):
67
super().__init__(page)
78
self.page = page
89
# Communication Production - page links
9-
self.active_batch_list_page = self.page.get_by_role("link", name="Active Batch List")
10-
self.archived_batch_list_page = self.page.get_by_role("link", name="Archived Batch List")
11-
self.letter_library_index_page = self.page.get_by_role("link", name="Letter Library Index")
12-
self.letter_signatory_page = self.page.get_by_role("link", name="Letter Signatory")
13-
self.electronic_communication_management_page = self.page.get_by_role("link", name="Electronic Communication Management")
14-
self.manage_individual_letter_page = self.page.get_by_text("Manage Individual Letter")
10+
self.active_batch_list_page = self.page.get_by_role(
11+
"link", name="Active Batch List"
12+
)
13+
self.archived_batch_list_page = self.page.get_by_role(
14+
"link", name="Archived Batch List"
15+
)
16+
self.letter_library_index_page = self.page.get_by_role(
17+
"link", name="Letter Library Index"
18+
)
19+
self.letter_signatory_page = self.page.get_by_role(
20+
"link", name="Letter Signatory"
21+
)
22+
self.electronic_communication_management_page = self.page.get_by_role(
23+
"link", name="Electronic Communication Management"
24+
)
25+
self.manage_individual_letter_page = self.page.get_by_text(
26+
"Manage Individual Letter"
27+
)
1528

1629
def verify_manage_individual_letter_page_visible(self) -> None:
1730
expect(self.manage_individual_letter_page).to_be_visible()
1831

19-
def go_to_active_batch_list_page(self)->None:
32+
def go_to_active_batch_list_page(self) -> None:
2033
self.click(self.active_batch_list_page)
2134

22-
def go_to_archived_batch_list_page(self)->None:
35+
def go_to_archived_batch_list_page(self) -> None:
2336
self.click(self.archived_batch_list_page)
2437

25-
def go_to_letter_library_index_page(self)->None:
38+
def go_to_letter_library_index_page(self) -> None:
2639
self.click(self.letter_library_index_page)
2740

28-
def go_to_letter_signatory_page(self)->None:
41+
def go_to_letter_signatory_page(self) -> None:
2942
self.click(self.letter_signatory_page)
3043

31-
def go_to_electronic_communication_management_page(self)->None:
44+
def go_to_electronic_communication_management_page(self) -> None:
3245
self.click(self.electronic_communication_management_page)

pages/contacts_list_page.py

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

4+
45
class ContactsListPage(BasePage):
56
def __init__(self, page: Page):
67
super().__init__(page)
78
self.page = page
89
# ContactsList Page
910
self.view_contacts_page = self.page.get_by_role("link", name="View Contacts")
10-
self.edit_my_contact_details_page = self.page.get_by_role("link", name="Edit My Contact Details")
11-
self.maintain_contacts_page = self.page.get_by_role("link", name="Maintain Contacts")
12-
self.my_preference_settings_page = self.page.get_by_role("link", name="My Preference Settings")
13-
self.extract_contact_details_page = self.page.get_by_text("Extract Contact Details")
14-
self.resect_and_discard_accredited_page = self.page.get_by_text("Resect and Discard Accredited")
11+
self.edit_my_contact_details_page = self.page.get_by_role(
12+
"link", name="Edit My Contact Details"
13+
)
14+
self.maintain_contacts_page = self.page.get_by_role(
15+
"link", name="Maintain Contacts"
16+
)
17+
self.my_preference_settings_page = self.page.get_by_role(
18+
"link", name="My Preference Settings"
19+
)
20+
self.extract_contact_details_page = self.page.get_by_text(
21+
"Extract Contact Details"
22+
)
23+
self.resect_and_discard_accredited_page = self.page.get_by_text(
24+
"Resect and Discard Accredited"
25+
)
1526

16-
def go_to_view_contacts_page(self)->None:
27+
def go_to_view_contacts_page(self) -> None:
1728
self.click(self.view_contacts_page)
1829

19-
def go_to_edit_my_contact_details_page(self)->None:
30+
def go_to_edit_my_contact_details_page(self) -> None:
2031
self.click(self.edit_my_contact_details_page)
2132

22-
def go_to_maintain_contacts_page(self)->None:
33+
def go_to_maintain_contacts_page(self) -> None:
2334
self.click(self.maintain_contacts_page)
2435

25-
def go_to_my_preference_settings_page(self)->None:
36+
def go_to_my_preference_settings_page(self) -> None:
2637
self.click(self.my_preference_settings_page)
2738

2839
def verify_extract_contact_details_page_visible(self) -> None:

0 commit comments

Comments
 (0)