refactor: retain original formatName functionility 4 other places

There were some screens that were not using the new customised formatName() so the refactor to formatName broke thier e2e tests, the temporary solution is to add a new function formatNameWithFirstNameFirst() which uses the old logic until the screen are updated opencrvs/opencrvs-core#6830
opencrvs · Nov 14, 2024 · 63f9ae8 · 63f9ae8
1 parent 747c1fb
commit 63f9ae8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/e2e/helpers.ts b/e2e/helpers.ts
@@ -292,6 +292,10 @@ export const formatName = (name: PersonOrName) => {
   return joinValuesWith([name.familyName, name.firstNames])
 }
 
+export const formatNameWithFirstNameFirst = (name: PersonOrName) => {
+  return joinValuesWith([name.firstNames, name.familyName])
+}
+
 export const drawSignature = async (page: Page) => {
   const canvas = page.locator('#informantSignature_modal canvas')
   const rect = await canvas.boundingBox()

diff --git a/e2e/testcases/correction-birth/correct-birth-record-1.spec.ts b/e2e/testcases/correction-birth/correct-birth-record-1.spec.ts
@@ -6,6 +6,7 @@ import {
   formatDateTo_ddMMMMyyyy,
   formatDateTo_yyyyMMdd,
   formatName,
+  formatNameWithFirstNameFirst,
   getAction,
   getLocationNameFromFhirId,
   getToken,
@@ -712,8 +713,8 @@ test.describe('1. Correct record - 1', () => {
         await expect(
           page.getByText(
             'Full name (Child)' +
-              formatName(declaration.child.name[0]) +
-              formatName(updatedChildDetails)
+              formatNameWithFirstNameFirst(declaration.child.name[0]) +
+              formatNameWithFirstNameFirst(updatedChildDetails)
           )
         ).toBeVisible()
 
@@ -768,7 +769,9 @@ test.describe('1. Correct record - 1', () => {
         ).toBeVisible()
 
         await expect(
-          page.getByText(formatName(declaration.mother.name[0]))
+          page.getByText(
+            formatNameWithFirstNameFirst(declaration.mother.name[0])
+          )
         ).toBeVisible()
         await expect(page.getByText('Verified')).toBeVisible()
         await expect(

diff --git a/e2e/testcases/correction-death/correct-death-record-10.spec.ts b/e2e/testcases/correction-death/correct-death-record-10.spec.ts
@@ -6,6 +6,7 @@ import {
   expectOutboxToBeEmpty,
   formatDateTo_ddMMMMyyyy,
   formatName,
+  formatNameWithFirstNameFirst,
   getAction,
   getToken,
   goBackToReview,
@@ -800,8 +801,8 @@ test.describe('10. Correct record - 10', () => {
         await expect(
           page.getByText(
             'Full name (Deceased)' +
-              formatName(declaration.deceased.name[0]) +
-              formatName(updatedDeceasedDetails)
+              formatNameWithFirstNameFirst(declaration.deceased.name[0]) +
+              formatNameWithFirstNameFirst(updatedDeceasedDetails)
           )
         ).toBeVisible()