Addressing review comments

Author: mepr1

tests/smokescreen/test_compartment_6.py

@@ -290,92 +290,92 @@ def test_compartment_6(page: Page, smokescreen_properties: dict) -> None:
 
     # This needs to be repeated for two subjects, one old and one not - High Risk Result
     # Older patient
-    # nhs_no = "9707238623"
-    # go_to_investigation_datasets_page(page, nhs_no)
-
-    # # The following code is on the investigation datasets page
-    # default_investigation_dataset_forms(page)
-    # InvestigationDatasetsPage(page).select_theraputic_procedure_type()
-    # default_investigation_dataset_forms_continuation(page)
-    # investigation_datasets_failure_reason(page)
-    # polyps_for_high_risk_result(page)
-    # save_investigation_dataset(page)
-    # after_high_risk_result(page)
-
-    # handover_subject_to_symptomatic_care(page)
-
-    # # Younger patient
-    # nhs_no = "9526262042"
-    # go_to_investigation_datasets_page(page, nhs_no)
-
-    # # The following code is on the investigation datasets page
-    # default_investigation_dataset_forms(page)
-    # InvestigationDatasetsPage(page).select_theraputic_procedure_type()
-    # default_investigation_dataset_forms_continuation(page)
-    # investigation_datasets_failure_reason(page)
-    # polyps_for_high_risk_result(page)
-    # save_investigation_dataset(page)
-    # after_high_risk_result(page)
-
-    # SubjectScreeningSummaryPage(page).verify_latest_event_status_value(
-    #     "A318 - Post-investigation Appointment NOT Required - Result Letter Created"
-    # )
-    # SubjectScreeningSummaryPage(page).click_advance_fobt_screening_episode_button()
+    nhs_no = "9707238623"
+    go_to_investigation_datasets_page(page, nhs_no)
 
-    # # The following code is on the advance fobt screening episode page
-    # AdvanceFOBTScreeningEpisodePage(page).click_record_diagnosis_date_button()
+    # The following code is on the investigation datasets page
+    default_investigation_dataset_forms(page)
+    InvestigationDatasetsPage(page).select_theraputic_procedure_type()
+    default_investigation_dataset_forms_continuation(page)
+    investigation_datasets_failure_reason(page)
+    polyps_for_high_risk_result(page)
+    save_investigation_dataset(page)
+    after_high_risk_result(page)
 
-    # # The following code is on the record diagnosis date page
-    # RecordDiagnosisDatePage(page).enter_date_in_diagnosis_date_field(datetime.today())
-    # RecordDiagnosisDatePage(page).click_save_button()
+    handover_subject_to_symptomatic_care(page)
 
-    # SubjectScreeningSummaryPage(page).verify_latest_event_status_value(
-    #     "A318 - Post-investigation Appointment NOT Required - Result Letter Created"
-    # )
+    # Younger patient
+    nhs_no = "9526262042"
+    go_to_investigation_datasets_page(page, nhs_no)
 
-    # # This needs to be repeated for two subjects, one old and one not - LNPCP Result
-    # # Older patient
-    # nhs_no = "9764755232"
-    # go_to_investigation_datasets_page(page, nhs_no)
-
-    # # The following code is on the investigation datasets page
-    # default_investigation_dataset_forms(page)
-    # InvestigationDatasetsPage(page).select_theraputic_procedure_type()
-    # default_investigation_dataset_forms_continuation(page)
-    # investigation_datasets_failure_reason(page)
-    # polyps_for_lnpcp_result(page)
-    # save_investigation_dataset(page)
-    # after_lnpcp_result(page)
-
-    # handover_subject_to_symptomatic_care(page)
-
-    # # Younger patient
-    # nhs_no = "9680451623"
-    # go_to_investigation_datasets_page(page, nhs_no)
-
-    # # The following code is on the investigation datasets page
-    # default_investigation_dataset_forms(page)
-    # InvestigationDatasetsPage(page).select_theraputic_procedure_type()
-    # default_investigation_dataset_forms_continuation(page)
-    # investigation_datasets_failure_reason(page)
-    # polyps_for_lnpcp_result(page)
-    # save_investigation_dataset(page)
-    # after_lnpcp_result(page)
-    # SubjectScreeningSummaryPage(page).verify_latest_event_status_value(
-    #     "A318 - Post-investigation Appointment NOT Required - Result Letter Created"
-    # )
-    # SubjectScreeningSummaryPage(page).click_advance_fobt_screening_episode_button()
+    # The following code is on the investigation datasets page
+    default_investigation_dataset_forms(page)
+    InvestigationDatasetsPage(page).select_theraputic_procedure_type()
+    default_investigation_dataset_forms_continuation(page)
+    investigation_datasets_failure_reason(page)
+    polyps_for_high_risk_result(page)
+    save_investigation_dataset(page)
+    after_high_risk_result(page)
 
-    # # The following code is on the advance fobt screening episode page
-    # AdvanceFOBTScreeningEpisodePage(page).click_record_diagnosis_date_button()
+    SubjectScreeningSummaryPage(page).verify_latest_event_status_value(
+        "A318 - Post-investigation Appointment NOT Required - Result Letter Created"
+    )
+    SubjectScreeningSummaryPage(page).click_advance_fobt_screening_episode_button()
 
-    # # The following code is on the record diagnosis date page
-    # RecordDiagnosisDatePage(page).enter_date_in_diagnosis_date_field(datetime.today())
-    # RecordDiagnosisDatePage(page).click_save_button()
+    # The following code is on the advance fobt screening episode page
+    AdvanceFOBTScreeningEpisodePage(page).click_record_diagnosis_date_button()
 
-    # SubjectScreeningSummaryPage(page).verify_latest_event_status_value(
-    #     "A318 - Post-investigation Appointment NOT Required - Result Letter Created"
-    # )
+    # The following code is on the record diagnosis date page
+    RecordDiagnosisDatePage(page).enter_date_in_diagnosis_date_field(datetime.today())
+    RecordDiagnosisDatePage(page).click_save_button()
+
+    SubjectScreeningSummaryPage(page).verify_latest_event_status_value(
+        "A318 - Post-investigation Appointment NOT Required - Result Letter Created"
+    )
+
+    # This needs to be repeated for two subjects, one old and one not - LNPCP Result
+    # Older patient
+    nhs_no = "9764755232"
+    go_to_investigation_datasets_page(page, nhs_no)
+
+    # The following code is on the investigation datasets page
+    default_investigation_dataset_forms(page)
+    InvestigationDatasetsPage(page).select_theraputic_procedure_type()
+    default_investigation_dataset_forms_continuation(page)
+    investigation_datasets_failure_reason(page)
+    polyps_for_lnpcp_result(page)
+    save_investigation_dataset(page)
+    after_lnpcp_result(page)
+
+    handover_subject_to_symptomatic_care(page)
+
+    # Younger patient
+    nhs_no = "9680451623"
+    go_to_investigation_datasets_page(page, nhs_no)
+
+    # The following code is on the investigation datasets page
+    default_investigation_dataset_forms(page)
+    InvestigationDatasetsPage(page).select_theraputic_procedure_type()
+    default_investigation_dataset_forms_continuation(page)
+    investigation_datasets_failure_reason(page)
+    polyps_for_lnpcp_result(page)
+    save_investigation_dataset(page)
+    after_lnpcp_result(page)
+    SubjectScreeningSummaryPage(page).verify_latest_event_status_value(
+        "A318 - Post-investigation Appointment NOT Required - Result Letter Created"
+    )
+    SubjectScreeningSummaryPage(page).click_advance_fobt_screening_episode_button()
+
+    # The following code is on the advance fobt screening episode page
+    AdvanceFOBTScreeningEpisodePage(page).click_record_diagnosis_date_button()
+
+    # The following code is on the record diagnosis date page
+    RecordDiagnosisDatePage(page).enter_date_in_diagnosis_date_field(datetime.today())
+    RecordDiagnosisDatePage(page).click_save_button()
+
+    SubjectScreeningSummaryPage(page).verify_latest_event_status_value(
+        "A318 - Post-investigation Appointment NOT Required - Result Letter Created"
+    )
 
     # This needs to be repeated for 1 subject, age does not matter - Normal Result
     nhs_no_normal = "9823638365"