Skip to content

Commit 95a71b1

Browse files
BCSS-20549 wip3 and deleted test_search_screening_subject_by_status_bowel_scope no longer in scope
1 parent 2d824a1 commit 95a71b1

File tree

8 files changed

+38
-50
lines changed

8 files changed

+38
-50
lines changed

pages/gfobt_test_kits/gfobt_create_qc_kit_page.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ def __init__(self, page: Page):
2323

2424
def verify_create_qc_kit_title(self) -> None:
2525
"""Verify the Create QC Kit page title contains text "Create QC Kit"."""
26-
expect(self.create_qc_kit_title).to_contain_text("Create QC Kit")
26+
BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
27+
"Create QC Kit"
28+
)
2729

2830
def go_to_reading1dropdown(self, option: str) -> None:
2931
"""Selects a given option from the reading 1 dropdown."""

pages/gfobt_test_kits/gfobt_test_kit_logging_page.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,6 @@ def __init__(self, page: Page):
1212

1313
def verify_test_kit_logging_title(self) -> None:
1414
"""Verify the title of the GFOBT Test Kit Logging page."""
15-
expect(self.test_kit_logging_title).to_contain_text("Test Kit Logging")
15+
BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
16+
"Test Kit Logging"
17+
)

pages/gfobt_test_kits/gfobt_test_kit_quality_control_reading_page.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ def __init__(self, page: Page):
1414

1515
def verify_test_kit_logging_tile(self) -> None:
1616
"""Verify the title of the GFOBT Test Kit Quality Control Reading page."""
17-
expect(self.test_kit_quality_control_reading_title).to_contain_text(
17+
BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
1818
"Test Kit Quality Control Reading"
1919
)

pages/gfobt_test_kits/gfobt_view_test_kit_result_page.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,6 @@ def __init__(self, page: Page):
1212

1313
def verify_view_test_kit_result_title(self) -> None:
1414
"""Verify the title of the View Test Kit Result page."""
15-
expect(self.view_test_kit_result_title).to_contain_text("View Test Kit Result")
15+
BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
16+
"View Test Kit Result"
17+
)

pages/lynch_surveillance/set_lynch_invitation_rates_page.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ def __init__(self, page: Page):
1313

1414
def verify_set_lynch_invitation_rates_title(self) -> None:
1515
"""Verifies that the Set Lynch Invitation Rates title is displayed."""
16-
expect(self.set_lynch_invitation_rates_title).to_contain_text(
16+
BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
1717
"Set Lynch Surveillance Invitation Rates"
1818
)

pages/screening_practitioner_appointments/colonoscopy_assessment_appointments_page.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def __init__(self, page: Page):
1818

1919
def verify_page_header(self) -> None:
2020
"""Verifies the Colonoscopy Assessment Appointments page header is displayed correctly."""
21-
expect(self.page_header).to_contain_text(
21+
BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
2222
"Patients that Require Colonoscopy Assessment Appointments"
2323
)
2424

pages/screening_subject_search/subject_screening_summary_page.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ def verify_result_contains_text(self, text) -> None:
6666

6767
def verify_subject_search_results_title_subject_screening_summary(self) -> None:
6868
"""Verify that the subject search results title contains 'Subject Screening Summary'."""
69-
expect(self.subject_search_results_title).to_contain_text(
69+
BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
7070
"Subject Screening Summary"
7171
)
7272

7373
def verify_subject_search_results_title_subject_search_results(self) -> None:
7474
"""Verify that the subject search results title contains 'Subject Search Results'."""
75-
expect(self.subject_search_results_title).to_contain_text(
75+
BasePage(self.page).bowel_cancer_screening_page_title_contains_text(
7676
"Subject Search Results"
7777
)
7878

tests/test_screening_subject_search_page.py

Lines changed: 24 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def before_each(page: Page):
3737
BasePage(page).go_to_screening_subject_search_page()
3838

3939

40-
@pytest.mark.smoke
40+
@pytest.mark.smoked
4141
def test_search_screening_subject_by_nhs_number(
4242
page: Page, general_properties: dict
4343
) -> None:
@@ -55,7 +55,7 @@ def test_search_screening_subject_by_nhs_number(
5555
).verify_subject_search_results_title_subject_screening_summary()
5656

5757

58-
@pytest.mark.smoke
58+
@pytest.mark.smoked
5959
def test_search_screening_subject_by_surname(
6060
page: Page, general_properties: dict
6161
) -> None:
@@ -73,7 +73,7 @@ def test_search_screening_subject_by_surname(
7373
).verify_subject_search_results_title_subject_screening_summary()
7474

7575

76-
@pytest.mark.smoke
76+
@pytest.mark.smoked
7777
def test_search_screening_subject_by_forename(
7878
page: Page, general_properties: dict
7979
) -> None:
@@ -91,7 +91,7 @@ def test_search_screening_subject_by_forename(
9191
).verify_subject_search_results_title_subject_screening_summary()
9292

9393

94-
@pytest.mark.smoke
94+
@pytest.mark.smoked
9595
def test_search_screening_subject_by_dob(page: Page, general_properties: dict) -> None:
9696
"""
9797
Confirms a screening subject can be searched for, using their date of birth by doing the following:
@@ -107,7 +107,7 @@ def test_search_screening_subject_by_dob(page: Page, general_properties: dict) -
107107
).verify_subject_search_results_title_subject_search_results()
108108

109109

110-
@pytest.mark.smoke
110+
@pytest.mark.smoked
111111
def test_search_screening_subject_by_postcode(page: Page) -> None:
112112
"""
113113
Confirms a screening subject can be searched for, using their postcode by doing the following:
@@ -123,7 +123,7 @@ def test_search_screening_subject_by_postcode(page: Page) -> None:
123123
).verify_subject_search_results_title_subject_search_results()
124124

125125

126-
@pytest.mark.smoke
126+
@pytest.mark.smoked
127127
def test_search_screening_subject_by_episode_closed_date(
128128
page: Page, general_properties: dict
129129
) -> None:
@@ -159,7 +159,7 @@ def test_search_criteria_clear_filters_button(
159159
check_clear_filters_button_works(page, general_properties["nhs_number"])
160160

161161

162-
@pytest.mark.smoke
162+
@pytest.mark.smoked
163163
# Tests searching via the "Screening Status" drop down list
164164
def test_search_screening_subject_by_status_call(page: Page) -> None:
165165
"""
@@ -176,7 +176,7 @@ def test_search_screening_subject_by_status_call(page: Page) -> None:
176176
).verify_subject_search_results_title_subject_search_results()
177177

178178

179-
@pytest.mark.smoke
179+
@pytest.mark.smoked
180180
def test_search_screening_subject_by_status_inactive(page: Page) -> None:
181181
"""
182182
Confirms screening subjects can be searched for, using the screening status (call) by doing the following:
@@ -192,7 +192,7 @@ def test_search_screening_subject_by_status_inactive(page: Page) -> None:
192192
).verify_subject_search_results_title_subject_search_results()
193193

194194

195-
@pytest.mark.smoke
195+
@pytest.mark.smoked
196196
def test_search_screening_subject_by_status_opt_in(page: Page) -> None:
197197
"""
198198
Confirms screening subjects can be searched for, using the screening status (call) by doing the following:
@@ -208,7 +208,7 @@ def test_search_screening_subject_by_status_opt_in(page: Page) -> None:
208208
).verify_subject_search_results_title_subject_search_results()
209209

210210

211-
@pytest.mark.smoke
211+
@pytest.mark.smoked
212212
def test_search_screening_subject_by_status_recall(page: Page) -> None:
213213
"""
214214
Confirms screening subjects can be searched for, using the screening status (call) by doing the following:
@@ -224,7 +224,7 @@ def test_search_screening_subject_by_status_recall(page: Page) -> None:
224224
).verify_subject_search_results_title_subject_search_results()
225225

226226

227-
@pytest.mark.smoke
227+
@pytest.mark.smoked
228228
def test_search_screening_subject_by_status_self_referral(page: Page) -> None:
229229
"""
230230
Confirms screening subjects can be searched for, using the screening status (call) by doing the following:
@@ -242,7 +242,7 @@ def test_search_screening_subject_by_status_self_referral(page: Page) -> None:
242242
).verify_subject_search_results_title_subject_search_results()
243243

244244

245-
@pytest.mark.smoke
245+
@pytest.mark.smoked
246246
def test_search_screening_subject_by_status_surveillance(page: Page) -> None:
247247
"""
248248
Confirms screening subjects can be searched for, using the screening status (call) by doing the following:
@@ -260,7 +260,7 @@ def test_search_screening_subject_by_status_surveillance(page: Page) -> None:
260260
).verify_subject_search_results_title_subject_search_results()
261261

262262

263-
@pytest.mark.smoke
263+
@pytest.mark.smoked
264264
def test_search_screening_subject_by_status_seeking_further_data(page: Page) -> None:
265265
"""
266266
Confirms screening subjects can be searched for, using the screening status (call) by doing the following:
@@ -278,7 +278,7 @@ def test_search_screening_subject_by_status_seeking_further_data(page: Page) ->
278278
).verify_subject_search_results_title_subject_search_results()
279279

280280

281-
@pytest.mark.smoke
281+
@pytest.mark.smoked
282282
def test_search_screening_subject_by_status_ceased(page: Page) -> None:
283283
"""
284284
Confirms screening subjects can be searched for, using the screening status (call) by doing the following:
@@ -294,25 +294,7 @@ def test_search_screening_subject_by_status_ceased(page: Page) -> None:
294294
).verify_subject_search_results_title_subject_search_results()
295295

296296

297-
@pytest.mark.smoke
298-
def test_search_screening_subject_by_status_bowel_scope(page: Page) -> None:
299-
"""
300-
Confirms screening subjects can be searched for, using the screening status (call) by doing the following:
301-
- Clear filters
302-
- Select status from dropdown
303-
- Pressing Tab is required after text input, to make the search button become active.
304-
- Click search button
305-
- Verify the subject search results page is displayed
306-
"""
307-
search_subject_by_status(
308-
page, ScreeningStatusSearchOptions.BOWEL_SCOPE_STATUS.value
309-
)
310-
SubjectScreeningSummaryPage(
311-
page
312-
).verify_subject_search_results_title_subject_search_results()
313-
314-
315-
@pytest.mark.smoke
297+
@pytest.mark.smoked
316298
def test_search_screening_subject_by_status_lynch_surveillance(page: Page) -> None:
317299
"""
318300
Confirms screening subjects can be searched for, using the screening status (call) by doing the following:
@@ -330,7 +312,7 @@ def test_search_screening_subject_by_status_lynch_surveillance(page: Page) -> No
330312
).verify_subject_search_results_title_subject_search_results()
331313

332314

333-
@pytest.mark.smoke
315+
@pytest.mark.smoked
334316
def test_search_screening_subject_by_status_lynch_self_referral(page: Page) -> None:
335317
"""
336318
Confirms screening subjects can be searched for, using the screening status (call) by doing the following:
@@ -348,7 +330,7 @@ def test_search_screening_subject_by_status_lynch_self_referral(page: Page) -> N
348330
).verify_subject_search_results_title_subject_screening_summary()
349331

350332

351-
@pytest.mark.smoke
333+
@pytest.mark.smoked
352334
# search_subject_by_latest_event_status
353335
def test_search_screening_subject_by_latest_episode_status_open_paused(
354336
page: Page,
@@ -369,7 +351,7 @@ def test_search_screening_subject_by_latest_episode_status_open_paused(
369351
).verify_subject_search_results_title_subject_search_results()
370352

371353

372-
@pytest.mark.smoke
354+
@pytest.mark.smoked
373355
def test_search_screening_subject_by_latest_episode_status_closed(page: Page) -> None:
374356
"""
375357
Confirms screening subjects can be searched for, using the screening status (call) by doing the following:
@@ -387,7 +369,7 @@ def test_search_screening_subject_by_latest_episode_status_closed(page: Page) ->
387369
).verify_subject_search_results_title_subject_search_results()
388370

389371

390-
@pytest.mark.smoke
372+
@pytest.mark.smoked
391373
def test_search_screening_subject_by_latest_episode_status_no_episode(
392374
page: Page,
393375
) -> None:
@@ -407,7 +389,7 @@ def test_search_screening_subject_by_latest_episode_status_no_episode(
407389
).verify_subject_search_results_title_subject_search_results()
408390

409391

410-
@pytest.mark.smoke
392+
@pytest.mark.smoked
411393
# Tests searching via the "Search Area" drop down list
412394
def test_search_screening_subject_by_home_hub(page: Page) -> None:
413395
"""
@@ -428,7 +410,7 @@ def test_search_screening_subject_by_home_hub(page: Page) -> None:
428410
).verify_subject_search_results_title_subject_search_results()
429411

430412

431-
@pytest.mark.smoke
413+
@pytest.mark.smoked
432414
def test_search_screening_subject_by_gp_practice(
433415
page: Page, general_properties: dict
434416
) -> None:
@@ -456,7 +438,7 @@ def test_search_screening_subject_by_gp_practice(
456438
)
457439

458440

459-
@pytest.mark.smoke
441+
@pytest.mark.smoked
460442
def test_search_screening_subject_by_ccg(page: Page, general_properties: dict) -> None:
461443
"""
462444
Confirms screening subjects can be searched for, using the search area (ccg) by doing the following:
@@ -480,7 +462,7 @@ def test_search_screening_subject_by_ccg(page: Page, general_properties: dict) -
480462
).verify_subject_search_results_title_subject_search_results()
481463

482464

483-
@pytest.mark.smoke
465+
@pytest.mark.smoked
484466
def test_search_screening_subject_by_screening_centre(
485467
page: Page, general_properties: dict
486468
) -> None:
@@ -505,7 +487,7 @@ def test_search_screening_subject_by_screening_centre(
505487

506488

507489
@pytest.mark.vpn_required
508-
@pytest.mark.smoke
490+
@pytest.mark.smoked
509491
def test_search_screening_subject_by_whole_database(page: Page) -> None:
510492
"""
511493
Confirms screening subjects can be searched for, using the search area (whole database) by doing the following:

0 commit comments

Comments
 (0)