Skip to content

Commit 50ce60c

Browse files
fixing failing tests in tests/test_Screening_subject_search_page.py
1 parent a2c5504 commit 50ce60c

File tree

3 files changed

+27
-7
lines changed

3 files changed

+27
-7
lines changed

pages/screening_subject_search/subject_screening_summary.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from playwright.sync_api import Page, expect, Locator
22
from pages.base_page import BasePage
33
from enum import Enum
4+
import pytest
45

56

67
class SubjectScreeningSummary(BasePage):
@@ -57,6 +58,23 @@ def verify_subject_search_results_title_subject_search_results(self) -> None:
5758
"Subject Search Results"
5859
)
5960

61+
def verify_subject_search_results_title_both(self) -> None:
62+
try:
63+
self.verify_subject_search_results_title_subject_screening_summary()
64+
except Exception as e1:
65+
try:
66+
self.verify_subject_search_results_title_subject_search_results()
67+
except Exception as e2:
68+
if (
69+
self.subject_search_results_title.inner_text()
70+
== "Subject Search Criteria"
71+
):
72+
pytest.fail(
73+
f"No subjects matching criteria were found: \n{e1}\n{e2}"
74+
)
75+
else:
76+
pytest.fail("No matching title found")
77+
6078
def get_latest_event_status_cell(self, latest_event_status: str) -> Locator:
6179
return self.page.get_by_role("cell", name=latest_event_status, exact=True)
6280

tests/test_screening_subject_search_page.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
LatestEpisodeStatusSearchOptions,
77
SearchAreaSearchOptions,
88
)
9-
from pages.screening_subject_search.subject_screening_summary import SubjectScreeningSummary
9+
from pages.screening_subject_search.subject_screening_summary import (
10+
SubjectScreeningSummary,
11+
)
1012
from utils.screening_subject_page_searcher import (
1113
search_subject_by_nhs_number,
1214
search_subject_by_surname,
@@ -120,7 +122,9 @@ def test_search_screening_subject_by_episode_closed_date(
120122
- Verify the subject search results page is displayed
121123
- Verify the results contain the date that was searched for
122124
"""
123-
search_subject_by_episode_closed_date(page, general_properties["episode_closed_date"])
125+
search_subject_by_episode_closed_date(
126+
page, general_properties["episode_closed_date"]
127+
)
124128

125129

126130
def test_search_criteria_clear_filters_button(
@@ -400,7 +404,7 @@ def test_search_screening_subject_by_screening_centre(
400404
search_subject_by_search_area(
401405
page,
402406
ScreeningStatusSearchOptions.CALL_STATUS.value,
403-
SearchAreaSearchOptions.SEARCH_AREA_CCG.value,
407+
SearchAreaSearchOptions.SEARCH_AREA_SCREENING_CENTRE.value,
404408
general_properties["screening_centre_code"],
405409
)
406410

utils/screening_subject_page_searcher.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def search_subject_by_dob(page: Page, dob) -> None:
8080
SubjectScreeningPage(page).click_search_button()
8181
SubjectScreeningSummary(
8282
page
83-
).verify_subject_search_results_title_subject_screening_summary()
83+
).verify_subject_search_results_title_subject_search_results()
8484

8585

8686
def search_subject_by_postcode(page: Page, postcode) -> None:
@@ -118,9 +118,7 @@ def search_subject_by_status(page: Page, status) -> None:
118118
SubjectScreeningPage(page).select_screening_status_options(status)
119119
SubjectScreeningPage(page).select_screening_status.press("Tab")
120120
SubjectScreeningPage(page).click_search_button()
121-
SubjectScreeningSummary(
122-
page
123-
).verify_subject_search_results_title_subject_search_results()
121+
SubjectScreeningSummary(page).verify_subject_search_results_title_both()
124122

125123

126124
def search_subject_by_latest_event_status(page: Page, status) -> None:

0 commit comments

Comments
 (0)