Skip to content

Commit 69d2775

Browse files
adrianoaru-nhsadrianoaru-nhs
committed
Addressing PR comments
1 parent 6fb939e commit 69d2775

File tree

4 files changed

+69
-97
lines changed

4 files changed

+69
-97
lines changed

‎pages/base_page.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,10 +256,17 @@ def assert_dialog_text(self, expected_text: str, accept: bool = False) -> None:
256256
If no dialog appears, logs an error.
257257
Args:
258258
expected_text (str): The text that should be present in the dialog.
259+
accept (bool): Set to True if you want to accept the dialog, by deafult is is set to False.
259260
"""
260261
self._dialog_assertion_error = None
261262

262263
def handle_dialog(dialog: Dialog, accept: bool = False):
264+
"""
265+
Handles the dialog and asserts that the dialog contains the expected text.
266+
Args:
267+
dialog (Dialog): the playwright dialog object
268+
accept (bool): Set to True if you want to accept the dialog, by deafult is is set to False.
269+
"""
263270
logging.info(f"Dialog appeared with message: {dialog.message}")
264271
actual_text = dialog.message
265272
try:

‎tests/regression/subject/episodes/datasets/investigation/endoscopy/polypcategories/test_no_histology.py‎

Lines changed: 17 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
get_default_endoscopy_information,
4545
complete_and_assert_investigation,
4646
)
47+
from pytest import FixtureRequest
4748

4849
lnpcp_string = "LNPCP"
4950
advanced_colorectal_polyp_string = "Advanced colorectal polyp"
@@ -113,6 +114,19 @@
113114
]
114115

115116

117+
@pytest.fixture(scope="function", autouse=True)
118+
def before_test(page: Page, request: FixtureRequest) -> None:
119+
"""
120+
Before every test is executed, this fixture:
121+
- Logs into BCSS as a Screening Centre Manager at BCS001
122+
- Navigates to the screening subject search page
123+
"""
124+
if request.node.get_closest_marker("skip_before_test"):
125+
return
126+
UserTools.user_login(page, "Screening Centre Manager at BCS001")
127+
BasePage(page).go_to_screening_subject_search_page()
128+
129+
116130
@pytest.mark.vpn_required
117131
@pytest.mark.regression
118132
@pytest.mark.investigation_dataset_tests
@@ -126,9 +140,6 @@ def test_identify_polyp_category_no_histology_a(
126140
nhs_no = df.iloc[0]["subject_nhs_number"]
127141
logging.info(f"NHS Number: {nhs_no}")
128142

129-
UserTools.user_login(page, "Screening Centre Manager at BCS001")
130-
BasePage(page).click_main_menu_link()
131-
BasePage(page).go_to_screening_subject_search_page()
132143
search_subject_episode_by_nhs_number(page, nhs_no)
133144

134145
SubjectScreeningSummaryPage(page).click_datasets_link()
@@ -181,9 +192,6 @@ def test_identify_polyp_category_no_histology_b(
181192
nhs_no = df.iloc[0]["subject_nhs_number"]
182193
logging.info(f"NHS Number: {nhs_no}")
183194

184-
UserTools.user_login(page, "Screening Centre Manager at BCS001")
185-
BasePage(page).click_main_menu_link()
186-
BasePage(page).go_to_screening_subject_search_page()
187195
search_subject_episode_by_nhs_number(page, nhs_no)
188196

189197
SubjectScreeningSummaryPage(page).click_datasets_link()
@@ -240,9 +248,6 @@ def test_identify_polyp_category_no_histology_c(
240248
nhs_no = df.iloc[0]["subject_nhs_number"]
241249
logging.info(f"NHS Number: {nhs_no}")
242250

243-
UserTools.user_login(page, "Screening Centre Manager at BCS001")
244-
BasePage(page).click_main_menu_link()
245-
BasePage(page).go_to_screening_subject_search_page()
246251
search_subject_episode_by_nhs_number(page, nhs_no)
247252

248253
SubjectScreeningSummaryPage(page).click_datasets_link()
@@ -300,9 +305,6 @@ def test_identify_polyp_category_no_histology_d(
300305
nhs_no = df.iloc[0]["subject_nhs_number"]
301306
logging.info(f"NHS Number: {nhs_no}")
302307

303-
UserTools.user_login(page, "Screening Centre Manager at BCS001")
304-
BasePage(page).click_main_menu_link()
305-
BasePage(page).go_to_screening_subject_search_page()
306308
search_subject_episode_by_nhs_number(page, nhs_no)
307309

308310
SubjectScreeningSummaryPage(page).click_datasets_link()
@@ -361,9 +363,6 @@ def test_identify_polyp_category_no_histology_e(
361363
nhs_no = df.iloc[0]["subject_nhs_number"]
362364
logging.info(f"NHS Number: {nhs_no}")
363365

364-
UserTools.user_login(page, "Screening Centre Manager at BCS001")
365-
BasePage(page).click_main_menu_link()
366-
BasePage(page).go_to_screening_subject_search_page()
367366
search_subject_episode_by_nhs_number(page, nhs_no)
368367

369368
SubjectScreeningSummaryPage(page).click_datasets_link()
@@ -421,9 +420,6 @@ def test_identify_polyp_category_no_histology_f(
421420
nhs_no = df.iloc[0]["subject_nhs_number"]
422421
logging.info(f"NHS Number: {nhs_no}")
423422

424-
UserTools.user_login(page, "Screening Centre Manager at BCS001")
425-
BasePage(page).click_main_menu_link()
426-
BasePage(page).go_to_screening_subject_search_page()
427423
search_subject_episode_by_nhs_number(page, nhs_no)
428424

429425
SubjectScreeningSummaryPage(page).click_datasets_link()
@@ -489,9 +485,6 @@ def test_identify_polyp_category_no_histology_g(
489485
nhs_no = df.iloc[0]["subject_nhs_number"]
490486
logging.info(f"NHS Number: {nhs_no}")
491487

492-
UserTools.user_login(page, "Screening Centre Manager at BCS001")
493-
BasePage(page).click_main_menu_link()
494-
BasePage(page).go_to_screening_subject_search_page()
495488
search_subject_episode_by_nhs_number(page, nhs_no)
496489

497490
SubjectScreeningSummaryPage(page).click_datasets_link()
@@ -556,9 +549,6 @@ def test_identify_polyp_category_no_histology_h(
556549
nhs_no = df.iloc[0]["subject_nhs_number"]
557550
logging.info(f"NHS Number: {nhs_no}")
558551

559-
UserTools.user_login(page, "Screening Centre Manager at BCS001")
560-
BasePage(page).click_main_menu_link()
561-
BasePage(page).go_to_screening_subject_search_page()
562552
search_subject_episode_by_nhs_number(page, nhs_no)
563553

564554
SubjectScreeningSummaryPage(page).click_datasets_link()
@@ -625,9 +615,6 @@ def test_identify_polyp_category_no_histology_i(
625615
nhs_no = df.iloc[0]["subject_nhs_number"]
626616
logging.info(f"NHS Number: {nhs_no}")
627617

628-
UserTools.user_login(page, "Screening Centre Manager at BCS001")
629-
BasePage(page).click_main_menu_link()
630-
BasePage(page).go_to_screening_subject_search_page()
631618
search_subject_episode_by_nhs_number(page, nhs_no)
632619

633620
SubjectScreeningSummaryPage(page).click_datasets_link()
@@ -694,9 +681,6 @@ def test_identify_polyp_category_no_histology_j(
694681
nhs_no = df.iloc[0]["subject_nhs_number"]
695682
logging.info(f"NHS Number: {nhs_no}")
696683

697-
UserTools.user_login(page, "Screening Centre Manager at BCS001")
698-
BasePage(page).click_main_menu_link()
699-
BasePage(page).go_to_screening_subject_search_page()
700684
search_subject_episode_by_nhs_number(page, nhs_no)
701685

702686
SubjectScreeningSummaryPage(page).click_datasets_link()
@@ -762,9 +746,6 @@ def test_identify_polyp_category_no_histology_k(
762746
nhs_no = df.iloc[0]["subject_nhs_number"]
763747
logging.info(f"NHS Number: {nhs_no}")
764748

765-
UserTools.user_login(page, "Screening Centre Manager at BCS001")
766-
BasePage(page).click_main_menu_link()
767-
BasePage(page).go_to_screening_subject_search_page()
768749
search_subject_episode_by_nhs_number(page, nhs_no)
769750

770751
SubjectScreeningSummaryPage(page).click_datasets_link()
@@ -826,9 +807,6 @@ def test_identify_polyp_category_no_histology_l(
826807
nhs_no = df.iloc[0]["subject_nhs_number"]
827808
logging.info(f"NHS Number: {nhs_no}")
828809

829-
UserTools.user_login(page, "Screening Centre Manager at BCS001")
830-
BasePage(page).click_main_menu_link()
831-
BasePage(page).go_to_screening_subject_search_page()
832810
search_subject_episode_by_nhs_number(page, nhs_no)
833811

834812
SubjectScreeningSummaryPage(page).click_datasets_link()
@@ -890,9 +868,6 @@ def test_identify_polyp_category_no_histology_m(
890868
nhs_no = df.iloc[0]["subject_nhs_number"]
891869
logging.info(f"NHS Number: {nhs_no}")
892870

893-
UserTools.user_login(page, "Screening Centre Manager at BCS001")
894-
BasePage(page).click_main_menu_link()
895-
BasePage(page).go_to_screening_subject_search_page()
896871
search_subject_episode_by_nhs_number(page, nhs_no)
897872

898873
SubjectScreeningSummaryPage(page).click_datasets_link()
@@ -954,9 +929,6 @@ def test_identify_polyp_category_no_histology_n(
954929
nhs_no = df.iloc[0]["subject_nhs_number"]
955930
logging.info(f"NHS Number: {nhs_no}")
956931

957-
UserTools.user_login(page, "Screening Centre Manager at BCS001")
958-
BasePage(page).click_main_menu_link()
959-
BasePage(page).go_to_screening_subject_search_page()
960932
search_subject_episode_by_nhs_number(page, nhs_no)
961933

962934
SubjectScreeningSummaryPage(page).click_datasets_link()
@@ -1037,9 +1009,6 @@ def test_identify_polyp_category_no_histology_o(
10371009
nhs_no = df.iloc[0]["subject_nhs_number"]
10381010
logging.info(f"NHS Number: {nhs_no}")
10391011

1040-
UserTools.user_login(page, "Screening Centre Manager at BCS001")
1041-
BasePage(page).click_main_menu_link()
1042-
BasePage(page).go_to_screening_subject_search_page()
10431012
search_subject_episode_by_nhs_number(page, nhs_no)
10441013

10451014
SubjectScreeningSummaryPage(page).click_datasets_link()
@@ -1089,9 +1058,6 @@ def test_identify_polyp_category_no_histology_p(
10891058
nhs_no = df.iloc[0]["subject_nhs_number"]
10901059
logging.info(f"NHS Number: {nhs_no}")
10911060

1092-
UserTools.user_login(page, "Screening Centre Manager at BCS001")
1093-
BasePage(page).click_main_menu_link()
1094-
BasePage(page).go_to_screening_subject_search_page()
10951061
search_subject_episode_by_nhs_number(page, nhs_no)
10961062

10971063
SubjectScreeningSummaryPage(page).click_datasets_link()
@@ -1128,6 +1094,7 @@ def test_identify_polyp_category_no_histology_p(
11281094
)
11291095

11301096

1097+
@pytest.mark.skip_before_test
11311098
@pytest.mark.vpn_required
11321099
@pytest.mark.regression
11331100
@pytest.mark.investigation_dataset_tests
@@ -1206,6 +1173,7 @@ def test_identify_polyp_category_no_histology_q(
12061173
)
12071174

12081175

1176+
@pytest.mark.skip_before_test
12091177
@pytest.mark.vpn_required
12101178
@pytest.mark.regression
12111179
@pytest.mark.investigation_dataset_tests
@@ -1276,6 +1244,7 @@ def test_identify_polyp_category_no_histology_r(
12761244
)
12771245

12781246

1247+
@pytest.mark.skip_before_test
12791248
@pytest.mark.vpn_required
12801249
@pytest.mark.regression
12811250
@pytest.mark.investigation_dataset_tests

0 commit comments

Comments
 (0)