Skip to content

Commit cbcc50d

Browse files
authored
Merge pull request #865 from NHSDigital/increase-search-coverage
Increase session search coverage
2 parents 3ec964d + 450fa6a commit cbcc50d

File tree

3 files changed

+30
-6
lines changed

3 files changed

+30
-6
lines changed

mavis/test/pages/search_components/patient_search_component.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def get_patient_card_locator(self, child: Child) -> Locator:
3535
f'div.nhsuk-card.app-card.app-card--compact:has(h4:has-text("{child!s}"))'
3636
)
3737

38-
def verify_search(self) -> None:
38+
def check_no_patients_found_when_expected(self) -> None:
3939
self.search_for("a very long string that won't match any names")
4040
expect(
4141
self.page.get_by_text("No children matching search criteria found"),
@@ -71,6 +71,18 @@ def search_for_a_child_name(self, child_name: str) -> None:
7171
self.page.get_by_role("link", name=child_name),
7272
)
7373

74+
@step("Search for child {1}")
75+
def search_for_a_child_by_nhs_number(self, child: Child) -> None:
76+
self.search_textbox.fill(child.nhs_number)
77+
78+
with self.page.expect_navigation():
79+
self.search_button.click()
80+
81+
reload_until_element_is_visible(
82+
self.page,
83+
self.page.get_by_role("link", name=str(child)),
84+
)
85+
7486
@step("Click Advanced filters")
7587
def click_advanced_filters(self) -> None:
7688
self.advanced_filters_link.click()

mavis/test/pages/sessions/sessions_patient_page.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ def confirm_pre_screening_checks(
220220
expect(locator).to_be_visible()
221221

222222
# need to wait for checkbox to load properly
223-
self.page.wait_for_load_state("networkidle")
223+
time.sleep(1)
224224

225225
expect(self.pre_screening_checkbox).to_be_editable()
226226
self.pre_screening_checkbox.check()

tests/test_sessions.py

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,19 +177,31 @@ def test_attendance_filters_functionality(
177177
@issue("MAV-1018")
178178
@pytest.mark.bug
179179
def test_session_search_functionality(
180-
setup_random_child,
180+
setup_fixed_child,
181+
children,
181182
page,
182183
):
183184
"""
184185
Test: Verify the search functionality within a session.
185186
Steps:
186-
1. Open a session with a random child.
187-
2. Use the search feature to look for children.
187+
1. Open a session with a child.
188+
2. Use the search feature to look for the child by name and NHS number
189+
3. Use the search features with the year group filter
188190
Verification:
189191
- Search returns expected results for the session.
190192
"""
193+
child = children[Programme.HPV][0]
194+
191195
SessionsOverviewPage(page).tabs.click_children_tab()
192-
SessionsChildrenPage(page).search.verify_search()
196+
SessionsChildrenPage(page).search.check_no_patients_found_when_expected()
197+
198+
SessionsChildrenPage(page).search.search_for_a_child_name(str(child))
199+
SessionsChildrenPage(page).search.search_for_a_child_by_nhs_number(child)
200+
201+
SessionsChildrenPage(page).search.check_year_checkbox(child.year_group)
202+
203+
SessionsChildrenPage(page).search.search_for_a_child_name(str(child))
204+
SessionsChildrenPage(page).search.search_for_a_child_by_nhs_number(child)
193205

194206

195207
@issue("MAV-1381")

0 commit comments

Comments
 (0)