Skip to content

Commit 9e2efc1

Browse files
Migrating scenario 13 of surveillance regression tests
1 parent 87da67e commit 9e2efc1

File tree

4 files changed

+734
-3
lines changed

4 files changed

+734
-3
lines changed

pages/datasets/investigation_dataset_page.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,8 @@ def click_edit_dataset_button(self) -> None:
491491
This method is designed to click on the edit dataset button.
492492
It clicks on the edit dataset button.
493493
"""
494-
self.click(self.edit_dataset_button)
494+
if self.edit_dataset_button.is_visible():
495+
self.click(self.edit_dataset_button)
495496

496497
def assert_polyp_algorithm_size(
497498
self, polyp_number: int, expected_value: Optional[str]

pages/datasets/subject_datasets_page.py

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,16 @@ def __init__(self, page: Page):
2222
.get_by_role("link")
2323
)
2424
self.add_link = self.page.get_by_role("link", name="Add")
25+
self.view_link = self.page.get_by_role("link", name="View")
2526

2627
def click_add_link(self) -> None:
2728
"""Clicks on the first 'Add' link on the Subject Datasets Page."""
2829
self.click(self.add_link.first)
2930

31+
def click_view_link(self) -> None:
32+
"""Clicks on the first 'View' link on the Subject Datasets Page."""
33+
self.click(self.view_link.first)
34+
3035
def click_colonoscopy_show_datasets(self) -> None:
3136
"""
3237
Clicks on the 'Show Dataset(s)' button for the Colonoscopy Assessment row on the Subject Datasets Page.
@@ -64,9 +69,19 @@ def click_show_datasets_button(self, header: Locator) -> None:
6469
show_link = container.locator("a:has-text('Show Dataset')")
6570
show_link.wait_for(state="visible", timeout=10000)
6671
self.click(show_link)
67-
# If plural, also click Add
72+
# If plural, also click Add or View depending on visibility
6873
if dataset_count_text and "Datasets" in dataset_count_text:
69-
self.click_add_link()
74+
try:
75+
self.add_link.first.wait_for(state="visible", timeout=2000)
76+
self.click_add_link()
77+
except:
78+
try:
79+
self.view_link.first.wait_for(state="visible", timeout=2000)
80+
self.click_view_link()
81+
except Exception:
82+
raise Exception(
83+
"Neither 'Add' nor 'View' link was found after clicking 'Show Datasets'."
84+
)
7085

7186
def check_investigation_dataset_complete(self) -> None:
7287
"""

pages/screening_subject_search/diagnostic_test_outcome_page.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ class OutcomeOfDiagnosticTest(StrEnum):
154154
REFER_SURVEILLANCE = "20365"
155155
INVESTIGATION_COMPLETE = "20360"
156156
REFER_ANOTHER_DIAGNOSTIC_TEST = "20364"
157+
REFER_MDT = "20367"
157158

158159

159160
class ReasonForSymptomaticReferral(StrEnum):

0 commit comments

Comments
 (0)