From fb3ea0f513b938d4cca5d84b836ed08adb517d4f Mon Sep 17 00:00:00 2001
From: Arnaud AMBROSELLI <arnaud.ambroselli@yahoo.fr>
Date: Thu, 7 Sep 2023 10:36:12 +0200
Subject: [PATCH] fix: tests

---
 .../person/components/TreatmentModal.js       |  7 ++---
 e2e/documents_organizer.spec.ts               | 30 +++++++++----------
 ...erson-full-test-migrated-from-jest.spec.ts |  2 +-
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/dashboard/src/scenes/person/components/TreatmentModal.js b/dashboard/src/scenes/person/components/TreatmentModal.js
index 6871b8153..f210af3cb 100644
--- a/dashboard/src/scenes/person/components/TreatmentModal.js
+++ b/dashboard/src/scenes/person/components/TreatmentModal.js
@@ -252,7 +252,7 @@ function TreatmentContent({ onClose, treatment, personId }) {
               .join(' ')}
             onSubmit={async (e) => {
               e.preventDefault();
-              const ok = handleSubmit({ closeOnSubmit: true });
+              const ok = await handleSubmit({ closeOnSubmit: true });
               if (ok && isNewTreatment) toast.success('Traitement créé !');
               if (ok && !isNewTreatment) toast.success('Traitement mis à jour !');
             }}>
@@ -377,10 +377,7 @@ function TreatmentContent({ onClose, treatment, personId }) {
             />
           </div>
           <div
-            className={[
-              'tw-flex tw-h-[50vh] tw-w-full tw-flex-col tw-gap-4 tw-overflow-y-auto',
-              activeTab !== 'Commentaires' && 'tw-hidden',
-            ]
+            className={['tw-flex tw-h-[50vh] tw-w-full tw-flex-col tw-gap-4 tw-overflow-y-auto', activeTab !== 'Commentaires' && 'tw-hidden']
               .filter(Boolean)
               .join(' ')}>
             <CommentsModule
diff --git a/e2e/documents_organizer.spec.ts b/e2e/documents_organizer.spec.ts
index 6bb07cd49..1b7d430e6 100644
--- a/e2e/documents_organizer.spec.ts
+++ b/e2e/documents_organizer.spec.ts
@@ -89,16 +89,16 @@ test("Documents organizer", async ({ page }) => {
   await expect(page.getByRole("cell", { name: `image-3.jpg ${now2.format("dddd D MMMM YYYY HH:mm")} Créé par User Admin Test - 1` })).toBeVisible();
 
   await page.getByRole("button", { name: "Passer les documents en plein écran" }).click();
-  await page.locator("#person-documents").getByText("NomCréé parCréé le").click();
-  await page.locator("#family-documents-documents").getByText("NomCréé parCréé le").click();
+  await page.locator("#social-documents").getByText("NomCréé parCréé le").click();
+  await page.locator("#family-documents").getByText("NomCréé parCréé le").click();
   await expect(
-    page.locator("#person-documents").filter({ hasText: `📃image-1\.jpgUser Admin Test - 1${now2.format("dddd D MMMM YYYY HH:mm")}` })
+    page.locator("#social-documents").filter({ hasText: `📃image-1\.jpgUser Admin Test - 1${now2.format("dddd D MMMM YYYY HH:mm")}` })
   ).toBeVisible();
   await expect(
-    page.locator("#person-documents").filter({ hasText: `📃image-2\.jpgUser Admin Test - 1${now2.format("dddd D MMMM YYYY HH:mm")}` })
+    page.locator("#social-documents").filter({ hasText: `📃image-2\.jpgUser Admin Test - 1${now2.format("dddd D MMMM YYYY HH:mm")}` })
   ).toBeVisible();
   await expect(
-    page.locator("#person-documents").filter({ hasText: `📃image-3\.jpgUser Admin Test - 1${now2.format("dddd D MMMM YYYY HH:mm")}` })
+    page.locator("#social-documents").filter({ hasText: `📃image-3\.jpgUser Admin Test - 1${now2.format("dddd D MMMM YYYY HH:mm")}` })
   ).toBeVisible();
   // await expect(page.getByRole("button", { name: "📂 👪 Documents familiaux(1)" })).toBeVisible();
   await page.getByRole("button", { name: "＋ Ajouter un dossier" }).click();
@@ -135,16 +135,16 @@ test("Documents organizer", async ({ page }) => {
   await page.getByRole("link", { name: "Personnes suivies" }).click();
   await page.getByRole("cell", { name: person1Name }).click();
   await page.getByRole("button", { name: "Passer les documents en plein écran" }).click();
-  await page.locator("#person-documents").getByText("NomCréé parCréé le").click();
-  await page.locator("#family-documents-documents").getByText("NomCréé parCréé le").click();
+  await page.locator("#social-documents").getByText("NomCréé parCréé le").click();
+  await page.locator("#family-documents").getByText("NomCréé parCréé le").click();
   await expect(
-    page.locator("#person-documents").filter({ hasText: `📃image-1\.jpgUser Admin Test - 1${now2.format("dddd D MMMM YYYY HH:mm")}` })
+    page.locator("#social-documents").filter({ hasText: `📃image-1\.jpgUser Admin Test - 1${now2.format("dddd D MMMM YYYY HH:mm")}` })
   ).toBeVisible();
   await expect(
-    page.locator("#person-documents").filter({ hasText: `📃image-2\.jpgUser Admin Test - 1${now2.format("dddd D MMMM YYYY HH:mm")}` })
+    page.locator("#social-documents").filter({ hasText: `📃image-2\.jpgUser Admin Test - 1${now2.format("dddd D MMMM YYYY HH:mm")}` })
   ).toBeVisible();
   await expect(
-    page.locator("#person-documents").filter({ hasText: `📃image-4\.jpgUser Admin Test - 1${now2.format("dddd D MMMM YYYY HH:mm")}` })
+    page.locator("#social-documents").filter({ hasText: `📃image-4\.jpgUser Admin Test - 1${now2.format("dddd D MMMM YYYY HH:mm")}` })
   ).toBeVisible();
   // await expect(page.getByRole("button", { name: "📂 👪 Documents familiaux(1)" })).toBeVisible();
   await expect(page.locator("span").filter({ hasText: `▼📂Dossier2(0)User Admin Test - 1${now3.format("dddd D MMMM YYYY HH:mm")}` })).toBeVisible();
@@ -171,16 +171,16 @@ test("Documents organizer", async ({ page }) => {
   await page.getByRole("link", { name: "Personnes suivies" }).click();
   await page.getByRole("cell", { name: person1Name }).click();
   await page.getByRole("button", { name: "Passer les documents en plein écran" }).click();
-  await page.locator("#person-documents").getByText("NomCréé parCréé le").click();
-  await page.locator("#family-documents-documents").getByText("NomCréé parCréé le").click();
+  await page.locator("#social-documents").getByText("NomCréé parCréé le").click();
+  await page.locator("#family-documents").getByText("NomCréé parCréé le").click();
   await expect(
-    page.locator("#person-documents").filter({ hasText: `📃image-1\.jpgUser Admin Test - 1${now2.format("dddd D MMMM YYYY HH:mm")}` })
+    page.locator("#social-documents").filter({ hasText: `📃image-1\.jpgUser Admin Test - 1${now2.format("dddd D MMMM YYYY HH:mm")}` })
   ).toBeVisible();
   await expect(
-    page.locator("#person-documents").filter({ hasText: `📃image-2\.jpgUser Admin Test - 1${now2.format("dddd D MMMM YYYY HH:mm")}` })
+    page.locator("#social-documents").filter({ hasText: `📃image-2\.jpgUser Admin Test - 1${now2.format("dddd D MMMM YYYY HH:mm")}` })
   ).not.toBeVisible();
   await expect(
-    page.locator("#person-documents").filter({ hasText: `📃image-4\.jpgUser Admin Test - 1${now2.format("dddd D MMMM YYYY HH:mm")}` })
+    page.locator("#social-documents").filter({ hasText: `📃image-4\.jpgUser Admin Test - 1${now2.format("dddd D MMMM YYYY HH:mm")}` })
   ).toBeVisible();
   // await expect(page.locator("#family-person-documents").getByRole("button", { name: "📂 👪 Documents familiaux(1)" })).toBeVisible();
   await expect(
diff --git a/e2e/persons_person-full-test-migrated-from-jest.spec.ts b/e2e/persons_person-full-test-migrated-from-jest.spec.ts
index a435b530b..1a153a24a 100644
--- a/e2e/persons_person-full-test-migrated-from-jest.spec.ts
+++ b/e2e/persons_person-full-test-migrated-from-jest.spec.ts
@@ -202,7 +202,7 @@ test("test", async ({ page }) => {
   await page.getByRole("link", { name: "Personnes suivies" }).click();
   await expect(page).toHaveURL("http://localhost:8090/person");
 
-  await page.getByRole("cell", { name: `${personName} Sortie de file active : Départ vers autre région` }).click();
+  await page.getByRole("cell", { name: `${personName} - test pseudo Sortie de file active : Départ vers autre région` }).click();
   await page.getByRole("button", { name: "Supprimer" }).click();
 
   await page.locator('input[name="textToConfirm"]').fill(personName);