Merge remote-tracking branch 'refs/remotes/origin/cypress-test-config…

…' into cypress-test-config
zesty-io · Jan 10, 2025 · 2d2ed9c · 2d2ed9c
2 parents 8818472 + 55bff8d
commit 2d2ed9c
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 28 deletions.
diff --git a/cypress.config.js b/cypress.config.js
@@ -14,22 +14,21 @@ module.exports = defineConfig({
     // You may want to clean this up later by importing these.
     setupNodeEvents(on, config) {
       on("before:browser:launch", (browser, launchOptions) => {
-        if (browser.name === "chrome" && browser.isHeadless) {
-          launchOptions.args.push("--headless=old");
-        }
+        // if (browser.name === "chrome" && browser.isHeadless) {
+        //   launchOptions.args.push("--headless=old");
+        // }
 
         return launchOptions;
       });
 
       return require("./cypress/plugins/index.js")(on, config);
     },
+    browser: "electron",
     baseUrl: "http://8-f48cf3a682-7fthvk.manager.dev.zesty.io:8080/",
     specPattern: "cypress/e2e/**/*.{js,jsx,ts,tsx}",
     testIsolation: false,
   },
-  defaultCommandTimeout: 30_000,
-  responseTimeout: 60_000,
+  defaultCommandTimeout: 50_000,
+  responseTimeout: 90_000,
   retries: 1,
-  experimentalMemoryManagement: true,
-  chromeWebSecurity: false,
 });
diff --git a/cypress/e2e/settings/workflows.spec.js b/cypress/e2e/settings/workflows.spec.js
@@ -492,25 +492,25 @@ Cypress.Commands.add("getStatusLabels", () => {
     });
 });
 
-Cypress.Commands.add(
-  "apiRequest",
-  ({ method = "GET", url = "", body = undefined }) => {
-    return cy.getCookie(Cypress.env("COOKIE_NAME")).then((cookie) => {
-      const token = cookie?.value;
-      return cy
-        .request({
-          url,
-          method,
-          headers: { authorization: `Bearer ${token}` },
-          ...(body ? { body: body } : {}),
-        })
-        .then((response) => ({
-          status: response?.isOkStatusCode ? "success" : "error",
-          data: response?.body?.data,
-        }));
-    });
-  }
-);
+// Cypress.Commands.add(
+//   "apiRequest",
+//   ({ method = "GET", url = "", body = undefined }) => {
+//     return cy.getCookie(Cypress.env("COOKIE_NAME")).then((cookie) => {
+//       const token = cookie?.value;
+//       return cy
+//         .request({
+//           url,
+//           method,
+//           headers: { authorization: `Bearer ${token}` },
+//           ...(body ? { body: body } : {}),
+//         })
+//         .then((response) => ({
+//           status: response?.isOkStatusCode ? "success" : "error",
+//           data: response?.body?.data,
+//         }));
+//     });
+//   }
+// );
 
 function parseStatusLabels(statusLabels) {
   const { active, deactivated } = statusLabels?.reduce(

diff --git a/cypress/support/commands.js b/cypress/support/commands.js
@@ -8,14 +8,16 @@ Cypress.Commands.add("login", () => {
     .request({
       url: `${Cypress.env("API_AUTH")}/login`,
       method: "POST",
-      credentials: "include",
       body: formBody,
     })
     .then(async (res) => {
       const response = await new Response(res.body).json();
       // We need the cookie value returned reset so it is unsecure and
       // accessible by javascript
       cy.setCookie(Cypress.env("COOKIE_NAME"), response.meta.token);
+    })
+    .then(() => {
+      return cy.get("body"); // Return a Chainable<JQuery<HTMLElement>>
     });
 });
 
@@ -30,7 +32,7 @@ Cypress.Commands.add("waitOn", (path, cb) => {
   cy.blockAnnouncements();
   cb();
   cy.wait("@waitingOn", {
-    timeout: 30000,
+    timeout: 80_000,
   });
 });
 

diff --git a/cypress/support/index.ts b/cypress/support/index.ts
@@ -0,0 +1,35 @@
+import "./commands";
+
+declare global {
+  namespace Cypress {
+    interface Chainable {
+      waitOn(path: string, cb: () => void): Chainable<JQuery<HTMLElement>>;
+      login(): Chainable<JQuery<HTMLElement>>;
+      getBySelector(
+        selector: string,
+        ...args: any[]
+      ): Chainable<JQuery<HTMLElement>>;
+      blockLock(): Chainable<JQuery<HTMLElement>>;
+      assertClipboardValue(value: string): Chainable<JQuery<HTMLElement>>;
+      blockAnnouncements(): Chainable<JQuery<HTMLElement>>;
+      apiRequest(params: {
+        url: string;
+        method?: "GET" | "POST" | "PUT" | "DELETE";
+        body?: any;
+      }): Chainable<{
+        status: "success" | "error";
+        data: any;
+      }>;
+      goToWorkflowsPage(): Chainable<void>;
+      cleanTestData(): Chainable<void>;
+      moreActionEdit(label: string): Chainable<void>;
+      moreActionDeactivate(label: string): Chainable<void>;
+      createTestData(): Chainable<void>;
+      getStatusLabels(): Chainable<any>;
+      parseStatusLabels(statusLabels: any): {
+        active: any[];
+        deactivated: any[];
+      };
+    }
+  }
+}