Merge branch 'main' into MAASENG-1599-replace-react-portal-with-usepo…

…rtal
canonical · Apr 9, 2024 · 54bbd11 · 54bbd11
2 parents c7a0663 + 80b9f8a
commit 54bbd11
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 264 deletions.
diff --git a/cypress/e2e/with-users/subnets/staticroutes.spec.ts b/cypress/e2e/with-users/subnets/staticroutes.spec.ts
@@ -1,3 +1,4 @@
+import { LONG_TIMEOUT } from "../../../constants";
 import { generateMAASURL } from "../../utils";
 
 context("Static Routes", () => {
@@ -27,7 +28,8 @@ context("Static Routes", () => {
     });
     cy.findByRole("button", { name: /save/i }).click();
     cy.findByRole("complementary", { name: /Add static route/i }).should(
-      "not.exist"
+      "not.exist",
+      { timeout: LONG_TIMEOUT }
     );
 
     // Edit static route
@@ -40,7 +42,7 @@ context("Static Routes", () => {
 
     cy.findByRole("complementary", { name: /Edit static route/i }).within(
       () => {
-        cy.findByLabelText(/gateway ip/i).type("{Backspace}1");
+        cy.findByLabelText(/gateway ip/i).type("{Backspace}2");
         cy.findByRole("button", { name: /save/i }).click();
       }
     );
@@ -51,8 +53,9 @@ context("Static Routes", () => {
         cy.findByText(staticRoute as string);
       });
     });
-    cy.findByRole("complementary", { name: /Add static route/i }).should(
-      "not.exist"
+    cy.findByRole("complementary", { name: /Edit static route/i }).should(
+      "not.exist",
+      { timeout: LONG_TIMEOUT }
     );
 
     // Delete the static route
@@ -70,11 +73,15 @@ context("Static Routes", () => {
         cy.findByRole("button", { name: /delete/i }).click();
       }
     );
+    cy.findByRole("complementary", {
+      name: /Delete static route/i,
+    }).should("not.exist", {
+      timeout: LONG_TIMEOUT,
+    });
     cy.get("@staticRoute").then((staticRoute: unknown) => {
       cy.findByRole("region", { name: /Static routes/i }).within(() => {
         cy.findByText(staticRoute as string).should("not.exist");
       });
     });
-    cy.findByRole("region", { name: /side panel/i }).should("not.exist");
   });
 });
diff --git a/package.json b/package.json
@@ -108,8 +108,8 @@
     "@types/node": "20.11.30",
     "@types/path-parse": "1.0.22",
     "@types/pluralize": "0.0.33",
-    "@types/react": "18.2.73",
-    "@types/react-dom": "18.2.23",
+    "@types/react": "18.2.75",
+    "@types/react-dom": "18.2.24,
     "@types/react-redux": "7.1.33",
     "@types/react-router": "5.1.20",
     "@types/react-router-dom": "5.3.3",
@@ -159,12 +159,12 @@
     "webpack": "5.91.0"
   },
   "resolutions": {
-    "node_modules/@types/react-router-dom/@types/react": "18.2.73",
-    "@types/react": "18.2.73",
-    "@types/react-dom": "18.2.23"
+    "node_modules/@types/react-router-dom/@types/react": "18.2.75",
+    "@types/react": "18.2.75",
+    "@types/react-dom": "18.2.24"
   },
   "peerDependencies": {
-    "@types/react": "18.2.73"
+    "@types/react": "18.2.75"
   },
   "browserslist": {
     "production": [