Add e2e tests for edit action

e2e/helpers.ts

@@ -591,7 +591,13 @@ export async function switchEventTab(page: Page, tab: 'Audit' | 'Record') {
 /** Assert whether a button on the action menu exists and is enabled/disabled */
 export async function validateActionMenuButton(
   page: Page,
-  action: 'Declare' | 'Notify' | 'Approve declaration' | 'Register',
+  action:
+    | 'Declare'
+    | 'Notify'
+    | 'Approve declaration'
+    | 'Register'
+    | 'Declare with edits'
+    | 'Register with edits',
   isEnabled = true
 ) {
   await page.getByRole('button', { name: 'Action', exact: true }).click()
@@ -616,14 +622,22 @@ export async function selectDeclarationAction(
     | 'Register'
     | 'Reject'
     | 'Delete declaration'
-    | 'Save & Exit',
+    | 'Save & Exit'
+    | 'Declare with edits'
+    | 'Register with edits',
   confirm = true
 ) {
   await page.getByRole('button', { name: 'Action', exact: true }).click()
   await page.getByText(action, { exact: true }).click()
 
   if (confirm) {
-    await page.getByRole('button', { name: action, exact: true }).click()
+    const confirmBtn = page.getByRole('button', { name: 'Confirm' })
+
+    if ((await confirmBtn.count()) > 0) {
+      await confirmBtn.click()
+    } else {
+      await page.getByRole('button', { name: action, exact: true }).click()
+    }
   }
 }
 

e2e/testcases/action-menu/action-menu-options.spec.ts

@@ -4,6 +4,7 @@ import { login, getToken } from '../../helpers'
 import { CREDENTIALS } from '../../constants'
 import { createDeclaration, Declaration } from '../test-data/birth-declaration'
 import { ActionType } from '@opencrvs/toolkit/events'
+import { selectAction } from '../../utils'
 
 async function getActionMenuOptions(page: Page, declaration: Declaration) {
   const childName = `${declaration['child.name'].firstname} ${declaration['child.name'].surname}`
@@ -32,8 +33,8 @@ test.describe('Action menu options', () => {
 
     test.beforeAll(async () => {
       const token = await getToken(
-        CREDENTIALS.LOCAL_REGISTRAR.USERNAME,
-        CREDENTIALS.LOCAL_REGISTRAR.PASSWORD
+        CREDENTIALS.FIELD_AGENT.USERNAME,
+        CREDENTIALS.FIELD_AGENT.PASSWORD
       )
       const res = await createDeclaration(token, undefined, ActionType.DECLARE)
       declaration = res.declaration
@@ -43,8 +44,20 @@ test.describe('Action menu options', () => {
       await login(page, CREDENTIALS.REGISTRATION_AGENT)
       await page.getByRole('button', { name: 'Ready for review' }).click()
       const options = await getActionMenuOptions(page, declaration)
-      expect(options).toStrictEqual(['Assign', 'Validate', 'Archive', 'Reject'])
-      expect(options).toStrictEqual(['Assign', 'Validate', 'Archive', 'Reject'])
+      expect(options).toStrictEqual([
+        'Assign',
+        'Validate',
+        'Archive',
+        'Reject',
+        'Edit'
+      ])
+      expect(options).toStrictEqual([
+        'Assign',
+        'Validate',
+        'Archive',
+        'Reject',
+        'Edit'
+      ])
     })
 
     test('Local Registrar', async () => {
@@ -56,20 +69,21 @@ test.describe('Action menu options', () => {
         'Register',
         'Archive',
         'Reject',
+        'Edit',
         'Escalate'
       ])
     })
   })
 
-  test.describe('Event status: VALIDATED', async () => {
+  test.describe('Declared and validated', async () => {
     let declaration: Declaration
 
     test.beforeAll(async () => {
       const token = await getToken(
         CREDENTIALS.LOCAL_REGISTRAR.USERNAME,
         CREDENTIALS.LOCAL_REGISTRAR.PASSWORD
       )
-      const res = await createDeclaration(token, undefined, ActionType.VALIDATE)
+      const res = await createDeclaration(token, undefined, ActionType.DECLARE)
       declaration = res.declaration
     })
 
@@ -78,10 +92,11 @@ test.describe('Action menu options', () => {
       await page.getByRole('button', { name: 'Ready for review' }).click()
       const options = await getActionMenuOptions(page, declaration)
       expect(options).toStrictEqual([
-        'Unassign',
+        'Assign',
         'Register',
         'Archive',
         'Reject',
+        'Edit',
         'Escalate'
       ])
     })

e2e/testcases/application/4a-validate-require-update-FA.spec.ts

@@ -98,9 +98,15 @@ test.describe
 
     const row = getRowByTitle(page, formatV2ChildName(declaration))
 
-    await row.getByRole('button', { name: 'Review' }).click()
+    await row.getByRole('button', { name: 'Edit' }).click()
 
-    await selectDeclarationAction(page, 'Declare')
+    await page.getByTestId('change-button-child.name').click()
+    await page
+      .getByTestId('text__surname')
+      .fill(faker.person.lastName('female'))
+    await page.getByRole('button', { name: 'Back to review' }).click()
+
+    await selectDeclarationAction(page, 'Declare with edits')
 
     // Should redirect back to requires update workqueue
     await expect(page.locator('#content-name')).toHaveText('Requires updates')

e2e/testcases/application/4b-validate-require-update-RA.spec.ts

@@ -25,7 +25,7 @@ test.describe
       CREDENTIALS.REGISTRATION_AGENT.USERNAME,
       CREDENTIALS.REGISTRATION_AGENT.PASSWORD
     )
-    const res = await createDeclaration(token, undefined, ActionType.VALIDATE)
+    const res = await createDeclaration(token, undefined, ActionType.DECLARE)
     declaration = res.declaration
     eventId = res.eventId
 
@@ -101,13 +101,17 @@ test.describe
     )
   })
 
-  test('4.4 Click Review -action', async () => {
+  test('4.4 Click Edit -action', async () => {
     await ensureAssigned(page)
-    await selectAction(page, 'Review')
+    await selectAction(page, 'Edit')
   })
 
-  test('4.5 Complete validate action', async () => {
-    await selectDeclarationAction(page, 'Validate')
+  test('4.5 Complete declare with edits action', async () => {
+    await page.getByTestId('change-button-child.weightAtBirth').click()
+    await page.getByTestId('number__child____weightAtBirth').fill('2.6')
+    await page.getByRole('button', { name: 'Back to review' }).click()
+
+    await selectDeclarationAction(page, 'Declare with edits')
 
     // Should redirect back to requires update workqueue
     await expect(page.locator('#content-name')).toHaveText('Requires updates')

e2e/testcases/application/6-validate-ready-to-print.spec.ts

@@ -4,7 +4,7 @@ import { login, getToken } from '../../helpers'
 import { CREDENTIALS, SAFE_WORKQUEUE_TIMEOUT_MS } from '../../constants'
 import { createDeclaration, Declaration } from '../test-data/birth-declaration'
 import { formatV2ChildName } from '../birth/helpers'
-import { ensureAssigned, expectInUrl, selectAction } from '../../utils'
+import { expectInUrl, selectAction } from '../../utils'
 
 test.describe.serial('6 Validate Ready to print tab', () => {
   let page: Page

e2e/testcases/application/7-validate-sent-for-approval.spec.ts

@@ -18,7 +18,7 @@ test.describe.serial('7 Validate Sent for approval tab', () => {
       CREDENTIALS.REGISTRATION_AGENT.USERNAME,
       CREDENTIALS.REGISTRATION_AGENT.PASSWORD
     )
-    const res = await createDeclaration(token, undefined, ActionType.VALIDATE)
+    const res = await createDeclaration(token, undefined, ActionType.DECLARE)
     declaration = res.declaration
     eventId = res.eventId
 

e2e/testcases/application/workqueue-flow-1.spec.ts

@@ -20,7 +20,6 @@ import { assertRecordInWorkqueue, fillDate } from '../birth/helpers'
 import { getRowByTitle } from '../print-certificate/birth/helpers'
 
 // FA Notifies => RA Validates => LR Registers => LR Prints
-
 test.describe.serial('1. Workqueue flow - 1', () => {
   let page: Page
   const declaration = {
@@ -148,7 +147,7 @@ test.describe.serial('1. Workqueue flow - 1', () => {
     })
   })
 
-  test.describe('1.2 Validate by RA', async () => {
+  test.describe('1.2 Declare and validate by RA', async () => {
     test('1.2.1 Verify workqueue', async () => {
       await login(page, CREDENTIALS.REGISTRATION_AGENT)
 
@@ -262,8 +261,8 @@ test.describe.serial('1. Workqueue flow - 1', () => {
       await page.getByRole('button', { name: 'Back to review' }).click()
     })
 
-    test('1.2.6 Validate', async () => {
-      await selectDeclarationAction(page, 'Validate')
+    test('1.2.6 Declare', async () => {
+      await selectDeclarationAction(page, 'Declare')
 
       await ensureOutboxIsEmpty(page)
 

e2e/testcases/application/workqueue-flow-3.spec.ts

@@ -217,14 +217,16 @@ test.describe.serial('3. Workqueue flow - 3', () => {
         })
         .click()
 
+      await expect(page.getByText('Rejected')).toBeVisible()
+
       await ensureAssigned(page)
-      await selectAction(page, 'Review')
       await page.getByRole('button', { name: 'Action' }).click()
-      await expect(page.getByText('Reject')).not.toBeVisible()
+      await expect(page.getByText('Reject', { exact: true })).not.toBeVisible()
+      await expect(page.getByText('Review', { exact: true })).not.toBeVisible()
+      await page.getByRole('button', { name: 'Action' }).click()
     })
 
     test('3.2.4 Unassign', async () => {
-      await page.goBack()
       await selectAction(page, 'Unassign')
       await page.getByRole('button', { name: 'Unassign', exact: true }).click()
       await expect(page.getByText('Not assigned')).toBeVisible()
@@ -245,11 +247,11 @@ test.describe.serial('3. Workqueue flow - 3', () => {
         ]
       })
     })
-    test('3.3.2 Go to review', async () => {
+    test('3.3.2 Go to edit', async () => {
       await assignFromWorkqueue(page, childName)
 
       await getRowByTitle(page, childName)
-        .getByRole('button', { name: 'Review' })
+        .getByRole('button', { name: 'Edit' })
         .click()
     })
 
@@ -259,8 +261,6 @@ test.describe.serial('3. Workqueue flow - 3', () => {
         .getByRole('button', { name: 'Change all' })
         .click()
 
-      await page.getByRole('button', { name: 'Continue' }).click()
-
       await page.locator('#informant____relation').click()
       await page
         .getByText(declaration.informantType, {
@@ -336,12 +336,19 @@ test.describe.serial('3. Workqueue flow - 3', () => {
       await page.locator('#father____addressSameAs_YES').click()
     })
 
-    test('3.3.6 Declare', async () => {
+    test('3.3.6 Fill up informant comment & signature', async () => {
       await continueForm(page, 'Back to review')
-      await expect(page.getByRole('dialog')).not.toBeVisible()
-
-      await selectDeclarationAction(page, 'Declare')
+      await page.locator('#review____comment').fill(faker.lorem.sentence())
+      await page.getByRole('button', { name: 'Sign', exact: true }).click()
+      await drawSignature(page, 'review____signature_canvas_element', false)
+      await page
+        .locator('#review____signature_modal')
+        .getByRole('button', { name: 'Apply' })
+        .click()
+    })
 
+    test('3.3.6 Declare with edits', async () => {
+      await selectDeclarationAction(page, 'Declare with edits')
       await ensureOutboxIsEmpty(page)
     })
 
@@ -453,7 +460,7 @@ test.describe.serial('3. Workqueue flow - 3', () => {
       })
     })
   })
-  test.describe('3.6 Re-validate by RA', async () => {
+  test.describe('3.6 Re-declare with edits by RA', async () => {
     test('3.6.1 Login with RA', async () => {
       await login(page, CREDENTIALS.REGISTRATION_AGENT, true)
 
@@ -473,16 +480,29 @@ test.describe.serial('3. Workqueue flow - 3', () => {
       })
     })
 
-    test('3.6.2 Re-validate', async () => {
+    test('3.6.2 Go to edit', async () => {
       await page.getByText('Requires updates').click()
-
       await assignFromWorkqueue(page, childName)
       await getRowByTitle(page, childName)
-        .getByRole('button', { name: 'Review' })
+        .getByRole('button', { name: 'Edit' })
         .click()
+    })
 
-      await selectAction(page, 'Validate')
-      await page.getByRole('button', { name: 'Validate' }).click()
+    test('3.6.3 Change informant email', async () => {
+      await page
+        .getByTestId('accordion-Accordion_informant')
+        .getByRole('button', { name: 'Change all' })
+        .click()
+
+      await page.locator('#informant____email').fill(faker.internet.email())
+
+      await page
+        .getByRole('button', { name: 'Back to review', exact: true })
+        .click()
+    })
+
+    test('3.6.4 Re-declare with edits', async () => {
+      await selectDeclarationAction(page, 'Declare with edits')
 
       await assertRecordInWorkqueue({
         page,