added notification tab in admin + fixed cypress tests to target notif…

…ications tab
gip-inclusion · Jun 13, 2023 · 5765cd7 · 5765cd7
1 parent fb0f7b3
commit 5765cd7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/cypress/cypress.config.ts b/cypress/cypress.config.ts
@@ -15,6 +15,7 @@ export default defineConfig({
         // Temp fix, Cypress seems to report elements as disabled when they are not https://github.com/cypress-io/cypress/issues/5827
         force: true,
       },
+      timeForEventCrawler: 10000,
     },
   },
   e2e: {

diff --git a/cypress/cypress/support/admin/commands.ts b/cypress/cypress/support/admin/commands.ts
@@ -18,7 +18,7 @@ Cypress.Commands.add("connectToAdmin", () => {
 });
 
 Cypress.Commands.add("openEmailInAdmin", ({ emailType, elementIndex = 0 }) => {
-  cy.get(".fr-tabs__tab").contains("Emails").click();
+  cy.get(".fr-tabs__tab").contains("Notifications").click();
   const accordionButton = cy
     .get(`.fr-accordion__btn:contains(${emailType})`)
     .eq(elementIndex);

diff --git a/cypress/e2e/conventionWorkflow.spec.cy.ts b/cypress/e2e/conventionWorkflow.spec.cy.ts
@@ -8,9 +8,9 @@ import {
 import { disableUrlLogging } from "../cypress/utils/log";
 import { addBusinessDays, format } from "date-fns";
 
-const { baseApiRoute } = Cypress.env("config");
+const { baseApiRoute, defaultFieldOptions, timeForEventCrawler } =
+  Cypress.env("config");
 const selectedAgencyId = "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa";
-const timeForEventCrawler = 20000;
 
 describe("Convention full workflow", () => {
   const conventionData = {
@@ -63,9 +63,7 @@ describe("Convention full workflow", () => {
         );
         cy.get(
           `#draft-modal #${domElementIds.manageConvention.justificationModalSubmitButton}`,
-        ).click({
-          force: true,
-        });
+        ).click(defaultFieldOptions);
         cy.wait("@updateConventionRequest")
           .its("response.statusCode")
           .should("eq", 200);

diff --git a/front/src/app/pages/admin/AdminPage.tsx b/front/src/app/pages/admin/AdminPage.tsx
@@ -83,7 +83,7 @@ export const AdminPage = ({
           <div className={fr.cx("fr-col-12", "fr-p-2w", "fr-mt-4w")}>
             <Tabs
               selectedTabId={currentTab}
-              tabs={adminTabs.filter((tab) => tab.tabId !== "notifications")}
+              tabs={adminTabs}
               onTabChange={(tab) => {
                 if (isAdminTab(tab))
                   routes
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,7 @@ export default defineConfig({ @@
             // Temp fix, Cypress seems to report elements as disabled when they are not https://github.com/cypress-io/cypress/issues/5827
             force: true,
           },
+          timeForEventCrawler: 10000,
         },
       },
       e2e: {
@@ Expand Down @@