Skip to content

Commit 06974db

Browse files
As per PR # 110 comments, Code change is implemented.
1 parent ea21bd3 commit 06974db

File tree

1 file changed

+22
-33
lines changed

1 file changed

+22
-33
lines changed

tests/regression/subject_diagnosis_date/test_subject_episodes_diagnosis_date.py

Lines changed: 22 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ def test_screening_centre_manager_records_diagnosis_date_for_subject_with_referr
164164
page: Page,
165165
) -> None:
166166
"""
167-
Tests that a screening centre manager records a diagnosis date of today for a subject who HAS a referral date and does NOT yet have a diagnosis date recorded
168-
Given I log in to BCSS "England" as user role "Screening Centre Manager"
167+
Tests that verify screening centre manager records a diagnosis date of today for a subject who HAS a referral date
168+
and does NOT yet have a diagnosis date recorded.
169169
"""
170170
# Step 1: # Query subject by criteria, log in, navigate to search page, select "Episodes" radio button, and open subject profile
171171
criteria = {
@@ -207,8 +207,7 @@ def test_screening_centre_manager_records_diagnosis_date_for_subject_with_referr
207207
@pytest.mark.fobt_diagnosis_date_entry_tests
208208
def test_cannot_record_diagnosis_date_without_referral(page: Page) -> None:
209209
"""
210-
Tests that a screening centre user cannot record a diagnosis date for a subject who does NOT have a referral date
211-
Given I log in to BCSS "England" as user role "Screening Centre Manager"
210+
Tests that verify screening centre user cannot record a diagnosis date for a subject who does NOT have a referral date.
212211
"""
213212
# Step 1: # Query subject by criteria, log in, navigate to search page, select "Episodes" radio button, and open subject profile
214213
criteria = {
@@ -242,8 +241,8 @@ def test_cannot_record_diagnosis_date_without_referral(page: Page) -> None:
242241
@pytest.mark.fobt_diagnosis_date_entry_tests
243242
def test_cannot_record_diagnosis_date_with_existing_diagnosis(page: Page) -> None:
244243
"""
245-
Tests that A screening centre user cannot record a diagnosis date for a subject who HAS a referral date and already has a diagnosis date recorded
246-
Given I log in to BCSS "England" as user role "Screening Centre Manager"
244+
Tests that verify A screening centre user cannot record a diagnosis date for a subject who HAS a referral date
245+
and already has a diagnosis date recorded.
247246
"""
248247
# Step 1: # Query subject by criteria, log in, navigate to search page, select "Episodes" radio button, and open subject profile
249248
criteria = {
@@ -287,8 +286,8 @@ def test_cannot_record_diagnosis_date_with_existing_diagnosis(page: Page) -> Non
287286
@pytest.mark.fobt_diagnosis_date_entry_tests
288287
def test_hub_user_can_record_diagnosis_date_with_referral_no_diag(page: Page) -> None:
289288
"""
290-
Tests that a hub user can record a diagnosis date for a subject who HAS a referral date and does NOT yet have a diagnosis date recorded
291-
Given I log in to BCSS "England" as user role "Hub Manager"
289+
Tests that verify A hub user can record a diagnosis date for a subject who HAS a referral date
290+
and does NOT yet have a diagnosis date recorded.
292291
"""
293292
# Step 1: Obtain NHS number for a subject matching criteria
294293
criteria = {
@@ -358,8 +357,7 @@ def test_hub_user_can_record_diagnosis_date_with_referral_no_diag(page: Page) ->
358357
@pytest.mark.fobt_diagnosis_date_entry_tests
359358
def test_record_diagnosis_date_no_date_or_reason_alert(page: Page) -> None:
360359
"""
361-
Tests that Record Diagnosis Date : enter no date or reason
362-
Given I log in to BCSS "England" as user role "Screening Centre Manager"
360+
Tests that verify Record Diagnosis Date with enter no date or reason.
363361
"""
364362
# Step 1: # Query subject by criteria, log in, navigate to search page, select "Episodes" radio button, and open subject profile
365363
criteria = {
@@ -393,8 +391,7 @@ def test_record_diagnosis_date_no_date_or_reason_alert(page: Page) -> None:
393391
@pytest.mark.fobt_diagnosis_date_entry_tests
394392
def test_record_diagnosis_date_reason_only(page: Page) -> None:
395393
"""
396-
Tests that Record Diagnosis Date : enter no date but give a reason
397-
Given I log in to BCSS "England" as user role "Screening Centre Manager"
394+
Tests that verify Record Diagnosis Date with enter no date but give a reason.
398395
"""
399396
# Step 1: # Query subject by criteria, log in, navigate to search page, select "Episodes" radio button, and open subject profile
400397
criteria = {
@@ -426,8 +423,7 @@ def test_record_diagnosis_date_reason_only(page: Page) -> None:
426423
@pytest.mark.fobt_diagnosis_date_entry_tests
427424
def test_amend_diagnosis_date_without_reason_alert(page: Page) -> None:
428425
"""
429-
Tests that Amend Diagnosis Date : amend date, but don't give a reason
430-
Given I log in to BCSS "England" as user role "Screening Centre Manager"
426+
Tests that verify mend Diagnosis Date with amend date, but don't give a reason.
431427
"""
432428
# Step 1: Obtain NHS number for a subject matching criteria
433429
criteria = {
@@ -465,8 +461,7 @@ def test_amend_diagnosis_date_without_reason_alert(page: Page) -> None:
465461
@pytest.mark.fobt_diagnosis_date_entry_tests
466462
def test_amend_diagnosis_date_with_reason(page: Page) -> None:
467463
"""
468-
Tests that Amend Diagnosis Date : amend date, and give a reason
469-
Given I log in to BCSS "England" as user role "Screening Centre Manager"
464+
Tests that verify Amend Diagnosis Date with amend date, and give a reason.
470465
"""
471466
# Step 1: Obtain NHS number for a subject matching criteria
472467
criteria = {
@@ -522,8 +517,7 @@ def test_amend_diagnosis_date_with_reason(page: Page) -> None:
522517
@pytest.mark.fobt_diagnosis_date_entry_tests
523518
def test_amend_diagnosis_date_remove_date_with_reason(page: Page) -> None:
524519
"""
525-
Tests that a Amend Diagnosis Date : remove existing date, give a reason
526-
Given I log in to BCSS "England" as user role "Screening Centre Manager"
520+
Tests that verify Amend Diagnosis Date with remove existing date, give a reason.
527521
"""
528522
# Step 1: Obtain NHS number for a subject matching criteria
529523
criteria = {
@@ -602,8 +596,7 @@ def get_diagnosis_reason() -> Optional[str]:
602596
@pytest.mark.fobt_diagnosis_date_entry_tests
603597
def test_amend_diagnosis_date_no_change_alert(page: Page) -> None:
604598
"""
605-
Tests that Amend Diagnosis Date : no change to data, starting with date but no reason
606-
Given I log in to BCSS "England" as user role "Screening Centre Manager"
599+
Tests that verify Amend Diagnosis Date with no change to data, starting with date but no reason.
607600
"""
608601
# Step 1: Query subject by criteria, log in, navigate to search page, select "Episodes" radio button, and open subject profile
609602
criteria = {
@@ -634,9 +627,9 @@ def test_amend_diagnosis_date_no_change_alert(page: Page) -> None:
634627
@pytest.mark.fobt_diagnosis_date_entry_tests
635628
def test_amend_diagnosis_date_no_change_with_reason_alert(page: Page) -> None:
636629
"""
637-
Tests that Amend Diagnosis Date : no change to data, starting with date and reason
638-
Note: When amending a diagnosis date, the only valid reason is "Incorrect information previously entered", so to make no change to a subject with both date and reason, find someone who already has this reason.
639-
Given I log in to BCSS "England" as user role "Screening Centre Manager"
630+
Tests that verify Amend Diagnosis Date with no change to data, starting with date and reason.
631+
Note: When amending a diagnosis date, the only valid reason is "Incorrect information previously entered",
632+
so to make no change to a subject with both date and reason, find someone who already has this reason.
640633
"""
641634
# Step 1: Obtain NHS number for a subject matching criteria
642635
criteria = {
@@ -687,8 +680,7 @@ def test_amend_diagnosis_date_no_change_with_reason_alert(page: Page) -> None:
687680
@pytest.mark.fobt_diagnosis_date_entry_tests
688681
def test_amend_diagnosis_date_no_change_with_reason_only_alert(page: Page) -> None:
689682
"""
690-
Tests that Amend Diagnosis Date : no change to data, starting with no date but a reason
691-
Given I log in to BCSS "England" as user role "Screening Centre Manager"
683+
Tests that verify Amend Diagnosis Date with no change to data, starting with no date but a reason.
692684
"""
693685
# Step 1: Obtain NHS number for a subject matching criteria
694686
criteria = {
@@ -744,8 +736,7 @@ def test_amend_diagnosis_date_no_change_with_reason_only_alert(page: Page) -> No
744736
@pytest.mark.fobt_diagnosis_date_entry_tests
745737
def test_hub_user_cannot_amend_diagnosis_date(page: Page) -> None:
746738
"""
747-
Tests that a Amend Diagnosis Date : hub user can't do this
748-
Given I log in to BCSS "England" as user role "Hub Manager"
739+
Tests that verify Amend Diagnosis Date with Hub user can't do this.
749740
"""
750741
# Step 1: Obtain NHS number for a subject matching criteria (diagnosis date reason is NOT NULL)
751742
criteria = {
@@ -801,8 +792,7 @@ def test_hub_user_cannot_amend_diagnosis_date(page: Page) -> None:
801792
@pytest.mark.fobt_diagnosis_date_entry_tests
802793
def test_record_and_amend_diagnosis_date_multiple_times(page: Page) -> None:
803794
"""
804-
Tests that a Record a Diagnosis Date then amend it a few times.
805-
Given I log in to BCSS "England" as user role "Screening Centre Manager"
795+
Tests that verify Record a Diagnosis Date then amend it a few times.
806796
"""
807797
# Step 1: # Query subject by criteria, log in, navigate to search page, select "Episodes" radio button, and open subject profile
808798
criteria = {
@@ -905,8 +895,7 @@ def test_record_and_amend_diagnosis_date_multiple_times(page: Page) -> None:
905895
@pytest.mark.fobt_diagnosis_date_entry_tests
906896
def test_support_user_can_amend_diagnosis_date_earlier(page: Page) -> None:
907897
"""
908-
Tests that a A support user can amend a date to make it earlier
909-
Given I log in to BCSS "England" as user role "BCSS Support SC"
898+
Tests that verify a support user can amend a date to make it earlier.
910899
"""
911900
# Step 1: Obtain NHS number for a subject matching criteria
912901
criteria = {
@@ -986,8 +975,8 @@ def test_support_user_can_amend_diagnosis_date_earlier(page: Page) -> None:
986975
@pytest.mark.fobt_diagnosis_date_entry_tests
987976
def test_sspi_cease_for_death_closes_episode(page: Page) -> None:
988977
"""
989-
Tests that a SSPI cease for death closes an episode with a referral date but no diagnosis date, date of death is within 28 days of the referral date
990-
Given I log in to BCSS "England" as user role "Screening Centre Manager"
978+
Tests that a SSPI cease for death closes an episode with a referral date but no diagnosis date,
979+
date of death is within 28 days of the referral date.
991980
"""
992981
# Step 1: Obtain NHS number for a subject matching criteria
993982
criteria = {

0 commit comments

Comments
 (0)