merge pass

Author: karancs06

src/visualBuilder/__test__/hover/fields/group.test.ts

@@ -8,6 +8,7 @@ import { FieldSchemaMap } from "../../../utils/fieldSchemaMap";
 import { mockDomRect } from "./mockDomRect";
 import { VisualBuilder } from "../../../index";
 import { screen } from "@testing-library/preact";
+import { waitFor } from "@testing-library/preact";
 
 vi.mock("../../../utils/visualBuilderPostMessage", async () => {
     const { getAllContentTypes } = await vi.importActual<
@@ -121,8 +122,17 @@ describe("When an element is hovered in visual builder mode", () => {
             Config.set("mode", 2);
             Config.set("enable", true);
             visualBuilder = new VisualBuilder();
-            // Wait for VisualBuilder to initialize
-            await new Promise((resolve) => setTimeout(resolve, 0));
+            // Wait for VisualBuilder to initialize and container to appear
+            // CI environments are slower, so use generous timeout
+            await waitFor(
+                () => {
+                    const container = document.querySelector(
+                        '[data-testid="visual-builder__container"]'
+                    );
+                    if (!container) throw new Error("Container not found");
+                },
+                { timeout: 2000, interval: 50 } // Increased timeout and interval for CI
+            );
         });
 
         beforeEach(() => {

src/visualBuilder/utils/__test__/updateFocussedState.test.ts

@@ -4,15 +4,13 @@ import {
     updateFocussedStateOnMutation,
 } from "../updateFocussedState";
 import { VisualBuilder } from "../..";
-import {
-    addFocusOverlay,
-    hideOverlay,
-} from "../../generators/generateOverlay";
+import { addFocusOverlay, hideOverlay } from "../../generators/generateOverlay";
 import { mockGetBoundingClientRect } from "../../../__test__/utils";
 import { act } from "@testing-library/preact";
 import { singleLineFieldSchema } from "../../../__test__/data/fields";
 import { fetchEntryPermissionsAndStageDetails } from "../fetchEntryPermissionsAndStageDetails";
 import { isFieldDisabled } from "../isFieldDisabled";
+import { getEntryPermissionsCached } from "../getEntryPermissionsCached";
 
 vi.mock("../../generators/generateOverlay", () => ({
     addFocusOverlay: vi.fn(),
@@ -23,6 +21,10 @@ vi.mock("../fetchEntryPermissionsAndStageDetails", () => ({
     fetchEntryPermissionsAndStageDetails: vi.fn(),
 }));
 
+vi.mock("../getEntryPermissionsCached", () => ({
+    getEntryPermissionsCached: vi.fn(),
+}));
+
 vi.mock("../../utils/isFieldDisabled", () => ({
     isFieldDisabled: vi.fn().mockReturnValue({ isDisabled: false }),
 }));
@@ -39,7 +41,6 @@ vi.mock("../../utils/fieldSchemaMap", () => {
     };
 });
 
-
 describe("updateFocussedState", () => {
     beforeEach(() => {
         const previousSelectedEditableDOM = document.createElement("div");
@@ -50,7 +51,7 @@ describe("updateFocussedState", () => {
         document.body.appendChild(previousSelectedEditableDOM);
         VisualBuilder.VisualBuilderGlobalState.value.previousSelectedEditableDOM =
             previousSelectedEditableDOM;
-        
+
         // Set up default mock for fetchEntryPermissionsAndStageDetails for all tests
         vi.mocked(fetchEntryPermissionsAndStageDetails).mockResolvedValue({
             acl: {
@@ -287,12 +288,17 @@ describe("updateFocussedState", () => {
         } as unknown as ResizeObserver;
 
         const previousSelectedEditableDOM = document.createElement("div");
-        previousSelectedEditableDOM.setAttribute("data-cslp", "content_type_uid.entry_uid.locale.field_path");
+        previousSelectedEditableDOM.setAttribute(
+            "data-cslp",
+            "content_type_uid.entry_uid.locale.field_path"
+        );
         document.body.appendChild(previousSelectedEditableDOM);
         VisualBuilder.VisualBuilderGlobalState.value.previousSelectedEditableDOM =
             previousSelectedEditableDOM;
 
-        document.querySelector = vi.fn().mockReturnValue(previousSelectedEditableDOM);
+        document.querySelector = vi
+            .fn()
+            .mockReturnValue(previousSelectedEditableDOM);
 
         const result = await updateFocussedState({
             editableElement: editableElementMock,