Skip to content

Commit fc430b2

Browse files
Alterting method to avoid re using strings
1 parent cb8c043 commit fc430b2

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

pages/subject_screening_summary.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,11 @@ def __init__(self, page: Page):
2828
def verify_result_contains_text(self, text) -> None:
2929
expect(self.display_rs).to_contain_text(text)
3030

31-
def verify_subject_search_results_title(self, text) -> None:
32-
expect(self.subject_search_results_title).to_contain_text(text)
31+
def verify_subject_search_results_title_subject_screening_summary(self) -> None:
32+
expect(self.subject_search_results_title).to_contain_text("Subject Screening Summary")
33+
34+
def verify_subject_search_results_title_subject_search_results(self) -> None:
35+
expect(self.subject_search_results_title).to_contain_text("Subject Search Results")
3336

3437
def get_latest_event_status_cell(self, latest_event_status: str)-> Locator:
3538
return self.page.get_by_role("cell", name=latest_event_status, exact=True)

utils/screening_subject_page_searcher.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def search_subject_by_nhs_number(page: Page, nhs_number) -> None:
2929
SubjectScreeningPage(page).nhs_number_filter.fill(nhs_number)
3030
SubjectScreeningPage(page).nhs_number_filter.press("Tab")
3131
SubjectScreeningPage(page).click_search_button()
32-
SubjectScreeningSummary(page).verify_subject_search_results_title("Subject Screening Summary")
32+
SubjectScreeningSummary(page).verify_subject_search_results_title_subject_screening_summary()
3333

3434
def search_subject_by_surname(page: Page, surname) -> None:
3535
"""
@@ -39,7 +39,7 @@ def search_subject_by_surname(page: Page, surname) -> None:
3939
SubjectScreeningPage(page).surname_filter.fill(surname)
4040
SubjectScreeningPage(page).surname_filter.press("Tab")
4141
SubjectScreeningPage(page).click_search_button()
42-
SubjectScreeningSummary(page).verify_subject_search_results_title("Subject Screening Summary")
42+
SubjectScreeningSummary(page).verify_subject_search_results_title_subject_screening_summary()
4343

4444
def search_subject_by_forename(page: Page, forename) -> None:
4545
"""
@@ -49,7 +49,7 @@ def search_subject_by_forename(page: Page, forename) -> None:
4949
SubjectScreeningPage(page).forename_filter.fill(forename)
5050
SubjectScreeningPage(page).forename_filter.press("Tab")
5151
SubjectScreeningPage(page).click_search_button()
52-
SubjectScreeningSummary(page).verify_subject_search_results_title("Subject Screening Summary")
52+
SubjectScreeningSummary(page).verify_subject_search_results_title_subject_screening_summary()
5353

5454
def search_subject_by_dob(page: Page, dob) -> None:
5555
"""
@@ -59,7 +59,7 @@ def search_subject_by_dob(page: Page, dob) -> None:
5959
SubjectScreeningPage(page).date_of_birth_filter.fill(dob)
6060
SubjectScreeningPage(page).date_of_birth_filter.press("Tab")
6161
SubjectScreeningPage(page).click_search_button()
62-
SubjectScreeningSummary(page).verify_subject_search_results_title("Subject Screening Summary")
62+
SubjectScreeningSummary(page).verify_subject_search_results_title_subject_screening_summary()
6363

6464
def search_subject_by_postcode(page: Page, postcode) -> None:
6565
"""
@@ -69,7 +69,7 @@ def search_subject_by_postcode(page: Page, postcode) -> None:
6969
SubjectScreeningPage(page).postcode_filter.fill(postcode)
7070
SubjectScreeningPage(page).postcode_filter.press("Tab")
7171
SubjectScreeningPage(page).click_search_button()
72-
SubjectScreeningSummary(page).verify_subject_search_results_title("Subject Search Results")
72+
SubjectScreeningSummary(page).verify_subject_search_results_title_subject_search_results()
7373

7474
def search_subject_by_episode_closed_date(page: Page, episode_closed_date) -> None:
7575
"""
@@ -79,7 +79,7 @@ def search_subject_by_episode_closed_date(page: Page, episode_closed_date) -> No
7979
SubjectScreeningPage(page).episode_closed_date_filter.fill(episode_closed_date)
8080
SubjectScreeningPage(page).episode_closed_date_filter.press("Tab")
8181
SubjectScreeningPage(page).click_search_button()
82-
SubjectScreeningSummary(page).verify_subject_search_results_title("Subject Search Results")
82+
SubjectScreeningSummary(page).verify_subject_search_results_title_subject_search_results()
8383
SubjectScreeningSummary(page).verify_result_contains_text(episode_closed_date)
8484

8585
def search_subject_by_status(page: Page, status) -> None:
@@ -90,7 +90,7 @@ def search_subject_by_status(page: Page, status) -> None:
9090
SubjectScreeningPage(page).select_screening_status_options(status)
9191
SubjectScreeningPage(page).select_screening_status.press("Tab")
9292
SubjectScreeningPage(page).click_search_button()
93-
SubjectScreeningSummary(page).verify_subject_search_results_title("Subject Search Results")
93+
SubjectScreeningSummary(page).verify_subject_search_results_title_subject_search_results()
9494

9595
def search_subject_by_latest_event_status(page: Page, status) -> None:
9696
"""
@@ -100,7 +100,7 @@ def search_subject_by_latest_event_status(page: Page, status) -> None:
100100
SubjectScreeningPage(page).select_episode_status_option(status)
101101
SubjectScreeningPage(page).select_episode_status.press("Tab")
102102
SubjectScreeningPage(page).click_search_button()
103-
SubjectScreeningSummary(page).verify_subject_search_results_title("Subject Search Results")
103+
SubjectScreeningSummary(page).verify_subject_search_results_title_subject_search_results()
104104

105105
def search_subject_by_search_area(page: Page, status, search_area, code = None, gp_practice_code = None) -> None:
106106
"""
@@ -118,7 +118,7 @@ def search_subject_by_search_area(page: Page, status, search_area, code = None,
118118
SubjectScreeningPage(page).gp_practice_in_ccg_filter.fill(gp_practice_code)
119119
SubjectScreeningPage(page).gp_practice_in_ccg_filter.press("Tab")
120120
SubjectScreeningPage(page).click_search_button()
121-
SubjectScreeningSummary(page).verify_subject_search_results_title("Subject Search Results")
121+
SubjectScreeningSummary(page).verify_subject_search_results_title_subject_search_results()
122122

123123
def check_clear_filters_button_works(page, nhs_number) -> None:
124124
"""

0 commit comments

Comments
 (0)