Merge pull request #520 from NHSDigital/fix-remove-from-cohort-test

Change readd to cohort test to archive/unarchive test

Author: jf-x-dev

mavis/test/pages/children.py

@@ -35,8 +35,8 @@ def __init__(self, page: Page, test_data: TestData):
         self.change_nhs_no_link = self.page.get_by_role(
             "link", name="Change   NHS number"
         )
-        self.remove_from_cohort_button = self.page.get_by_role(
-            "button", name="Remove from cohort"
+        self.archive_child_record_link = self.page.get_by_role(
+            "link", name="Archive child record"
         )
         self.continue_button = self.page.get_by_role("button", name="Continue")
 
@@ -48,6 +48,12 @@ def __init__(self, page: Page, test_data: TestData):
         self.manually_matched_card = self.page.get_by_text(
             "Consent response manually matched with child record"
         )
+        self.imported_in_error_radio = self.page.get_by_role(
+            "radio", name="It was imported in error"
+        )
+        self.archive_record_button = self.page.get_by_role(
+            "button", name="Archive record"
+        )
 
     def verify_headers(self):
         expect(self.children_heading).to_be_visible()
@@ -128,9 +134,9 @@ def click_edit_child_record(self) -> None:
     def click_continue(self) -> None:
         self.continue_button.click()
 
-    @step("Click on Remove from cohort")
-    def click_remove_from_cohort(self) -> None:
-        self.remove_from_cohort_button.click()
+    @step("Click on Archive child record")
+    def click_archive_child_record(self) -> None:
+        self.archive_child_record_link.click()
 
     @step("Fill NHS number {2} for child {1}")
     def fill_nhs_no_for_child(self, child: Child, nhs_no: str) -> None:
@@ -165,8 +171,24 @@ def verify_activity_log_for_created_or_matched_child(
         # FIXME: Update this text when MAVIS-1896/MAV-253 is closed
         self.check_log_updates_with_match()
 
-    def remove_child_from_cohort(self, child: Child):
+    def archive_child_record(self, child: Child):
         self.search_for_a_child_name(str(child))
         self.click_record_for_child(child)
-        self.click_remove_from_cohort()
-        self.expect_text_in_main(f"{str(child)} removed from cohort")
+        self.click_archive_child_record()
+        self.click_imported_in_error()
+        self.click_archive_record()
+        expect(self.page.get_by_role("alert")).to_contain_text(
+            "This record has been archived"
+        )
+        expect(self.page.get_by_text("Archive reason")).to_be_visible()
+
+    @step("Click on Imported in error")
+    def click_imported_in_error(self):
+        self.imported_in_error_radio.check()
+
+    @step("Click on Archive record")
+    def click_archive_record(self):
+        self.archive_record_button.click()
+
+    def check_child_is_unarchived(self):
+        expect(self.archive_child_record_link).to_be_visible()

tests/test_programmes.py

@@ -139,58 +139,33 @@ def test_cohorts_empty_file(setup_cohort_upload, import_records_page):
 @issue("MAV-909")
 @pytest.mark.cohorts
 @pytest.mark.bug
-def test_cohorts_readd_to_cohort(
+def test_cohorts_archive_and_unarchive(
     setup_cohort_upload,
     programmes_page,
     dashboard_page,
     children_page,
     import_records_page,
-    test_data,
     children,
 ):
-    """
-    Steps to reproduce:
-    Find a patient in Year 8 and remove them from cohort using the button
-    Upload a cohort list with their first name, surname, URN, date of birth and postcode
-
-    Scenario 1
-        Duplicate review is not flagged
-
-        Expected result:
-        The child is added back into the cohort, and in all the relevant sessions
-        Actual Result:
-        Server error page and user cannot bring the child back into the cohort
-
-    Scenario 2
-        The import screen flags for duplicate review, and user clicks "Review" next to the child's name
-
-        Expected result:
-        System allows you to review the new details against the previous record (before removing from cohort) and lets you choose which record to keep. Once review confirmed, the child is added back into the cohort, and in all the relevant sessions.
-        Actual Result:
-        Server error page and user cannot bring the child back into the cohort
-    """
     child = children[Programme.HPV][0]
 
-    input_file_path, _ = import_records_page.upload_and_verify_output(
-        CohortsFileMapping.FIXED_CHILD
-    )
+    import_records_page.upload_and_verify_output(CohortsFileMapping.FIXED_CHILD)
 
     dashboard_page.click_mavis()
     dashboard_page.click_children()
-    children_page.remove_child_from_cohort(child)
+    children_page.archive_child_record(child)
+
     dashboard_page.click_mavis()
     dashboard_page.click_programmes()
     programmes_page.navigate_to_cohort_import(Programme.HPV)
 
-    test_data.increment_date_of_birth_for_records(input_file_path)
-    import_records_page.set_input_file(input_file_path)
-    import_records_page.click_continue()
+    import_records_page.upload_and_verify_output(CohortsFileMapping.FIXED_CHILD)
 
-    programmes_page.expect_text("1 duplicate record needs review")
-    programmes_page.click_review()
-    programmes_page.click_use_duplicate()
-    programmes_page.click_resolve_duplicate()
-    programmes_page.expect_text("Record updated")
+    dashboard_page.click_mavis()
+    dashboard_page.click_children()
+    children_page.search_for_a_child_name(str(child))
+    children_page.click_record_for_child(child)
+    children_page.check_child_is_unarchived()
 
 
 @pytest.mark.rav