PRMDR-803 + 770 update BSOL download journey

app/cypress/e2e/0-ndr-core-tests/gp_user_workflows/download_lloyd_george_workflow.cy.js

@@ -5,6 +5,32 @@ import { formatNhsNumber } from '../../../../src/helpers/utils/formatNhsNumber';
 
 const baseUrl = Cypress.config('baseUrl');
 const searchPatientUrl = '/search/patient';
+const downloadPageTitle =
+    'Download the Lloyd George record for this patient - Digital Lloyd George records';
+const downloadingPageTitle = 'Downloading documents - Digital Lloyd George records';
+const downloadCompletePageTitle = 'Download complete - Digital Lloyd George records';
+const verifyPatientPageTitle = 'Verify patient details - Digital Lloyd George records';
+const lloydGeorgeRecordPageTitle = 'Available records - Digital Lloyd George records';
+const testFiles = [
+    {
+        fileName: '1of2_testy_test.pdf',
+        created: '2024-05-07T14:52:00.827602Z',
+        virusScannerResult: 'Clean',
+        id: 'test-id',
+    },
+    {
+        fileName: '2of2_testy_test.pdf',
+        created: '2024-05-07T14:52:00.827602Z',
+        virusScannerResult: 'Clean',
+        id: 'test-id-2',
+    },
+    {
+        fileName: '1of1_lone_test_file.pdf',
+        created: '2024-01-01T14:52:00.827602Z',
+        virusScannerResult: 'Clean',
+        id: 'test-id-3',
+    },
+];
 
 describe('GP Workflow: View Lloyd George record', () => {
     const beforeEachConfiguration = (role) => {
@@ -21,9 +47,31 @@ describe('GP Workflow: View Lloyd George record', () => {
         cy.wait('@search');
     };
 
+    const proceedToDownloadSelectionPage = () => {
+        cy.intercept('GET', '/LloydGeorgeStitch*', {
+            statusCode: 200,
+            body: viewLloydGeorgePayload,
+        }).as('lloydGeorgeStitch');
+
+        cy.get('#verify-submit').click();
+        cy.wait('@lloydGeorgeStitch');
+
+        cy.intercept('GET', '/DocumentManifest*', {
+            statusCode: 200,
+            body: baseUrl + '/browserconfig.xml', // uses public served file in place of a ZIP file
+        }).as('documentManifest');
+
+        cy.intercept('GET', '/SearchDocumentReferences*', {
+            statusCode: 200,
+            body: testFiles,
+        }).as('searchDocumentReferences');
+
+        cy.getByTestId('download-all-files-link').click();
+    };
+
     context('Download Lloyd George document', () => {
         it(
-            'GP ADMIN user can download the Lloyd George document of an active patient',
+            'GP ADMIN user can download the entire Lloyd George document of an active patient',
             { tags: 'regression' },
             () => {
                 beforeEachConfiguration(Roles.GP_ADMIN);
@@ -32,44 +80,99 @@ describe('GP Workflow: View Lloyd George record', () => {
                     statusCode: 200,
                     body: viewLloydGeorgePayload,
                 }).as('lloydGeorgeStitch');
-                cy.title().should('eq', 'Verify patient details - Digital Lloyd George records');
+                cy.title().should('eq', verifyPatientPageTitle);
 
                 cy.get('#verify-submit').click();
                 cy.wait('@lloydGeorgeStitch');
-                cy.title().should('eq', 'Available records - Digital Lloyd George records');
+                cy.title().should('eq', lloydGeorgeRecordPageTitle);
 
                 cy.intercept('GET', '/DocumentManifest*', {
                     statusCode: 200,
                     body: baseUrl + '/browserconfig.xml', // uses public served file in place of a ZIP file
                 }).as('documentManifest');
 
+                cy.intercept('GET', '/SearchDocumentReferences*', {
+                    statusCode: 200,
+                    body: testFiles,
+                }).as('searchDocumentReferences');
+
                 cy.getByTestId('download-all-files-link').should('exist');
                 cy.getByTestId('download-all-files-link').click();
-                cy.title().should('eq', 'Downloading documents - Digital Lloyd George records');
 
-                cy.wait('@documentManifest');
+                // Select documents page
+                cy.title().should('eq', downloadPageTitle);
+                cy.wait('@searchDocumentReferences');
+
+                cy.getByTestId('patient-summary').should('exist');
+
+                cy.getByTestId('available-files-table-title').should('exist');
+                cy.getByTestId('download-selected-files-btn').should('exist');
+                cy.getByTestId('download-all-files-btn').should('exist');
+
+                cy.getByTestId('start-again-link').should('exist');
+                cy.getByTestId('download-all-files-btn').click();
+
+                cy.title().should('eq', downloadingPageTitle);
 
                 // Assert contents of page when downloading
-                cy.contains('Downloading documents').should('be.visible');
-                cy.contains(
-                    `Preparing download for ${viewLloydGeorgePayload.number_of_files} files`,
-                ).should('be.visible');
-                cy.contains('Compressing record into a zip file').should('be.visible');
-                cy.contains('Cancel').should('be.visible');
+                cy.getByTestId('lloyd-george-download-header').should('exist');
+                cy.getByTestId('lloyd-george-download-card-content').should('exist');
+                cy.getByTestId('cancel-download-link').should('exist');
 
                 // Assert contents of page after download
-                cy.title().should('eq', 'Download complete - Digital Lloyd George records');
-
-                cy.contains('Download complete').should('be.visible');
-                cy.contains('You have successfully downloaded the Lloyd George record of:').should(
-                    'be.visible',
-                );
+                cy.title().should('eq', downloadCompletePageTitle);
+                cy.getByTestId('downloaded-record-card-header').should('exist');
                 cy.contains(
                     `${searchPatientPayload.givenName} ${searchPatientPayload.familyName}`,
                 ).should('be.visible');
+                cy.contains(formatNhsNumber(searchPatientPayload.nhsNumber)).should('be.visible');
+
+                // Assert file has been downloaded
+                cy.readFile(`${Cypress.config('downloadsFolder')}/browserconfig.xml`);
+
+                cy.getByTestId('return-btn').click();
+
+                // Assert return button returns to pdf view
+                cy.getByTestId('pdf-card').should('be.visible');
+            },
+        );
+
+        it(
+            'GP ADMIN user can selectively download a portion of Lloyd George document of an active patient',
+            { tags: 'regression' },
+            () => {
+                beforeEachConfiguration(Roles.GP_ADMIN);
+                proceedToDownloadSelectionPage();
+
+                // Select documents page
+                cy.title().should('eq', downloadPageTitle);
+                cy.wait('@searchDocumentReferences');
+
+                cy.getByTestId('download-selected-files-btn').should('exist');
+                cy.getByTestId('download-all-files-btn').should('exist');
+
+                cy.getByTestId('checkbox-0').should('exist');
+                cy.getByTestId('checkbox-1').should('exist');
+                cy.getByTestId('checkbox-2').should('exist');
+
+                cy.getByTestId('checkbox-0').click();
+                cy.getByTestId('checkbox-1').click();
+
+                cy.getByTestId('download-selected-files-btn').click();
+
+                // Assert contents of page when downloading
+                cy.title().should('eq', downloadingPageTitle);
+                cy.getByTestId('lloyd-george-download-header').should('exist');
+                cy.getByTestId('lloyd-george-download-card-content').should('exist');
+                cy.getByTestId('cancel-download-link').should('exist');
+
+                // Assert contents of page after download
+                cy.title().should('eq', downloadCompletePageTitle);
+                cy.getByTestId('downloaded-files-card-header').should('exist');
                 cy.contains(
-                    `NHS number: ${formatNhsNumber(searchPatientPayload.nhsNumber)}`,
+                    `${searchPatientPayload.givenName} ${searchPatientPayload.familyName}`,
                 ).should('be.visible');
+                cy.contains(formatNhsNumber(searchPatientPayload.nhsNumber)).should('be.visible');
 
                 // Assert file has been downloaded
                 cy.readFile(`${Cypress.config('downloadsFolder')}/browserconfig.xml`);
@@ -81,6 +184,29 @@ describe('GP Workflow: View Lloyd George record', () => {
             },
         );
 
+        it(
+            'should display an alert if user click "Download selected files" without selecting anything',
+            { tags: 'regression' },
+            () => {
+                beforeEachConfiguration(Roles.GP_ADMIN);
+                proceedToDownloadSelectionPage();
+
+                // Select documents page
+                cy.title().should('eq', downloadPageTitle);
+                cy.wait('@searchDocumentReferences');
+
+                cy.getByTestId('download-selected-files-btn').should('exist');
+                cy.getByTestId('download-selected-files-btn').click();
+
+                cy.title().should('not.equal', downloadingPageTitle);
+                cy.title().should('equal', downloadPageTitle);
+
+                cy.get('#error-box-summary').should('be.visible');
+                cy.get('.nhsuk-error-summary__body').should('be.visible');
+                cy.getByTestId('download-selection-error-box').should('exist');
+            },
+        );
+
         it(
             'No download option when no Lloyd George record exists for a patient as a GP ADMIN role',
             { tags: 'regression' },

app/cypress/e2e/0-ndr-core-tests/gp_user_workflows/view_lloyd_george_not_bsol_workflow.cy.js

@@ -261,7 +261,7 @@ describe('GP Workflow: View Lloyd George record', () => {
                     // Assert contents of page when downloading
                     cy.contains('Downloading documents').should('be.visible');
                     cy.contains(
-                        `Preparing download for ${viewLloydGeorgePayload.number_of_files} files`,
+                        `Preparing download for ${viewLloydGeorgePayload.number_of_files} file(s)`,
                     ).should('be.visible');
                     cy.contains('Compressing record into a zip file').should('be.visible');
                     cy.contains('Cancel').should('be.visible');
@@ -281,7 +281,7 @@ describe('GP Workflow: View Lloyd George record', () => {
                     // Assert file has been downloaded
                     cy.readFile(`${Cypress.config('downloadsFolder')}/browserconfig.xml`);
 
-                    cy.getByTestId('return-btn').should('not.exist');
+                    cy.getByTestId('return-btn').should('exist');
                     cy.contains('This record has been removed from our storage.').should(
                         'be.visible',
                     );

app/src/components/blocks/_arf/uploadSummary/UploadSummary.test.tsx

@@ -37,7 +37,7 @@ describe('UploadSummary', () => {
                 name: /All documents have been successfully uploaded on/,
             }),
         ).toBeInTheDocument();
-        expect(screen.getByText('NHS Number')).toBeInTheDocument();
+        expect(screen.getByText('NHS number')).toBeInTheDocument();
         expect(screen.getByText('Surname')).toBeInTheDocument();
         expect(screen.getByText('First name')).toBeInTheDocument();
         expect(screen.getByText('Date of birth')).toBeInTheDocument();