From fa531d70c89f9848602ed1e9937763f9df2247b6 Mon Sep 17 00:00:00 2001
From: Chris Collins <chriscollins3456@gmail.com>
Date: Tue, 22 Apr 2025 14:12:42 -0400
Subject: [PATCH] fix(cypress) Catch resizeObserverLoop globally and fix
 setThemeV2 (#13288)

---
 .../e2e/auto_completeV2/v2_auto_complete.js   |  1 -
 .../cypress/e2e/domains/nested_domains.js     |  1 -
 .../cypress/e2e/manage_tags/manage_tags.js    |  4 ----
 .../cypress/e2e/mutations/managing_secrets.js |  1 -
 .../tests/cypress/cypress/support/commands.js | 19 ++++++++++++-------
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/smoke-test/tests/cypress/cypress/e2e/auto_completeV2/v2_auto_complete.js b/smoke-test/tests/cypress/cypress/e2e/auto_completeV2/v2_auto_complete.js
index fbae20c3da..aeee0b3b01 100644
--- a/smoke-test/tests/cypress/cypress/e2e/auto_completeV2/v2_auto_complete.js
+++ b/smoke-test/tests/cypress/cypress/e2e/auto_completeV2/v2_auto_complete.js
@@ -4,7 +4,6 @@ describe("auto-complete", () => {
     cy.skipIntroducePage();
     cy.hideOnboardingTour();
     cy.login();
-    cy.ignoreResizeObserverLoop();
     // look for a dataset
     cy.visit("/");
     cy.wait(2000);
diff --git a/smoke-test/tests/cypress/cypress/e2e/domains/nested_domains.js b/smoke-test/tests/cypress/cypress/e2e/domains/nested_domains.js
index 52963172b8..af7135ce4b 100644
--- a/smoke-test/tests/cypress/cypress/e2e/domains/nested_domains.js
+++ b/smoke-test/tests/cypress/cypress/e2e/domains/nested_domains.js
@@ -90,7 +90,6 @@ describe("Verify nested domains test functionalities", () => {
     cy.setIsThemeV2Enabled(false);
     cy.loginWithCredentials();
     cy.goToDomainList();
-    cy.ignoreResizeObserverLoop();
   });
 
   it("Verify Create a new domain", () => {
diff --git a/smoke-test/tests/cypress/cypress/e2e/manage_tags/manage_tags.js b/smoke-test/tests/cypress/cypress/e2e/manage_tags/manage_tags.js
index 8e36ad8f66..afd85bfb67 100644
--- a/smoke-test/tests/cypress/cypress/e2e/manage_tags/manage_tags.js
+++ b/smoke-test/tests/cypress/cypress/e2e/manage_tags/manage_tags.js
@@ -1,8 +1,4 @@
 describe("manage tags", () => {
-  beforeEach(() => {
-    cy.ignoreResizeObserverLoop();
-  });
-
   it("Manage Tags Page - Verify search bar placeholder", () => {
     cy.login();
     cy.visit("/tags");
diff --git a/smoke-test/tests/cypress/cypress/e2e/mutations/managing_secrets.js b/smoke-test/tests/cypress/cypress/e2e/mutations/managing_secrets.js
index 3245388360..5644bd19b4 100644
--- a/smoke-test/tests/cypress/cypress/e2e/mutations/managing_secrets.js
+++ b/smoke-test/tests/cypress/cypress/e2e/mutations/managing_secrets.js
@@ -9,7 +9,6 @@ const ingestion_source_name = `ingestion source ${number}`;
 describe("managing secrets for ingestion creation", () => {
   it("create a secret, create ingestion source using a secret, remove a secret", () => {
     // Navigate to the manage ingestion page → secrets
-    cy.ignoreResizeObserverLoop();
     cy.loginWithCredentials();
     cy.goToIngestionPage();
     cy.clickOptionWithText("Secrets");
diff --git a/smoke-test/tests/cypress/cypress/support/commands.js b/smoke-test/tests/cypress/cypress/support/commands.js
index d4fc65fdee..a8fe889adc 100644
--- a/smoke-test/tests/cypress/cypress/support/commands.js
+++ b/smoke-test/tests/cypress/cypress/support/commands.js
@@ -531,17 +531,22 @@ Cypress.Commands.add("setIsThemeV2Enabled", (isEnabled) => {
         res.body.data.appConfig.featureFlags.themeV2Default = isEnabled;
         res.body.data.appConfig.featureFlags.showNavBarRedesign = isEnabled;
       });
+    } else if (hasOperationName(req, "getMe")) {
+      req.alias = "gqlgetMeQuery";
+      req.on("response", (res) => {
+        res.body.data.me.corpUser.settings.appearance.showThemeV2 = isEnabled;
+      });
     }
   });
 });
 
-Cypress.Commands.add("ignoreResizeObserverLoop", () => {
-  const resizeObserverLoopErrRe = "ResizeObserver loop limit exceeded";
-  cy.on("uncaught:exception", (err) => {
-    if (err.message.includes(resizeObserverLoopErrRe)) {
-      return false;
-    }
-  });
+Cypress.on("uncaught:exception", (err) => {
+  const resizeObserverLoopErrMessage = "ResizeObserver loop limit exceeded";
+
+  /* returning false here prevents Cypress from failing the test */
+  if (err.message.includes(resizeObserverLoopErrMessage)) {
+    return false;
+  }
 });
 
 //