Fix session reset tests

nhsconnect · May 16, 2024 · 959480a · 959480a
1 parent d7807a6
commit 959480a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/app/cypress/e2e/0-ndr-core-tests/gp_user_workflows/view_lloyd_george_is_bsol_workflow.cy.js b/app/cypress/e2e/0-ndr-core-tests/gp_user_workflows/view_lloyd_george_is_bsol_workflow.cy.js
@@ -226,7 +226,7 @@ describe('GP Workflow: View Lloyd George record', () => {
                 cy.getByTestId('delete-all-files-link').click();
 
                 // assert delete confirmation page is as expected
-                cy.contains('Are you sure you want to permanently remove this record?:').should(
+                cy.contains('Are you sure you want to permanently remove this record?').should(
                     'be.visible',
                 );
                 cy.contains('GivenName Surname').should('be.visible');
@@ -282,8 +282,7 @@ describe('GP Workflow: View Lloyd George record', () => {
                 cy.getByTestId('delete-all-files-link').should('exist');
                 cy.getByTestId('delete-all-files-link').click();
                 // cancel delete
-                cy.getByTestId('no-radio-btn').click();
-                cy.getByTestId('delete-submit-btn').click();
+                cy.getByTestId('start-again-btn').click();
 
                 // assert user is returned to view Lloyd George page
                 cy.contains('Lloyd George record').should('be.visible');
@@ -318,8 +317,6 @@ describe('GP Workflow: View Lloyd George record', () => {
                     },
                 ).as('documentDelete');
 
-                cy.getByTestId('remove-btn').click();
-
                 cy.wait('@documentDelete');
 
                 // assert

diff --git a/app/cypress/e2e/0-ndr-core-tests/pcse_user_workflows/download_patient_files_workflow.cy.js b/app/cypress/e2e/0-ndr-core-tests/pcse_user_workflows/download_patient_files_workflow.cy.js
@@ -279,9 +279,7 @@ describe('PCSE Workflow: Access and download found files', () => {
             () => {
                 cy.getByTestId('delete-all-documents-btn').click();
 
-                // cancel delete
-                cy.getByTestId('no-radio-btn').click();
-                cy.getByTestId('delete-submit-btn').click();
+                cy.getByTestId('start-again-btn').click();
 
                 // assert user is returned to download documents page
                 cy.contains('Download electronic health records and attachments').should(

diff --git a/app/src/components/blocks/_delete/removeRecordStage/RemoveRecordStage.tsx b/app/src/components/blocks/_delete/removeRecordStage/RemoveRecordStage.tsx
@@ -162,6 +162,7 @@ function RemoveRecordStage({ setStage, recordType }: Props) {
                     )}
                     <LinkButton
                         id="start-again-link"
+                        data-testid="start-again-btn"
                         type="button"
                         className="mb-7 ml-3"
                         onClick={() => {