Merge pull request #1571 from ministryofjustice/MLPAB-2568-split-id-a…

…nd-sign MLPAB-2568 Split confirm identity and sign tasks
ministryofjustice · Oct 29, 2024 · fb62008 · fb62008
2 parents d1713f7 + 4f97bcd
commit fb62008
Show file tree

Hide file tree

Showing 51 changed files with 754 additions and 773 deletions.
diff --git a/cmd/event-received/sirius_event_handler.go b/cmd/event-received/sirius_event_handler.go
@@ -123,7 +123,7 @@ func handleFeeApproved(
 	if donor.FeeAmount() == 0 {
 		donor.Tasks.PayForLpa = task.PaymentStateCompleted
 
-		if donor.Tasks.ConfirmYourIdentityAndSign.IsCompleted() {
+		if donor.Tasks.SignTheLpa.IsCompleted() {
 			if err := lpaStoreClient.SendLpa(ctx, donor); err != nil {
 				return fmt.Errorf("failed to send to lpastore: %w", err)
 			}

diff --git a/cmd/event-received/sirius_event_handler_test.go b/cmd/event-received/sirius_event_handler_test.go
@@ -130,7 +130,7 @@ func TestHandleFeeApproved(t *testing.T) {
 		PK:      dynamo.LpaKey("123"),
 		SK:      dynamo.LpaOwnerKey(dynamo.DonorKey("456")),
 		FeeType: pay.NoFee,
-		Tasks:   donordata.Tasks{PayForLpa: task.PaymentStatePending, ConfirmYourIdentityAndSign: task.IdentityStateCompleted},
+		Tasks:   donordata.Tasks{PayForLpa: task.PaymentStatePending, SignTheLpa: task.StateCompleted},
 	}
 
 	completedDonorProvided := donorProvided
@@ -216,7 +216,7 @@ func TestHandleFeeApprovedWhenNotPaid(t *testing.T) {
 		PK:      dynamo.LpaKey("123"),
 		SK:      dynamo.LpaOwnerKey(dynamo.DonorKey("456")),
 		FeeType: pay.HalfFee,
-		Tasks:   donordata.Tasks{PayForLpa: task.PaymentStatePending, ConfirmYourIdentityAndSign: task.IdentityStateCompleted},
+		Tasks:   donordata.Tasks{PayForLpa: task.PaymentStatePending, SignTheLpa: task.StateCompleted},
 	}
 
 	completedDonorProvided := donorProvided
@@ -407,7 +407,7 @@ func TestHandleFeeApprovedWhenShareCodeSenderError(t *testing.T) {
 				PK:      dynamo.LpaKey("123"),
 				SK:      dynamo.LpaOwnerKey(dynamo.DonorKey("456")),
 				FeeType: pay.NoFee,
-				Tasks:   donordata.Tasks{PayForLpa: task.PaymentStatePending, ConfirmYourIdentityAndSign: task.IdentityStateCompleted},
+				Tasks:   donordata.Tasks{PayForLpa: task.PaymentStatePending, SignTheLpa: task.StateCompleted},
 			})
 			attributevalue.Unmarshal(b, v)
 			return nil
@@ -453,7 +453,7 @@ func TestHandleFeeApprovedWhenEventClientError(t *testing.T) {
 				PK:      dynamo.LpaKey("123"),
 				SK:      dynamo.LpaOwnerKey(dynamo.DonorKey("456")),
 				FeeType: pay.NoFee,
-				Tasks:   donordata.Tasks{PayForLpa: task.PaymentStatePending, ConfirmYourIdentityAndSign: task.IdentityStateCompleted},
+				Tasks:   donordata.Tasks{PayForLpa: task.PaymentStatePending, SignTheLpa: task.StateCompleted},
 			})
 			attributevalue.Unmarshal(b, v)
 			return nil
@@ -494,7 +494,7 @@ func TestHandleFeeApprovedWhenLpaStoreError(t *testing.T) {
 				PK:      dynamo.LpaKey("123"),
 				SK:      dynamo.LpaOwnerKey(dynamo.DonorKey("456")),
 				FeeType: pay.NoFee,
-				Tasks:   donordata.Tasks{PayForLpa: task.PaymentStatePending, ConfirmYourIdentityAndSign: task.IdentityStateCompleted},
+				Tasks:   donordata.Tasks{PayForLpa: task.PaymentStatePending, SignTheLpa: task.StateCompleted},
 			})
 			attributevalue.Unmarshal(b, v)
 			return nil

diff --git a/cypress/e2e/certificate-provider/confirm-your-identity.cy.js b/cypress/e2e/certificate-provider/confirm-your-identity.cy.js
@@ -7,7 +7,7 @@ describe('confirm your identity', () => {
 
         cy.contains('li', 'Confirm your identity').should('contain', 'Not started').click();
 
-        cy.url().should('contain', '/prove-your-identity');
+        cy.url().should('contain', '/confirm-your-identity');
         cy.checkA11yApp();
 
         cy.contains('a', 'Continue').click()

diff --git a/cypress/e2e/donor/check-your-details.cy.js b/cypress/e2e/donor/check-your-details.cy.js
@@ -1,28 +1,28 @@
 describe('Check your details', () => {
-  it('shows my details', () => {
-    cy.visit('/fixtures?redirect=/check-your-details&progress=confirmYourIdentity&idStatus=donor:insufficient-evidence&voucher=1');
+    it('shows my details', () => {
+        cy.visit('/fixtures?redirect=/check-your-details&progress=confirmYourIdentity&idStatus=donor:insufficient-evidence&voucher=1');
 
-    cy.checkA11yApp();
-    cy.contains('Sam Smith');
-    cy.contains('2 January 2000');
-    cy.contains('1 RICHMOND PLACE');
-    cy.contains('button', 'Continue').click();
+        cy.checkA11yApp();
+        cy.contains('Sam Smith');
+        cy.contains('2 January 2000');
+        cy.contains('1 RICHMOND PLACE');
+        cy.contains('button', 'Continue').click();
 
-    cy.url().should('contain', '/we-have-contacted-voucher');
-    cy.checkA11yApp();
+        cy.url().should('contain', '/we-have-contacted-voucher');
+        cy.checkA11yApp();
 
-    cy.contains('a', 'Continue').click();
+        cy.contains('a', 'Return to task list').click();
 
-    cy.url().should('contain', '/read-your-lpa');
-    cy.checkA11yApp();
-  });
+        cy.url().should('contain', '/task-list');
+        cy.checkA11yApp();
+    });
 
-  it('tells me about a pending payment', () => {
-    cy.visit('/fixtures?redirect=/check-your-details&progress=payForTheLpa&feeType=NoFee&paymentTaskProgress=Pending');
-    cy.contains('button', 'Continue').click();
+    it('tells me about a pending payment', () => {
+        cy.visit('/fixtures?redirect=/check-your-details&progress=payForTheLpa&feeType=NoFee&paymentTaskProgress=Pending');
+        cy.contains('button', 'Continue').click();
 
-    cy.url().should('contain', '/we-have-received-voucher-details');
-    cy.checkA11yApp();
-    cy.contains('no fee (exemption)');
-  });
+        cy.url().should('contain', '/we-have-received-voucher-details');
+        cy.checkA11yApp();
+        cy.contains('no fee (exemption)');
+    });
 });