Merge remote-tracking branch 'origin/VB-694' into VB-694+sync

Author: hitesh-shetty-cstk

src/visualBuilder/eventManager/__test__/useRevalidateFieldDataPostMessageEvent.test.ts

@@ -2,7 +2,7 @@ import { vi, describe, it, expect, beforeEach, afterEach } from "vitest";
 import { VisualBuilder } from "../..";
 import { FieldSchemaMap } from "../../utils/fieldSchemaMap";
 import { handleRevalidateFieldData } from "../useRevalidateFieldDataPostMessageEvent";
-
+import * as cslpdata from "../../../cslp";
 // Mock dependencies
 vi.mock("../../utils/fieldSchemaMap", () => ({
     FieldSchemaMap: {
@@ -11,9 +11,7 @@ vi.mock("../../utils/fieldSchemaMap", () => ({
     },
 }));
 
-vi.mock("../../../cslp", () => ({
-    extractDetailsFromCslp: vi.fn(),
-}));
+vi.spyOn(cslpdata, "extractDetailsFromCslp");
 
 vi.mock("../../generators/generateOverlay", () => ({
     hideFocusOverlay: vi.fn(),

src/visualBuilder/eventManager/__test__/useVariantsPostMessageEvent.spec.ts

@@ -153,6 +153,9 @@ describe("useVariantFieldsPostMessageEvent", () => {
 
         // Reset mocks
         vi.clearAllMocks();
+        
+        // Mock isValidCslp to return true for test data (after clearAllMocks)
+        vi.spyOn(cslpdata, "isValidCslp").mockReturnValue(true);
     });
 
     afterEach(() => {
@@ -362,6 +365,9 @@ describe("addVariantFieldClass", () => {
 
         // Reset mocks
         vi.clearAllMocks();
+        
+        // Mock isValidCslp to return true for test data
+        vi.spyOn(cslpdata, "isValidCslp").mockReturnValue(true);
     });
 
     afterEach(() => {
@@ -423,6 +429,7 @@ describe("addVariantFieldClass", () => {
                 variant: cslpValue.split(":")[1]
             }
         });
+        
         const variantUid = "variant-456";
         const variantOrder = ["variant-123", "variant-456"];
         VisualBuilder.VisualBuilderGlobalState.value.variantOrder = variantOrder;

src/visualBuilder/generators/__test__/generateOverlay.test.ts

@@ -4,7 +4,7 @@ import { VisualBuilder } from "../..";
 import { VisualBuilderPostMessageEvents } from "../../utils/types/postMessage.types";
 import visualBuilderPostMessage from "../../utils/visualBuilderPostMessage";
 import { FieldSchemaMap } from "../../utils/fieldSchemaMap";
-import { extractDetailsFromCslp } from "../../../cslp/cslpdata";
+import * as cslpdata from "../../../cslp/cslpdata";
 
 vi.mock("../../utils/visualBuilderPostMessage", () => ({
     default: {
@@ -21,9 +21,7 @@ vi.mock("../../utils/fieldSchemaMap", () => ({
     },
 }));
 
-vi.mock("../../../cslp/cslpdata", () => ({
-    extractDetailsFromCslp: vi.fn(),
-}));
+vi.spyOn(cslpdata, "extractDetailsFromCslp");
 
 describe("sendFieldEvent", () => {
     let previousSelectedEditableDOM: HTMLElement;
@@ -55,7 +53,7 @@ describe("sendFieldEvent", () => {
             eventType: VisualBuilderPostMessageEvents.UPDATE_FIELD,
         });
 
-        expect(extractDetailsFromCslp).not.toHaveBeenCalled();
+        expect(cslpdata.extractDetailsFromCslp).not.toHaveBeenCalled();
         expect(FieldSchemaMap.getFieldSchema).not.toHaveBeenCalled();
         expect(visualBuilderPostMessage?.send).not.toHaveBeenCalled();
     });

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

@@ -1,7 +1,7 @@
 import { describe, it, expect, vi } from 'vitest';
 import getVisualBuilderRedirectionUrl from '../getVisualBuilderRedirectionUrl';
 import Config from '../../../configManager/configManager';
-import { extractDetailsFromCslp } from '../../../cslp';
+import { extractDetailsFromCslp, isValidCslp } from '../../../cslp';
 
 vi.mock('../../../configManager/configManager');
 vi.mock('../../../cslp');
@@ -61,6 +61,7 @@ describe('getVisualBuilderRedirectionUrl', () => {
             }
         });
 
+        isValidCslp.mockReturnValue(true);
         extractDetailsFromCslp.mockReturnValue({ locale: 'fr-FR' });
 
         const result = getVisualBuilderRedirectionUrl();
@@ -99,6 +100,8 @@ describe('getVisualBuilderRedirectionUrl', () => {
             }
         });
 
+        isValidCslp.mockReturnValue(false);
+
         const result = getVisualBuilderRedirectionUrl();
         // Should use locale from config when data-cslp attribute is invalid (empty or no value)
         expect(result.toString()).toBe('https://app.example.com/#!/stack/12345/visual-builder?branch=main&environment=production&target-url=https%3A%2F%2Fexample.com%2F&locale=en-US');