fix(BSDD): TRA-14096: fixer les tests d integrations

Author: nbourhimnorsys

back/src/forms/__tests__/edition.integration.ts

@@ -522,29 +522,28 @@ describe("checkEditionRules", () => {
     expect(checked).toEqual(true);
   });
 
-  it("should not be possible to change intermediaries when the form is signed by emitter", async () => {
-    const destination = await userWithCompanyFactory("MEMBER");
-    const intermediary1 = await userWithCompanyFactory("MEMBER");
-    const intermediary2 = await userWithCompanyFactory("MEMBER");
-
-    const form = await formFactory({
-      ownerId: destination.user.id,
-      opt: {
-        status: Status.SIGNED_BY_PRODUCER,
-        emittedAt: new Date(),
-        intermediaries: { create: toIntermediaryCompany(intermediary1.company) }
-      }
-    });
-    const fullForm = await getFullForm(form);
-    const input: UpdateFormInput = {
-      id: form.id,
-      intermediaries: [toIntermediaryCompany(intermediary2.company)] // try changing the intermediary
-    };
-    const checkFn = () => checkEditionRules(fullForm, input, destination.user);
-    await expect(checkFn).rejects.toThrow(
-      "Des champs ont été verrouillés via signature et ne peuvent plus être modifiés : intermediaries"
-    );
+ it("should be possible to change intermediaries when the form is signed by emitter (before RECEIVED)", async () => {
+  const destination = await userWithCompanyFactory("MEMBER");
+  const intermediary1 = await userWithCompanyFactory("MEMBER");
+  const intermediary2 = await userWithCompanyFactory("MEMBER");
+
+  const form = await formFactory({
+    ownerId: destination.user.id,
+    opt: {
+      status: Status.SIGNED_BY_PRODUCER,
+      emittedAt: new Date(),
+      intermediaries: { create: toIntermediaryCompany(intermediary1.company) }
+    }
   });
+  const fullForm = await getFullForm(form);
+  const input: UpdateFormInput = {
+    id: form.id,
+    intermediaries: [toIntermediaryCompany(intermediary2.company)]
+  };
+  const checkFn = () => checkEditionRules(fullForm, input, destination.user);
+
+  await expect(checkFn()).resolves.toBe(true);
+});
 
   it("should be possible to resend same intermediaries info when the form is is signed by emitter", async () => {
     const destination = await userWithCompanyFactory("MEMBER");

back/src/forms/resolvers/mutations/__tests__/markAsAccepted.integration.ts

@@ -479,14 +479,14 @@ describe("Test Form reception", () => {
       expect.objectContaining({
         subject:
           "Le déchet de l’entreprise company_1 a été partiellement refusé à réception",
-        to: [
+        to: expect.arrayContaining([
           { email: emitter.email, name: emitter.name },
           { email: emitter2.email, name: emitter2.name }
-        ],
-        cc: [
+        ]),
+        cc: expect.arrayContaining([
           { email: recipient.email, name: recipient.name },
           { email: recipient2.email, name: recipient2.name }
-        ]
+        ])
       })
     );
   });

back/src/forms/resolvers/mutations/__tests__/updateForm.integration.ts

@@ -293,69 +293,70 @@ describe("Mutation.updateForm", () => {
     expect(errors).toBeUndefined();
   });
 
-  it("should not be possible to update intermediaries when emitter has signed", async () => {
-    const emitter = await userWithCompanyFactory("ADMIN");
-    const destination = await userWithCompanyFactory("ADMIN", {
-      companyTypes: [CompanyType.WASTEPROCESSOR],
-      wasteProcessorTypes: [WasteProcessorType.DANGEROUS_WASTES_INCINERATION]
-    });
-    const intermediary1 = await companyFactory();
-    const intermediary2 = await companyFactory();
-    const form = await formFactory({
-      ownerId: emitter.user.id,
-      opt: {
-        status: "SIGNED_BY_PRODUCER",
-        emitterCompanySiret: emitter.company.siret,
-        recipientCompanySiret: destination.company.siret,
-        emittedAt: new Date(),
-        intermediaries: { create: toIntermediaryCompany(intermediary1) }
-      }
-    });
-    const { mutate } = makeClient(destination.user);
+  it("should not be possible to update intermediaries when form is RECEIVED", async () => {
+  const emitter = await userWithCompanyFactory("ADMIN");
+  const destination = await userWithCompanyFactory("ADMIN", {
+    companyTypes: [CompanyType.WASTEPROCESSOR],
+    wasteProcessorTypes: [WasteProcessorType.DANGEROUS_WASTES_INCINERATION]
+  });
+  const intermediary1 = await companyFactory();
+  const intermediary2 = await companyFactory();
+  const form = await formFactory({
+    ownerId: emitter.user.id,
+    opt: {
+      status: "RECEIVED",
+      emitterCompanySiret: emitter.company.siret,
+      recipientCompanySiret: destination.company.siret,
+      emittedAt: new Date(),
+      receivedAt: new Date(),
+      intermediaries: { create: toIntermediaryCompany(intermediary1) }
+    }
+  });
+  const { mutate } = makeClient(destination.user);
 
     // Try changing the list of intermediaries
-    const { errors: errors1 } = await mutate<
-      Pick<Mutation, "updateForm">,
-      MutationUpdateFormArgs
-    >(UPDATE_FORM, {
-      variables: {
-        updateFormInput: {
-          id: form.id,
-          intermediaries: [toIntermediaryCompany(intermediary2)]
-        }
+  const { errors: errors1 } = await mutate<
+    Pick<Mutation, "updateForm">,
+    MutationUpdateFormArgs
+  >(UPDATE_FORM, {
+    variables: {
+      updateFormInput: {
+        id: form.id,
+        intermediaries: [toIntermediaryCompany(intermediary2)]
       }
-    });
+    }
+  });
 
-    expect(errors1).toEqual([
-      expect.objectContaining({
-        message:
-          "Des champs ont été verrouillés via signature et ne peuvent plus être modifiés : intermediaries"
-      })
-    ]);
+  expect(errors1).toEqual([
+    expect.objectContaining({
+      message:
+        "Des champs ont été verrouillés via signature et ne peuvent plus être modifiés : intermediaries"
+    })
+  ]);
 
     // Try changing one field on the same intermediary
-    const { errors: errors2 } = await mutate<
-      Pick<Mutation, "updateForm">,
-      MutationUpdateFormArgs
-    >(UPDATE_FORM, {
-      variables: {
-        updateFormInput: {
-          id: form.id,
-          intermediaries: [
-            { ...toIntermediaryCompany(intermediary2), name: "new name" }
-          ]
-        }
+  const { errors: errors2 } = await mutate<
+    Pick<Mutation, "updateForm">,
+    MutationUpdateFormArgs
+  >(UPDATE_FORM, {
+    variables: {
+      updateFormInput: {
+        id: form.id,
+        intermediaries: [
+          { ...toIntermediaryCompany(intermediary2), name: "new name" }
+        ]
       }
-    });
-
-    expect(errors2).toEqual([
-      expect.objectContaining({
-        message:
-          "Des champs ont été verrouillés via signature et ne peuvent plus être modifiés : intermediaries"
-      })
-    ]);
+    }
   });
 
+  expect(errors2).toEqual([
+    expect.objectContaining({
+      message:
+        "Des champs ont été verrouillés via signature et ne peuvent plus être modifiés : intermediaries"
+    })
+  ]);
+});
+
   it("should be possible to resend same intermediaries data when emitter has signed", async () => {
     const emitter = await userWithCompanyFactory("ADMIN");
     const destination = await userWithCompanyFactory("ADMIN", {