remove ttl

Co-authored-by: Piyush Gupta <piyushguptaa2z123@gmail.com>

.env.example

@@ -191,8 +191,7 @@ UNSPLASH_ACCESS_KEY=
 
 # The below is used for Next Caching (uses In-Memory from Next Cache if not provided)
 # You can also add more configuration to Redis using the redis.conf file in the root directory
-REDIS_URL=redis://localhost:6379
-REDIS_DEFAULT_TTL=86400 # 1 day 
+# REDIS_URL=redis://localhost:6379
 
 # The below is used for Rate Limiting (uses In-Memory LRU Cache if not provided) (You can use a service like Webdis for this)
 # REDIS_HTTP_URL:
@@ -200,9 +199,6 @@ REDIS_DEFAULT_TTL=86400 # 1 day
 # The below is used for Rate Limiting for management API
 UNKEY_ROOT_KEY=
 
-# Disable custom cache handler if necessary (e.g. if deployed on Vercel)
-# CUSTOM_CACHE_DISABLED=1
-
 # INTERCOM_APP_ID=
 # INTERCOM_SECRET_KEY=
 

.github/actions/cache-build-web/action.yml

@@ -49,7 +49,7 @@ runs:
       if: steps.cache-build.outputs.cache-hit != 'true'
 
     - name: Install pnpm
-      uses: pnpm/action-setup@v4
+      uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
       if: steps.cache-build.outputs.cache-hit != 'true'
 
     - name: Install dependencies

.github/copilot-instructions.md

@@ -11,7 +11,7 @@ When generating test files inside the "/app/web" path, follow these rules:
 - Follow the same test pattern used for other files in the package where the file is located
 - All imports should be at the top of the file, not inside individual tests
 - For mocking inside "test" blocks use "vi.mocked"
-- Add the original file path to the "test.coverage.include"array in the "apps/web/vite.config.mts" file. Do this only when the test file is created.
+- If the file is located in the "packages/survey" path, use "@testing-library/preact" instead of "@testing-library/react"
 - Don't mock functions that are already mocked in the "apps/web/vitestSetup.ts" file
 - When using "screen.getByText" check for the tolgee string if it is being used in the file.
 - The types for mocked variables can be found in the "packages/types" path. Be sure that every imported type exists before using it. Don't create types that are not already in the codebase.
@@ -28,4 +28,5 @@ afterEach(() => {
 - The "afterEach" function should only have the "cleanup()" line inside it and should be adde to the "vitest" imports.
 - For click events, import userEvent from "@testing-library/user-event"
 - Mock other components that can make the text more complex and but at the same time mocking it wouldn't make the test flaky. It's ok to leave basic and simple components.
-- You don't need to mock @tolgee/react
+- You don't need to mock @tolgee/react
+- Use "import "@testing-library/jest-dom/vitest";"

.github/workflows/deploy-formbricks-cloud.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs:
       VERSION:
-        description: 'The version of the Docker image to release'
+        description: 'The version of the Docker image to release, full image tag if image tag is v0.0.0 enter v0.0.0.'
         required: true
         type: string
       REPOSITORY:
@@ -67,7 +67,7 @@ jobs:
 
       - uses: helmfile/helmfile-action@v2
         name: Deploy Formbricks Cloud Prod
-        if: (github.event_name == 'workflow_call' || github.event_name == 'workflow_dispatch') && github.event.inputs.ENVIRONMENT == 'prod'
+        if: inputs.ENVIRONMENT == 'prod'
         env:
           VERSION: ${{ inputs.VERSION }}
           REPOSITORY: ${{ inputs.REPOSITORY }}
@@ -75,6 +75,7 @@ jobs:
           FORMBRICKS_INGRESS_CERT_ARN: ${{ secrets.FORMBRICKS_INGRESS_CERT_ARN }}
           FORMBRICKS_ROLE_ARN: ${{ secrets.FORMBRICKS_ROLE_ARN }}
         with:
+          helmfile-version: 'v1.0.0'
           helm-plugins: >
             https://github.com/databus23/helm-diff,
             https://github.com/jkroepke/helm-secrets
@@ -84,13 +85,14 @@ jobs:
 
       - uses: helmfile/helmfile-action@v2
         name: Deploy Formbricks Cloud Stage
-        if: github.event_name == 'workflow_dispatch' && github.event.inputs.ENVIRONMENT == 'stage'
+        if: inputs.ENVIRONMENT == 'stage'
         env:
           VERSION: ${{ inputs.VERSION }}
           REPOSITORY: ${{ inputs.REPOSITORY }}
           FORMBRICKS_INGRESS_CERT_ARN: ${{ secrets.STAGE_FORMBRICKS_INGRESS_CERT_ARN }}
           FORMBRICKS_ROLE_ARN: ${{ secrets.STAGE_FORMBRICKS_ROLE_ARN }}
         with:
+          helmfile-version: 'v1.0.0'
           helm-plugins: >
             https://github.com/databus23/helm-diff,
             https://github.com/jkroepke/helm-secrets

.github/workflows/formbricks-release.yml

@@ -30,5 +30,5 @@ jobs:
       - docker-build
       - helm-chart-release
     with:
-      VERSION: ${{ needs.docker-build.outputs.VERSION }}
+      VERSION: v${{ needs.docker-build.outputs.VERSION }}
       ENVIRONMENT: "prod"

.github/workflows/labeler.yml

@@ -1,27 +0,0 @@
-name: "Pull Request Labeler"
-on:
-  - pull_request_target
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-permissions:
-  contents: read
-
-jobs:
-  labeler:
-    name: Pull Request Labeler
-    permissions:
-      contents: read
-      pull-requests: write
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
-      - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
-        with:
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
-          # https://github.com/actions/labeler/issues/442#issuecomment-1297359481
-          sync-labels: ""

.github/workflows/lint.yml

@@ -26,7 +26,7 @@ jobs:
           node-version: 20.x
 
       - name: Install pnpm
-        uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
 
       - name: Install dependencies
         run: pnpm install --config.platform=linux --config.architecture=x64

.github/workflows/sonarqube.yml

@@ -29,7 +29,7 @@ jobs:
           node-version: 22.x
 
       - name: Install pnpm
-        uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
 
       - name: Install dependencies
         run: pnpm install --config.platform=linux --config.architecture=x64

apps/storybook/package.json

@@ -26,10 +26,10 @@
     "@storybook/react": "8.6.12",
     "@storybook/react-vite": "8.6.12",
     "@storybook/test": "8.6.12",
-    "@typescript-eslint/eslint-plugin": "8.31.1",
-    "@typescript-eslint/parser": "8.31.1",
+    "@typescript-eslint/eslint-plugin": "8.32.0",
+    "@typescript-eslint/parser": "8.32.0",
     "@vitejs/plugin-react": "4.4.1",
-    "esbuild": "0.25.2",
+    "esbuild": "0.25.4",
     "eslint-plugin-storybook": "0.12.0",
     "prop-types": "15.8.1",
     "storybook": "8.6.12",

apps/web/Dockerfile

@@ -18,8 +18,9 @@ FROM node:22-alpine3.21 AS base
 FROM base AS installer
 
 # Enable corepack and prepare pnpm
-RUN npm install -g corepack@latest
+RUN npm install --ignore-scripts -g corepack@latest 
 RUN corepack enable
+RUN corepack prepare pnpm@9.15.9 --activate
 
 # Install necessary build tools and compilers
 RUN apk update && apk add --no-cache cmake g++ gcc jq make openssl-dev python3
@@ -59,7 +60,7 @@ COPY . .
 RUN touch apps/web/.env
 
 # Install the dependencies
-RUN pnpm install
+RUN pnpm install --ignore-scripts
 
 # Build the project using our secret reader script
 # This mounts the secrets only during this build step without storing them in layers
@@ -75,7 +76,7 @@ RUN jq -r '.devDependencies.prisma' packages/database/package.json > /prisma_ver
 #
 FROM base AS runner
 
-RUN npm install -g corepack@latest
+RUN npm install --ignore-scripts -g corepack@latest 
 RUN corepack enable
 
 RUN apk add --no-cache curl \
@@ -141,12 +142,13 @@ RUN chmod -R 755 ./node_modules/@noble/hashes
 COPY --from=installer /app/node_modules/zod ./node_modules/zod
 RUN chmod -R 755 ./node_modules/zod
 
-RUN npm install -g tsx typescript prisma pino-pretty
+RUN npm install --ignore-scripts -g tsx typescript pino-pretty 
+RUN npm install -g prisma
 
 EXPOSE 3000
 ENV HOSTNAME "0.0.0.0"
 ENV NODE_ENV="production"
-# USER nextjs
+USER nextjs
 
 # Prepare volume for uploads
 RUN mkdir -p /home/nextjs/apps/web/uploads/

apps/web/app/(app)/(onboarding)/environments/[environmentId]/connect/components/ConnectWithFormbricks.test.tsx

@@ -0,0 +1,79 @@
+import "@testing-library/jest-dom/vitest";
+import { cleanup, render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { ConnectWithFormbricks } from "./ConnectWithFormbricks";
+
+// Mocks before import
+const pushMock = vi.fn();
+const refreshMock = vi.fn();
+vi.mock("@tolgee/react", () => ({ useTranslate: () => ({ t: (key: string) => key }) }));
+vi.mock("next/navigation", () => ({ useRouter: vi.fn(() => ({ push: pushMock, refresh: refreshMock })) }));
+vi.mock("./OnboardingSetupInstructions", () => ({
+  OnboardingSetupInstructions: () => <div data-testid="instructions" />,
+}));
+
+afterEach(() => {
+  cleanup();
+  vi.clearAllMocks();
+});
+
+describe("ConnectWithFormbricks", () => {
+  const environment = { id: "env1" } as any;
+  const webAppUrl = "http://app";
+  const channel = {} as any;
+
+  test("renders waiting state when widgetSetupCompleted is false", () => {
+    render(
+      <ConnectWithFormbricks
+        environment={environment}
+        webAppUrl={webAppUrl}
+        widgetSetupCompleted={false}
+        channel={channel}
+      />
+    );
+    expect(screen.getByTestId("instructions")).toBeInTheDocument();
+    expect(screen.getByText("environments.connect.waiting_for_your_signal")).toBeInTheDocument();
+  });
+
+  test("renders success state when widgetSetupCompleted is true", () => {
+    render(
+      <ConnectWithFormbricks
+        environment={environment}
+        webAppUrl={webAppUrl}
+        widgetSetupCompleted={true}
+        channel={channel}
+      />
+    );
+    expect(screen.getByText("environments.connect.congrats")).toBeInTheDocument();
+    expect(screen.getByText("environments.connect.connection_successful_message")).toBeInTheDocument();
+  });
+
+  test("clicking finish button navigates to surveys", async () => {
+    render(
+      <ConnectWithFormbricks
+        environment={environment}
+        webAppUrl={webAppUrl}
+        widgetSetupCompleted={true}
+        channel={channel}
+      />
+    );
+    const button = screen.getByRole("button", { name: "environments.connect.finish_onboarding" });
+    await userEvent.click(button);
+    expect(pushMock).toHaveBeenCalledWith(`/environments/${environment.id}/surveys`);
+  });
+
+  test("refresh is called on visibilitychange to visible", () => {
+    render(
+      <ConnectWithFormbricks
+        environment={environment}
+        webAppUrl={webAppUrl}
+        widgetSetupCompleted={false}
+        channel={channel}
+      />
+    );
+    Object.defineProperty(document, "visibilityState", { value: "visible", configurable: true });
+    document.dispatchEvent(new Event("visibilitychange"));
+    expect(refreshMock).toHaveBeenCalled();
+  });
+});

apps/web/app/(app)/(onboarding)/environments/[environmentId]/layout.test.tsx

@@ -0,0 +1,144 @@
+import { hasUserEnvironmentAccess } from "@/lib/environment/auth";
+import { cleanup, render, screen } from "@testing-library/react";
+import { getServerSession } from "next-auth";
+import { redirect } from "next/navigation";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import OnboardingLayout from "./layout";
+
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: false,
+  IS_PRODUCTION: false,
+  IS_DEVELOPMENT: true,
+  E2E_TESTING: false,
+  WEBAPP_URL: "http://localhost:3000",
+  SURVEY_URL: "http://localhost:3000/survey",
+  ENCRYPTION_KEY: "mock-encryption-key",
+  CRON_SECRET: "mock-cron-secret",
+  DEFAULT_BRAND_COLOR: "#64748b",
+  FB_LOGO_URL: "https://mock-logo-url.com/logo.png",
+  PRIVACY_URL: "http://localhost:3000/privacy",
+  TERMS_URL: "http://localhost:3000/terms",
+  IMPRINT_URL: "http://localhost:3000/imprint",
+  IMPRINT_ADDRESS: "Mock Address",
+  PASSWORD_RESET_DISABLED: false,
+  EMAIL_VERIFICATION_DISABLED: false,
+  GOOGLE_OAUTH_ENABLED: false,
+  GITHUB_OAUTH_ENABLED: false,
+  AZURE_OAUTH_ENABLED: false,
+  OIDC_OAUTH_ENABLED: false,
+  SAML_OAUTH_ENABLED: false,
+  SAML_XML_DIR: "./mock-saml-connection",
+  SIGNUP_ENABLED: true,
+  EMAIL_AUTH_ENABLED: true,
+  INVITE_DISABLED: false,
+  SLACK_CLIENT_SECRET: "mock-slack-secret",
+  SLACK_CLIENT_ID: "mock-slack-id",
+  SLACK_AUTH_URL: "https://mock-slack-auth-url.com",
+  GOOGLE_SHEETS_CLIENT_ID: "mock-google-sheets-id",
+  GOOGLE_SHEETS_CLIENT_SECRET: "mock-google-sheets-secret",
+  GOOGLE_SHEETS_REDIRECT_URL: "http://localhost:3000/google-sheets-redirect",
+  NOTION_OAUTH_CLIENT_ID: "mock-notion-id",
+  NOTION_OAUTH_CLIENT_SECRET: "mock-notion-secret",
+  NOTION_REDIRECT_URI: "http://localhost:3000/notion-redirect",
+  NOTION_AUTH_URL: "https://mock-notion-auth-url.com",
+  AIRTABLE_CLIENT_ID: "mock-airtable-id",
+  SMTP_HOST: "mock-smtp-host",
+  SMTP_PORT: "587",
+  SMTP_SECURE_ENABLED: false,
+  SMTP_USER: "mock-smtp-user",
+  SMTP_PASSWORD: "mock-smtp-password",
+  SMTP_AUTHENTICATED: true,
+  SMTP_REJECT_UNAUTHORIZED_TLS: true,
+  MAIL_FROM: "mock@mail.com",
+  MAIL_FROM_NAME: "Mock Mail",
+  NEXTAUTH_SECRET: "mock-nextauth-secret",
+  ITEMS_PER_PAGE: 30,
+  SURVEYS_PER_PAGE: 12,
+  RESPONSES_PER_PAGE: 25,
+  TEXT_RESPONSES_PER_PAGE: 5,
+  INSIGHTS_PER_PAGE: 10,
+  DOCUMENTS_PER_PAGE: 10,
+  MAX_RESPONSES_FOR_INSIGHT_GENERATION: 500,
+  MAX_OTHER_OPTION_LENGTH: 250,
+  ENTERPRISE_LICENSE_KEY: "ABC",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "mock-github-secret",
+  GITHUB_OAUTH_URL: "https://mock-github-auth-url.com",
+  AZURE_ID: "mock-azure-id",
+  AZUREAD_CLIENT_ID: "mock-azure-client-id",
+  AZUREAD_CLIENT_SECRET: "mock-azure-client-secret",
+  GOOGLE_CLIENT_ID: "mock-google-client-id",
+  GOOGLE_CLIENT_SECRET: "mock-google-client-secret",
+  GOOGLE_OAUTH_URL: "https://mock-google-auth-url.com",
+  AZURE_OAUTH_URL: "https://mock-azure-auth-url.com",
+  OIDC_ID: "mock-oidc-id",
+  OIDC_OAUTH_URL: "https://mock-oidc-auth-url.com",
+  SAML_ID: "mock-saml-id",
+  SAML_OAUTH_URL: "https://mock-saml-auth-url.com",
+  SAML_METADATA_URL: "https://mock-saml-metadata-url.com",
+  AZUREAD_TENANT_ID: "mock-azure-tenant-id",
+  AZUREAD_OAUTH_URL: "https://mock-azuread-auth-url.com",
+  OIDC_DISPLAY_NAME: "Mock OIDC",
+  OIDC_CLIENT_ID: "mock-oidc-client-id",
+  OIDC_CLIENT_SECRET: "mock-oidc-client-secret",
+  OIDC_REDIRECT_URL: "http://localhost:3000/oidc-redirect",
+  OIDC_AUTH_URL: "https://mock-oidc-auth-url.com",
+  OIDC_ISSUER: "https://mock-oidc-issuer.com",
+  OIDC_SIGNING_ALGORITHM: "RS256",
+}));
+
+vi.mock("next/navigation", () => ({
+  redirect: vi.fn(),
+}));
+
+vi.mock("next-auth", () => ({
+  getServerSession: vi.fn(),
+}));
+
+vi.mock("@/lib/environment/auth", () => ({
+  hasUserEnvironmentAccess: vi.fn(),
+}));
+
+describe("OnboardingLayout", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  test("redirects to login if session is missing", async () => {
+    vi.mocked(getServerSession).mockResolvedValueOnce(null);
+
+    await OnboardingLayout({
+      params: { environmentId: "env1" },
+      children: <div>Test Content</div>,
+    });
+
+    expect(redirect).toHaveBeenCalledWith("/auth/login");
+  });
+
+  test("throws AuthorizationError if user lacks access", async () => {
+    vi.mocked(getServerSession).mockResolvedValueOnce({ user: { id: "user1" } });
+    vi.mocked(hasUserEnvironmentAccess).mockResolvedValueOnce(false);
+
+    await expect(
+      OnboardingLayout({
+        params: { environmentId: "env1" },
+        children: <div>Test Content</div>,
+      })
+    ).rejects.toThrow("User is not authorized to access this environment");
+  });
+
+  test("renders children if user has access", async () => {
+    vi.mocked(getServerSession).mockResolvedValueOnce({ user: { id: "user1" } });
+    vi.mocked(hasUserEnvironmentAccess).mockResolvedValueOnce(true);
+
+    const result = await OnboardingLayout({
+      params: { environmentId: "env1" },
+      children: <div data-testid="child">Test Content</div>,
+    });
+
+    render(result);
+
+    expect(screen.getByTestId("child")).toHaveTextContent("Test Content");
+  });
+});

apps/web/app/(app)/(onboarding)/environments/[environmentId]/layout.tsx

@@ -16,7 +16,7 @@ const OnboardingLayout = async (props) => {
 
   const isAuthorized = await hasUserEnvironmentAccess(session.user.id, params.environmentId);
   if (!isAuthorized) {
-    throw AuthorizationError;
+    throw new AuthorizationError("User is not authorized to access this environment");
   }
 
   return <div className="flex-1 bg-slate-50">{children}</div>;

apps/web/app/(app)/(onboarding)/environments/[environmentId]/xm-templates/components/XMTemplateList.test.tsx

@@ -0,0 +1,76 @@
+import { createSurveyAction } from "@/modules/survey/components/template-list/actions";
+import "@testing-library/jest-dom/vitest";
+import { cleanup, render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import toast from "react-hot-toast";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { XMTemplateList } from "./XMTemplateList";
+
+// Prepare push mock and module mocks before importing component
+const pushMock = vi.fn();
+vi.mock("@tolgee/react", () => ({ useTranslate: () => ({ t: (key: string) => key }) }));
+vi.mock("next/navigation", () => ({ useRouter: vi.fn(() => ({ push: pushMock })) }));
+vi.mock("react-hot-toast", () => ({ default: { error: vi.fn() } }));
+vi.mock("@/app/(app)/(onboarding)/environments/[environmentId]/xm-templates/lib/xm-templates", () => ({
+  getXMTemplates: (t: any) => [
+    { id: 1, name: "tmpl1" },
+    { id: 2, name: "tmpl2" },
+  ],
+}));
+vi.mock("@/app/(app)/(onboarding)/environments/[environmentId]/xm-templates/lib/utils", () => ({
+  replacePresetPlaceholders: (template: any, project: any) => ({ ...template, projectId: project.id }),
+}));
+vi.mock("@/modules/survey/components/template-list/actions", () => ({ createSurveyAction: vi.fn() }));
+vi.mock("@/lib/utils/helper", () => ({ getFormattedErrorMessage: () => "formatted-error" }));
+vi.mock("@/app/(app)/(onboarding)/organizations/components/OnboardingOptionsContainer", () => ({
+  OnboardingOptionsContainer: ({ options }: { options: any[] }) => (
+    <div>
+      {options.map((opt, idx) => (
+        <button key={idx} data-testid={`option-${idx}`} onClick={opt.onClick}>
+          {opt.title}
+        </button>
+      ))}
+    </div>
+  ),
+}));
+
+// Reset mocks between tests
+afterEach(() => {
+  cleanup();
+  vi.clearAllMocks();
+});
+
+describe("XMTemplateList component", () => {
+  const project = { id: "proj1" } as any;
+  const user = { id: "user1" } as any;
+  const environmentId = "env1";
+
+  test("creates survey and navigates on success", async () => {
+    // Mock successful survey creation
+    vi.mocked(createSurveyAction).mockResolvedValue({ data: { id: "survey1" } } as any);
+
+    render(<XMTemplateList project={project} user={user} environmentId={environmentId} />);
+
+    const option0 = screen.getByTestId("option-0");
+    await userEvent.click(option0);
+
+    expect(createSurveyAction).toHaveBeenCalledWith({
+      environmentId,
+      surveyBody: expect.objectContaining({ id: 1, projectId: "proj1", type: "link", createdBy: "user1" }),
+    });
+    expect(pushMock).toHaveBeenCalledWith(`/environments/${environmentId}/surveys/survey1/edit?mode=cx`);
+  });
+
+  test("shows error toast on failure", async () => {
+    // Mock failed survey creation
+    vi.mocked(createSurveyAction).mockResolvedValue({ error: "err" } as any);
+
+    render(<XMTemplateList project={project} user={user} environmentId={environmentId} />);
+
+    const option1 = screen.getByTestId("option-1");
+    await userEvent.click(option1);
+
+    expect(createSurveyAction).toHaveBeenCalled();
+    expect(toast.error).toHaveBeenCalledWith("formatted-error");
+  });
+});

apps/web/app/(app)/(onboarding)/environments/[environmentId]/xm-templates/lib/utils.test.ts

@@ -0,0 +1,80 @@
+import "@testing-library/jest-dom/vitest";
+import { cleanup } from "@testing-library/react";
+import { afterEach, describe, expect, test } from "vitest";
+import { TProject } from "@formbricks/types/project";
+import { TXMTemplate } from "@formbricks/types/templates";
+import { replacePresetPlaceholders } from "./utils";
+
+// Mock data
+const mockProject: TProject = {
+  id: "project1",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  name: "Test Project",
+  organizationId: "org1",
+  styling: {
+    allowStyleOverwrite: true,
+    brandColor: { light: "#FFFFFF" },
+  },
+  recontactDays: 30,
+  inAppSurveyBranding: true,
+  linkSurveyBranding: true,
+  config: {
+    channel: "link" as const,
+    industry: "eCommerce" as "eCommerce" | "saas" | "other" | null,
+  },
+  placement: "bottomRight",
+  clickOutsideClose: true,
+  darkOverlay: false,
+  environments: [],
+  languages: [],
+  logo: null,
+};
+const mockTemplate: TXMTemplate = {
+  name: "$[projectName] Survey",
+  questions: [
+    {
+      id: "q1",
+      inputType: "text",
+      type: "email" as any,
+      headline: { default: "$[projectName] Question" },
+      required: false,
+      charLimit: { enabled: true, min: 400, max: 1000 },
+    },
+  ],
+  endings: [
+    {
+      id: "e1",
+      type: "endScreen",
+      headline: { default: "Thank you for completing the survey!" },
+    },
+  ],
+  styling: {
+    brandColor: { light: "#0000FF" },
+    questionColor: { light: "#00FF00" },
+    inputColor: { light: "#FF0000" },
+  },
+};
+
+describe("replacePresetPlaceholders", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  test("replaces projectName placeholder in template name", () => {
+    const result = replacePresetPlaceholders(mockTemplate, mockProject);
+    expect(result.name).toBe("Test Project Survey");
+  });
+
+  test("replaces projectName placeholder in question headline", () => {
+    const result = replacePresetPlaceholders(mockTemplate, mockProject);
+    expect(result.questions[0].headline.default).toBe("Test Project Question");
+  });
+
+  test("returns a new object without mutating the original template", () => {
+    const originalTemplate = structuredClone(mockTemplate);
+    const result = replacePresetPlaceholders(mockTemplate, mockProject);
+    expect(result).not.toBe(mockTemplate);
+    expect(mockTemplate).toEqual(originalTemplate);
+  });
+});

apps/web/app/(app)/(onboarding)/environments/[environmentId]/xm-templates/lib/xm-templates.test.ts

@@ -0,0 +1,60 @@
+import "@testing-library/jest-dom/vitest";
+import { cleanup } from "@testing-library/preact";
+import { TFnType } from "@tolgee/react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { getXMSurveyDefault, getXMTemplates } from "./xm-templates";
+
+vi.mock("@formbricks/logger", () => ({
+  logger: { error: vi.fn() },
+}));
+
+describe("xm-templates", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  test("getXMSurveyDefault returns default survey template", () => {
+    const tMock = vi.fn((key) => key) as TFnType;
+    const result = getXMSurveyDefault(tMock);
+
+    expect(result).toEqual({
+      name: "",
+      endings: expect.any(Array),
+      questions: [],
+      styling: {
+        overwriteThemeStyling: true,
+      },
+    });
+    expect(result.endings).toHaveLength(1);
+  });
+
+  test("getXMTemplates returns all templates", () => {
+    const tMock = vi.fn((key) => key) as TFnType;
+    const result = getXMTemplates(tMock);
+
+    expect(result).toHaveLength(6);
+    expect(result[0].name).toBe("templates.nps_survey_name");
+    expect(result[1].name).toBe("templates.star_rating_survey_name");
+    expect(result[2].name).toBe("templates.csat_survey_name");
+    expect(result[3].name).toBe("templates.cess_survey_name");
+    expect(result[4].name).toBe("templates.smileys_survey_name");
+    expect(result[5].name).toBe("templates.enps_survey_name");
+  });
+
+  test("getXMTemplates handles errors gracefully", async () => {
+    const tMock = vi.fn(() => {
+      throw new Error("Test error");
+    }) as TFnType;
+
+    const result = getXMTemplates(tMock);
+
+    // Dynamically import the mocked logger
+    const { logger } = await import("@formbricks/logger");
+
+    expect(result).toEqual([]);
+    expect(logger.error).toHaveBeenCalledWith(
+      expect.any(Error),
+      "Unable to load XM templates, returning empty array"
+    );
+  });
+});

apps/web/app/(app)/(onboarding)/lib/onboarding.test.ts

@@ -0,0 +1,58 @@
+import { Prisma } from "@prisma/client";
+import { beforeEach, describe, expect, test, vi } from "vitest";
+import { prisma } from "@formbricks/database";
+import { DatabaseError } from "@formbricks/types/errors";
+import { getTeamsByOrganizationId } from "./onboarding";
+
+vi.mock("@formbricks/database", () => ({
+  prisma: {
+    team: {
+      findMany: vi.fn(),
+    },
+  },
+}));
+
+vi.mock("@/lib/cache", () => ({
+  cache: (fn: any) => fn,
+}));
+
+vi.mock("@/lib/cache/team", () => ({
+  teamCache: {
+    tag: { byOrganizationId: vi.fn((id: string) => `organization-${id}-teams`) },
+  },
+}));
+
+vi.mock("@/lib/utils/validate", () => ({
+  validateInputs: vi.fn(),
+}));
+
+describe("getTeamsByOrganizationId", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  test("returns mapped teams", async () => {
+    const mockTeams = [
+      { id: "t1", name: "Team 1" },
+      { id: "t2", name: "Team 2" },
+    ];
+    vi.mocked(prisma.team.findMany).mockResolvedValueOnce(mockTeams);
+    const result = await getTeamsByOrganizationId("org1");
+    expect(result).toEqual([
+      { id: "t1", name: "Team 1" },
+      { id: "t2", name: "Team 2" },
+    ]);
+  });
+
+  test("throws DatabaseError on Prisma error", async () => {
+    vi.mocked(prisma.team.findMany).mockRejectedValueOnce(
+      new Prisma.PrismaClientKnownRequestError("fail", { code: "P2002", clientVersion: "1.0.0" })
+    );
+    await expect(getTeamsByOrganizationId("org1")).rejects.toThrow(DatabaseError);
+  });
+
+  test("throws error on unknown error", async () => {
+    vi.mocked(prisma.team.findMany).mockRejectedValueOnce(new Error("fail"));
+    await expect(getTeamsByOrganizationId("org1")).rejects.toThrow("fail");
+  });
+});

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/landing/components/landing-sidebar.test.tsx

@@ -0,0 +1,75 @@
+import "@testing-library/jest-dom/vitest";
+import { cleanup, render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { signOut } from "next-auth/react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { LandingSidebar } from "./landing-sidebar";
+
+// Module mocks must be declared before importing the component
+vi.mock("@tolgee/react", () => ({
+  useTranslate: () => ({ t: (key: string) => key, isLoading: false }),
+}));
+vi.mock("next-auth/react", () => ({ signOut: vi.fn() }));
+vi.mock("next/navigation", () => ({ useRouter: () => ({ push: vi.fn() }) }));
+vi.mock("@/modules/organization/components/CreateOrganizationModal", () => ({
+  CreateOrganizationModal: ({ open }: { open: boolean }) => (
+    <div data-testid={open ? "modal-open" : "modal-closed"} />
+  ),
+}));
+vi.mock("@/modules/ui/components/avatars", () => ({
+  ProfileAvatar: ({ userId }: { userId: string }) => <div data-testid="avatar">{userId}</div>,
+}));
+
+// Ensure mocks are reset between tests
+afterEach(() => {
+  cleanup();
+  vi.clearAllMocks();
+});
+
+describe("LandingSidebar component", () => {
+  const user = { id: "u1", name: "Alice", email: "alice@example.com", imageUrl: "" } as any;
+  const organization = { id: "o1", name: "orgOne" } as any;
+  const organizations = [
+    { id: "o2", name: "betaOrg" },
+    { id: "o1", name: "alphaOrg" },
+  ] as any;
+
+  test("renders logo, avatar, and initial modal closed", () => {
+    render(
+      <LandingSidebar
+        isMultiOrgEnabled={false}
+        user={user}
+        organization={organization}
+        organizations={organizations}
+      />
+    );
+
+    // Formbricks logo
+    expect(screen.getByAltText("environments.formbricks_logo")).toBeInTheDocument();
+    // Profile avatar
+    expect(screen.getByTestId("avatar")).toHaveTextContent("u1");
+    // CreateOrganizationModal should be closed initially
+    expect(screen.getByTestId("modal-closed")).toBeInTheDocument();
+  });
+
+  test("clicking logout triggers signOut", async () => {
+    render(
+      <LandingSidebar
+        isMultiOrgEnabled={false}
+        user={user}
+        organization={organization}
+        organizations={organizations}
+      />
+    );
+
+    // Open user dropdown by clicking on avatar trigger
+    const trigger = screen.getByTestId("avatar").parentElement;
+    if (trigger) await userEvent.click(trigger);
+
+    // Click logout menu item
+    const logoutItem = await screen.findByText("common.logout");
+    await userEvent.click(logoutItem);
+
+    expect(signOut).toHaveBeenCalledWith({ callbackUrl: "/auth/login" });
+  });
+});

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/landing/layout.test.tsx

@@ -0,0 +1,184 @@
+import { getEnvironments } from "@/lib/environment/service";
+import { getMembershipByUserIdOrganizationId } from "@/lib/membership/service";
+import { getUserProjects } from "@/lib/project/service";
+import "@testing-library/jest-dom/vitest";
+import { cleanup } from "@testing-library/preact";
+import { getServerSession } from "next-auth";
+import { notFound, redirect } from "next/navigation";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import LandingLayout from "./layout";
+
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: false,
+  IS_PRODUCTION: false,
+  IS_DEVELOPMENT: true,
+  E2E_TESTING: false,
+  WEBAPP_URL: "http://localhost:3000",
+  SURVEY_URL: "http://localhost:3000/survey",
+  ENCRYPTION_KEY: "mock-encryption-key",
+  CRON_SECRET: "mock-cron-secret",
+  DEFAULT_BRAND_COLOR: "#64748b",
+  FB_LOGO_URL: "https://mock-logo-url.com/logo.png",
+  PRIVACY_URL: "http://localhost:3000/privacy",
+  TERMS_URL: "http://localhost:3000/terms",
+  IMPRINT_URL: "http://localhost:3000/imprint",
+  IMPRINT_ADDRESS: "Mock Address",
+  PASSWORD_RESET_DISABLED: false,
+  EMAIL_VERIFICATION_DISABLED: false,
+  GOOGLE_OAUTH_ENABLED: false,
+  GITHUB_OAUTH_ENABLED: false,
+  AZURE_OAUTH_ENABLED: false,
+  OIDC_OAUTH_ENABLED: false,
+  SAML_OAUTH_ENABLED: false,
+  SAML_XML_DIR: "./mock-saml-connection",
+  SIGNUP_ENABLED: true,
+  EMAIL_AUTH_ENABLED: true,
+  INVITE_DISABLED: false,
+  SLACK_CLIENT_SECRET: "mock-slack-secret",
+  SLACK_CLIENT_ID: "mock-slack-id",
+  SLACK_AUTH_URL: "https://mock-slack-auth-url.com",
+  GOOGLE_SHEETS_CLIENT_ID: "mock-google-sheets-id",
+  GOOGLE_SHEETS_CLIENT_SECRET: "mock-google-sheets-secret",
+  GOOGLE_SHEETS_REDIRECT_URL: "http://localhost:3000/google-sheets-redirect",
+  NOTION_OAUTH_CLIENT_ID: "mock-notion-id",
+  NOTION_OAUTH_CLIENT_SECRET: "mock-notion-secret",
+  NOTION_REDIRECT_URI: "http://localhost:3000/notion-redirect",
+  NOTION_AUTH_URL: "https://mock-notion-auth-url.com",
+  AIRTABLE_CLIENT_ID: "mock-airtable-id",
+  SMTP_HOST: "mock-smtp-host",
+  SMTP_PORT: "587",
+  SMTP_SECURE_ENABLED: false,
+  SMTP_USER: "mock-smtp-user",
+  SMTP_PASSWORD: "mock-smtp-password",
+  SMTP_AUTHENTICATED: true,
+  SMTP_REJECT_UNAUTHORIZED_TLS: true,
+  MAIL_FROM: "mock@mail.com",
+  MAIL_FROM_NAME: "Mock Mail",
+  NEXTAUTH_SECRET: "mock-nextauth-secret",
+  ITEMS_PER_PAGE: 30,
+  SURVEYS_PER_PAGE: 12,
+  RESPONSES_PER_PAGE: 25,
+  TEXT_RESPONSES_PER_PAGE: 5,
+  INSIGHTS_PER_PAGE: 10,
+  DOCUMENTS_PER_PAGE: 10,
+  MAX_RESPONSES_FOR_INSIGHT_GENERATION: 500,
+  MAX_OTHER_OPTION_LENGTH: 250,
+  ENTERPRISE_LICENSE_KEY: "ABC",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "mock-github-secret",
+  GITHUB_OAUTH_URL: "https://mock-github-auth-url.com",
+  AZURE_ID: "mock-azure-id",
+  AZUREAD_CLIENT_ID: "mock-azure-client-id",
+  AZUREAD_CLIENT_SECRET: "mock-azure-client-secret",
+  GOOGLE_CLIENT_ID: "mock-google-client-id",
+  GOOGLE_CLIENT_SECRET: "mock-google-client-secret",
+  GOOGLE_OAUTH_URL: "https://mock-google-auth-url.com",
+  AZURE_OAUTH_URL: "https://mock-azure-auth-url.com",
+  OIDC_ID: "mock-oidc-id",
+  OIDC_OAUTH_URL: "https://mock-oidc-auth-url.com",
+  SAML_ID: "mock-saml-id",
+  SAML_OAUTH_URL: "https://mock-saml-auth-url.com",
+  SAML_METADATA_URL: "https://mock-saml-metadata-url.com",
+  AZUREAD_TENANT_ID: "mock-azure-tenant-id",
+  AZUREAD_OAUTH_URL: "https://mock-azuread-auth-url.com",
+  OIDC_DISPLAY_NAME: "Mock OIDC",
+  OIDC_CLIENT_ID: "mock-oidc-client-id",
+  OIDC_CLIENT_SECRET: "mock-oidc-client-secret",
+  OIDC_REDIRECT_URL: "http://localhost:3000/oidc-redirect",
+  OIDC_AUTH_URL: "https://mock-oidc-auth-url.com",
+  OIDC_ISSUER: "https://mock-oidc-issuer.com",
+  OIDC_SIGNING_ALGORITHM: "RS256",
+}));
+
+vi.mock("@/lib/environment/service");
+vi.mock("@/lib/membership/service");
+vi.mock("@/lib/project/service");
+vi.mock("next-auth");
+vi.mock("next/navigation");
+
+afterEach(() => {
+  cleanup();
+});
+
+describe("LandingLayout", () => {
+  test("redirects to login if no session exists", async () => {
+    vi.mocked(getServerSession).mockResolvedValue(null);
+
+    const props = { params: { organizationId: "org-123" }, children: <div>Child Content</div> };
+
+    await LandingLayout(props);
+
+    expect(vi.mocked(redirect)).toHaveBeenCalledWith("/auth/login");
+  });
+
+  test("returns notFound if no membership is found", async () => {
+    vi.mocked(getServerSession).mockResolvedValue({ user: { id: "user-123" } });
+    vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValue(null);
+
+    const props = { params: { organizationId: "org-123" }, children: <div>Child Content</div> };
+
+    await LandingLayout(props);
+
+    expect(vi.mocked(notFound)).toHaveBeenCalled();
+  });
+
+  test("redirects to production environment if available", async () => {
+    vi.mocked(getServerSession).mockResolvedValue({ user: { id: "user-123" } });
+    vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValue({
+      organizationId: "org-123",
+      userId: "user-123",
+      accepted: true,
+      role: "owner",
+    });
+    vi.mocked(getUserProjects).mockResolvedValue([
+      {
+        id: "proj-123",
+        organizationId: "org-123",
+        createdAt: new Date("2023-01-01"),
+        updatedAt: new Date("2023-01-02"),
+        name: "Project 1",
+        styling: { allowStyleOverwrite: true },
+        recontactDays: 30,
+        inAppSurveyBranding: true,
+        linkSurveyBranding: true,
+      } as any,
+    ]);
+    vi.mocked(getEnvironments).mockResolvedValue([
+      {
+        id: "env-123",
+        type: "production",
+        projectId: "proj-123",
+        createdAt: new Date("2023-01-01"),
+        updatedAt: new Date("2023-01-02"),
+        appSetupCompleted: true,
+      },
+    ]);
+
+    const props = { params: { organizationId: "org-123" }, children: <div>Child Content</div> };
+
+    await LandingLayout(props);
+
+    expect(vi.mocked(redirect)).toHaveBeenCalledWith("/environments/env-123/");
+  });
+
+  test("renders children if no projects or production environment exist", async () => {
+    vi.mocked(getServerSession).mockResolvedValue({ user: { id: "user-123" } });
+    vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValue({
+      organizationId: "org-123",
+      userId: "user-123",
+      accepted: true,
+      role: "owner",
+    });
+    vi.mocked(getUserProjects).mockResolvedValue([]);
+
+    const props = { params: { organizationId: "org-123" }, children: <div>Child Content</div> };
+
+    const result = await LandingLayout(props);
+
+    expect(result).toEqual(
+      <>
+        <div>Child Content</div>
+      </>
+    );
+  });
+});

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/landing/page.test.tsx

@@ -0,0 +1,153 @@
+import { getOrganizationsByUserId } from "@/lib/organization/service";
+import { getUser } from "@/lib/user/service";
+import { getEnterpriseLicense } from "@/modules/ee/license-check/lib/utils";
+import { getOrganizationAuth } from "@/modules/organization/lib/utils";
+import { getTranslate } from "@/tolgee/server";
+import "@testing-library/jest-dom/vitest";
+import { cleanup, render, screen } from "@testing-library/react";
+import { notFound, redirect } from "next/navigation";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import Page from "./page";
+
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: false,
+  IS_PRODUCTION: false,
+  IS_DEVELOPMENT: true,
+  E2E_TESTING: false,
+  WEBAPP_URL: "http://localhost:3000",
+  SURVEY_URL: "http://localhost:3000/survey",
+  ENCRYPTION_KEY: "mock-encryption-key",
+  CRON_SECRET: "mock-cron-secret",
+  DEFAULT_BRAND_COLOR: "#64748b",
+  FB_LOGO_URL: "https://mock-logo-url.com/logo.png",
+  PRIVACY_URL: "http://localhost:3000/privacy",
+  TERMS_URL: "http://localhost:3000/terms",
+  IMPRINT_URL: "http://localhost:3000/imprint",
+  IMPRINT_ADDRESS: "Mock Address",
+  PASSWORD_RESET_DISABLED: false,
+  EMAIL_VERIFICATION_DISABLED: false,
+  GOOGLE_OAUTH_ENABLED: false,
+  GITHUB_OAUTH_ENABLED: false,
+  AZURE_OAUTH_ENABLED: false,
+  OIDC_OAUTH_ENABLED: false,
+  SAML_OAUTH_ENABLED: false,
+  SAML_XML_DIR: "./mock-saml-connection",
+  SIGNUP_ENABLED: true,
+  EMAIL_AUTH_ENABLED: true,
+  INVITE_DISABLED: false,
+  SLACK_CLIENT_SECRET: "mock-slack-secret",
+  SLACK_CLIENT_ID: "mock-slack-id",
+  SLACK_AUTH_URL: "https://mock-slack-auth-url.com",
+  GOOGLE_SHEETS_CLIENT_ID: "mock-google-sheets-id",
+  GOOGLE_SHEETS_CLIENT_SECRET: "mock-google-sheets-secret",
+  GOOGLE_SHEETS_REDIRECT_URL: "http://localhost:3000/google-sheets-redirect",
+  NOTION_OAUTH_CLIENT_ID: "mock-notion-id",
+  NOTION_OAUTH_CLIENT_SECRET: "mock-notion-secret",
+  NOTION_REDIRECT_URI: "http://localhost:3000/notion-redirect",
+  NOTION_AUTH_URL: "https://mock-notion-auth-url.com",
+  AIRTABLE_CLIENT_ID: "mock-airtable-id",
+  SMTP_HOST: "mock-smtp-host",
+  SMTP_PORT: "587",
+  SMTP_SECURE_ENABLED: false,
+  SMTP_USER: "mock-smtp-user",
+  SMTP_PASSWORD: "mock-smtp-password",
+  SMTP_AUTHENTICATED: true,
+  SMTP_REJECT_UNAUTHORIZED_TLS: true,
+  MAIL_FROM: "mock@mail.com",
+  MAIL_FROM_NAME: "Mock Mail",
+  NEXTAUTH_SECRET: "mock-nextauth-secret",
+  ITEMS_PER_PAGE: 30,
+  SURVEYS_PER_PAGE: 12,
+  RESPONSES_PER_PAGE: 25,
+  TEXT_RESPONSES_PER_PAGE: 5,
+  INSIGHTS_PER_PAGE: 10,
+  DOCUMENTS_PER_PAGE: 10,
+  MAX_RESPONSES_FOR_INSIGHT_GENERATION: 500,
+  MAX_OTHER_OPTION_LENGTH: 250,
+  ENTERPRISE_LICENSE_KEY: "ABC",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "mock-github-secret",
+  GITHUB_OAUTH_URL: "https://mock-github-auth-url.com",
+  AZURE_ID: "mock-azure-id",
+  AZUREAD_CLIENT_ID: "mock-azure-client-id",
+  AZUREAD_CLIENT_SECRET: "mock-azure-client-secret",
+  GOOGLE_CLIENT_ID: "mock-google-client-id",
+  GOOGLE_CLIENT_SECRET: "mock-google-client-secret",
+  GOOGLE_OAUTH_URL: "https://mock-google-auth-url.com",
+  AZURE_OAUTH_URL: "https://mock-azure-auth-url.com",
+  OIDC_ID: "mock-oidc-id",
+  OIDC_OAUTH_URL: "https://mock-oidc-auth-url.com",
+  SAML_ID: "mock-saml-id",
+  SAML_OAUTH_URL: "https://mock-saml-auth-url.com",
+  SAML_METADATA_URL: "https://mock-saml-metadata-url.com",
+  AZUREAD_TENANT_ID: "mock-azure-tenant-id",
+  AZUREAD_OAUTH_URL: "https://mock-azuread-auth-url.com",
+  OIDC_DISPLAY_NAME: "Mock OIDC",
+  OIDC_CLIENT_ID: "mock-oidc-client-id",
+  OIDC_CLIENT_SECRET: "mock-oidc-client-secret",
+  OIDC_REDIRECT_URL: "http://localhost:3000/oidc-redirect",
+  OIDC_AUTH_URL: "https://mock-oidc-auth-url.com",
+  OIDC_ISSUER: "https://mock-oidc-issuer.com",
+  OIDC_SIGNING_ALGORITHM: "RS256",
+}));
+
+vi.mock("@/app/(app)/(onboarding)/organizations/[organizationId]/landing/components/landing-sidebar", () => ({
+  LandingSidebar: () => <div data-testid="landing-sidebar" />,
+}));
+vi.mock("@/modules/organization/lib/utils");
+vi.mock("@/lib/user/service");
+vi.mock("@/lib/organization/service");
+vi.mock("@/modules/ee/license-check/lib/utils");
+vi.mock("@/tolgee/server");
+vi.mock("next/navigation", () => ({
+  redirect: vi.fn(() => "REDIRECT_STUB"),
+  notFound: vi.fn(() => "NOT_FOUND_STUB"),
+}));
+
+describe("Page component", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  test("redirects to login if no user session", async () => {
+    vi.mocked(getOrganizationAuth).mockResolvedValue({ session: {}, organization: {} } as any);
+
+    const result = await Page({ params: { organizationId: "org1" } });
+
+    expect(redirect).toHaveBeenCalledWith("/auth/login");
+    expect(result).toBe("REDIRECT_STUB");
+  });
+
+  test("returns notFound if user does not exist", async () => {
+    vi.mocked(getOrganizationAuth).mockResolvedValue({
+      session: { user: { id: "user1" } },
+      organization: {},
+    } as any);
+    vi.mocked(getUser).mockResolvedValue(null);
+
+    const result = await Page({ params: { organizationId: "org1" } });
+
+    expect(notFound).toHaveBeenCalled();
+    expect(result).toBe("NOT_FOUND_STUB");
+  });
+
+  test("renders header and sidebar for authenticated user", async () => {
+    vi.mocked(getOrganizationAuth).mockResolvedValue({
+      session: { user: { id: "user1" } },
+      organization: { id: "org1" },
+    } as any);
+    vi.mocked(getUser).mockResolvedValue({ id: "user1", name: "Test User" } as any);
+    vi.mocked(getOrganizationsByUserId).mockResolvedValue([{ id: "org1", name: "Org One" } as any]);
+    vi.mocked(getEnterpriseLicense).mockResolvedValue({ features: { isMultiOrgEnabled: true } } as any);
+    vi.mocked(getTranslate).mockResolvedValue((props: any) =>
+      typeof props === "string" ? props : props.key || ""
+    );
+
+    const element = await Page({ params: { organizationId: "org1" } });
+    render(element as React.ReactElement);
+
+    expect(screen.getByTestId("landing-sidebar")).toBeInTheDocument();
+    expect(screen.getByText("organizations.landing.no_projects_warning_title")).toBeInTheDocument();
+    expect(screen.getByText("organizations.landing.no_projects_warning_subtitle")).toBeInTheDocument();
+  });
+});

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/projects/new/channel/page.test.tsx

@@ -0,0 +1,88 @@
+import { getUserProjects } from "@/lib/project/service";
+import { getOrganizationAuth } from "@/modules/organization/lib/utils";
+import { getTranslate } from "@/tolgee/server";
+import "@testing-library/jest-dom/vitest";
+import { cleanup, render, screen } from "@testing-library/react";
+import { redirect } from "next/navigation";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import Page from "./page";
+
+const mockTranslate = vi.fn((key) => key);
+
+// Module mocks must be declared before importing the component
+vi.mock("@/lib/project/service", () => ({ getUserProjects: vi.fn() }));
+vi.mock("@/modules/organization/lib/utils", () => ({ getOrganizationAuth: vi.fn() }));
+vi.mock("@/tolgee/server", () => ({ getTranslate: vi.fn() }));
+vi.mock("next/navigation", () => ({ redirect: vi.fn(() => "REDIRECT_STUB") }));
+vi.mock("@/modules/ui/components/header", () => ({
+  Header: ({ title, subtitle }: { title: string; subtitle: string }) => (
+    <div>
+      <h1>{title}</h1>
+      <p>{subtitle}</p>
+    </div>
+  ),
+}));
+vi.mock("@/app/(app)/(onboarding)/organizations/components/OnboardingOptionsContainer", () => ({
+  OnboardingOptionsContainer: ({ options }: { options: any[] }) => (
+    <div data-testid="options">{options.map((o) => o.title).join(",")}</div>
+  ),
+}));
+vi.mock("next/link", () => ({
+  default: ({ href, children }: { href: string; children: React.ReactNode }) => <a href={href}>{children}</a>,
+}));
+
+describe("Page component", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  const params = Promise.resolve({ organizationId: "org1" });
+
+  test("redirects to login if no user session", async () => {
+    vi.mocked(getOrganizationAuth).mockResolvedValue({ session: {} } as any);
+
+    const result = await Page({ params });
+
+    expect(redirect).toHaveBeenCalledWith("/auth/login");
+    expect(result).toBe("REDIRECT_STUB");
+  });
+
+  test("renders header, options, and close button when projects exist", async () => {
+    vi.mocked(getOrganizationAuth).mockResolvedValue({ session: { user: { id: "user1" } } } as any);
+    vi.mocked(getTranslate).mockResolvedValue(mockTranslate);
+    vi.mocked(getUserProjects).mockResolvedValue([{ id: 1 }] as any);
+
+    const element = await Page({ params });
+    render(element as React.ReactElement);
+
+    // Header title and subtitle
+    expect(screen.getByRole("heading", { level: 1 })).toHaveTextContent(
+      "organizations.projects.new.channel.channel_select_title"
+    );
+    expect(
+      screen.getByText("organizations.projects.new.channel.channel_select_subtitle")
+    ).toBeInTheDocument();
+
+    // Options container with correct titles
+    expect(screen.getByTestId("options")).toHaveTextContent(
+      "organizations.projects.new.channel.link_and_email_surveys," +
+        "organizations.projects.new.channel.in_product_surveys"
+    );
+
+    // Close button link rendered when projects >=1
+    const closeLink = screen.getByRole("link");
+    expect(closeLink).toHaveAttribute("href", "/");
+  });
+
+  test("does not render close button when no projects", async () => {
+    vi.mocked(getOrganizationAuth).mockResolvedValue({ session: { user: { id: "user1" } } } as any);
+    vi.mocked(getTranslate).mockResolvedValue(mockTranslate);
+    vi.mocked(getUserProjects).mockResolvedValue([]);
+
+    const element = await Page({ params });
+    render(element as React.ReactElement);
+
+    expect(screen.queryByRole("link")).toBeNull();
+  });
+});

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/projects/new/layout.test.tsx

@@ -0,0 +1,220 @@
+import { getMembershipByUserIdOrganizationId } from "@/lib/membership/service";
+import { getOrganization } from "@/lib/organization/service";
+import { getOrganizationProjectsCount } from "@/lib/project/service";
+import { getOrganizationProjectsLimit } from "@/modules/ee/license-check/lib/utils";
+import "@testing-library/jest-dom/vitest";
+import { cleanup } from "@testing-library/react";
+import { getServerSession } from "next-auth";
+import { notFound, redirect } from "next/navigation";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { TMembership } from "@formbricks/types/memberships";
+import { TOrganization } from "@formbricks/types/organizations";
+import OnboardingLayout from "./layout";
+
+// Mock environment variables
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: false,
+  POSTHOG_API_KEY: "mock-posthog-api-key",
+  POSTHOG_HOST: "mock-posthog-host",
+  IS_POSTHOG_CONFIGURED: true,
+  ENCRYPTION_KEY: "mock-encryption-key",
+  ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "test-githubID",
+  GOOGLE_CLIENT_ID: "test-google-client-id",
+  GOOGLE_CLIENT_SECRET: "test-google-client-secret",
+  AZUREAD_CLIENT_ID: "test-azuread-client-id",
+  AZUREAD_CLIENT_SECRET: "test-azure",
+  AZUREAD_TENANT_ID: "test-azuread-tenant-id",
+  OIDC_DISPLAY_NAME: "test-oidc-display-name",
+  OIDC_CLIENT_ID: "test-oidc-client-id",
+  OIDC_ISSUER: "test-oidc-issuer",
+  OIDC_CLIENT_SECRET: "test-oidc-client-secret",
+  OIDC_SIGNING_ALGORITHM: "test-oidc-signing-algorithm",
+  WEBAPP_URL: "test-webapp-url",
+  IS_PRODUCTION: false,
+}));
+
+// Mock dependencies
+vi.mock("next-auth", () => ({
+  getServerSession: vi.fn(),
+}));
+
+vi.mock("@/lib/membership/service", () => ({
+  getMembershipByUserIdOrganizationId: vi.fn(),
+}));
+
+vi.mock("@/lib/organization/service", () => ({
+  getOrganization: vi.fn(),
+}));
+
+vi.mock("@/lib/project/service", () => ({
+  getOrganizationProjectsCount: vi.fn(),
+}));
+
+vi.mock("@/modules/ee/license-check/lib/utils", () => ({
+  getOrganizationProjectsLimit: vi.fn(),
+}));
+
+vi.mock("@/tolgee/server", () => ({
+  getTranslate: async () => (key: string) => key,
+}));
+
+describe("OnboardingLayout", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  test("redirects to login if no session", async () => {
+    vi.mocked(getServerSession).mockResolvedValue(null);
+
+    const props = {
+      params: { organizationId: "test-org-id" },
+      children: <div>Test Child</div>,
+    };
+
+    await OnboardingLayout(props);
+    expect(redirect).toHaveBeenCalledWith("/auth/login");
+  });
+
+  test("returns not found if user is member or billing", async () => {
+    const mockSession = {
+      user: { id: "test-user-id" },
+    };
+    vi.mocked(getServerSession).mockResolvedValue(mockSession as any);
+
+    const mockMembership: TMembership = {
+      organizationId: "test-org-id",
+      userId: "test-user-id",
+      accepted: true,
+      role: "member",
+    };
+    vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValue(mockMembership);
+
+    const props = {
+      params: { organizationId: "test-org-id" },
+      children: <div>Test Child</div>,
+    };
+
+    await OnboardingLayout(props);
+    expect(notFound).toHaveBeenCalled();
+  });
+
+  test("throws error if organization is not found", async () => {
+    const mockSession = {
+      user: { id: "test-user-id" },
+    };
+    vi.mocked(getServerSession).mockResolvedValue(mockSession as any);
+
+    const mockMembership: TMembership = {
+      organizationId: "test-org-id",
+      userId: "test-user-id",
+      accepted: true,
+      role: "owner",
+    };
+    vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValue(mockMembership);
+    vi.mocked(getOrganization).mockResolvedValue(null);
+
+    const props = {
+      params: { organizationId: "test-org-id" },
+      children: <div>Test Child</div>,
+    };
+
+    await expect(OnboardingLayout(props)).rejects.toThrow("common.organization_not_found");
+  });
+
+  test("redirects to home if project limit is reached", async () => {
+    const mockSession = {
+      user: { id: "test-user-id" },
+    };
+    vi.mocked(getServerSession).mockResolvedValue(mockSession as any);
+
+    const mockMembership: TMembership = {
+      organizationId: "test-org-id",
+      userId: "test-user-id",
+      accepted: true,
+      role: "owner",
+    };
+    vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValue(mockMembership);
+
+    const mockOrganization: TOrganization = {
+      id: "test-org-id",
+      name: "Test Org",
+      createdAt: new Date(),
+      updatedAt: new Date(),
+      isAIEnabled: false,
+      billing: {
+        stripeCustomerId: null,
+        plan: "free",
+        period: "monthly",
+        limits: {
+          projects: 3,
+          monthly: {
+            responses: 1500,
+            miu: 2000,
+          },
+        },
+        periodStart: new Date(),
+      },
+    };
+    vi.mocked(getOrganization).mockResolvedValue(mockOrganization);
+    vi.mocked(getOrganizationProjectsLimit).mockResolvedValue(3);
+    vi.mocked(getOrganizationProjectsCount).mockResolvedValue(3);
+
+    const props = {
+      params: { organizationId: "test-org-id" },
+      children: <div>Test Child</div>,
+    };
+
+    await OnboardingLayout(props);
+    expect(redirect).toHaveBeenCalledWith("/");
+  });
+
+  test("renders children when all conditions are met", async () => {
+    const mockSession = {
+      user: { id: "test-user-id" },
+    };
+    vi.mocked(getServerSession).mockResolvedValue(mockSession as any);
+
+    const mockMembership: TMembership = {
+      organizationId: "test-org-id",
+      userId: "test-user-id",
+      accepted: true,
+      role: "owner",
+    };
+    vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValue(mockMembership);
+
+    const mockOrganization: TOrganization = {
+      id: "test-org-id",
+      name: "Test Org",
+      createdAt: new Date(),
+      updatedAt: new Date(),
+      isAIEnabled: false,
+      billing: {
+        stripeCustomerId: null,
+        plan: "free",
+        period: "monthly",
+        limits: {
+          projects: 3,
+          monthly: {
+            responses: 1500,
+            miu: 2000,
+          },
+        },
+        periodStart: new Date(),
+      },
+    };
+    vi.mocked(getOrganization).mockResolvedValue(mockOrganization);
+    vi.mocked(getOrganizationProjectsLimit).mockResolvedValue(3);
+    vi.mocked(getOrganizationProjectsCount).mockResolvedValue(2);
+
+    const props = {
+      params: { organizationId: "test-org-id" },
+      children: <div>Test Child</div>,
+    };
+
+    const result = await OnboardingLayout(props);
+    expect(result).toEqual(<>{props.children}</>);
+  });
+});

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/projects/new/mode/page.test.tsx

@@ -0,0 +1,72 @@
+import { getUserProjects } from "@/lib/project/service";
+import { getOrganizationAuth } from "@/modules/organization/lib/utils";
+import { getTranslate } from "@/tolgee/server";
+import "@testing-library/jest-dom/vitest";
+import { cleanup, render, screen } from "@testing-library/react";
+import { redirect } from "next/navigation";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import Page from "./page";
+
+const mockTranslate = vi.fn((key) => key);
+
+vi.mock("@/modules/organization/lib/utils", () => ({ getOrganizationAuth: vi.fn() }));
+vi.mock("@/lib/project/service", () => ({ getUserProjects: vi.fn() }));
+vi.mock("@/tolgee/server", () => ({ getTranslate: vi.fn() }));
+vi.mock("next/navigation", () => ({ redirect: vi.fn() }));
+vi.mock("next/link", () => ({
+  __esModule: true,
+  default: ({ href, children }: any) => <a href={href}>{children}</a>,
+}));
+vi.mock("@/app/(app)/(onboarding)/organizations/components/OnboardingOptionsContainer", () => ({
+  OnboardingOptionsContainer: ({ options }: any) => (
+    <div data-testid="options">{options.map((o: any) => o.title).join(",")}</div>
+  ),
+}));
+vi.mock("@/modules/ui/components/header", () => ({ Header: ({ title }: any) => <h1>{title}</h1> }));
+vi.mock("@/modules/ui/components/button", () => ({
+  Button: ({ children, ...props }: any) => <button {...props}>{children}</button>,
+}));
+
+describe("Mode Page", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  const params = Promise.resolve({ organizationId: "org1" });
+
+  test("redirects to login if no session user", async () => {
+    vi.mocked(getOrganizationAuth).mockResolvedValueOnce({ session: {} } as any);
+    await Page({ params });
+    expect(redirect).toHaveBeenCalledWith("/auth/login");
+  });
+
+  test("renders header and options without close link when no projects", async () => {
+    vi.mocked(getOrganizationAuth).mockResolvedValueOnce({ session: { user: { id: "u1" } } } as any);
+    vi.mocked(getTranslate).mockResolvedValue(mockTranslate);
+    vi.mocked(getUserProjects).mockResolvedValueOnce([] as any);
+
+    const element = await Page({ params });
+    render(element as React.ReactElement);
+
+    expect(screen.getByRole("heading", { level: 1 })).toHaveTextContent(
+      "organizations.projects.new.mode.what_are_you_here_for"
+    );
+    expect(screen.getByTestId("options")).toHaveTextContent(
+      "organizations.projects.new.mode.formbricks_surveys," + "organizations.projects.new.mode.formbricks_cx"
+    );
+    expect(screen.queryByRole("link")).toBeNull();
+  });
+
+  test("renders close link when projects exist", async () => {
+    vi.mocked(getOrganizationAuth).mockResolvedValueOnce({ session: { user: { id: "u1" } } } as any);
+    vi.mocked(getTranslate).mockResolvedValue(mockTranslate);
+    vi.mocked(getUserProjects).mockResolvedValueOnce([{ id: "p1" } as any]);
+
+    const element = await Page({ params });
+    render(element as React.ReactElement);
+
+    const link = screen.getByRole("link");
+    expect(link).toHaveAttribute("href", "/");
+  });
+});

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/projects/new/mode/page.tsx

@@ -47,7 +47,7 @@ const Page = async (props: ModePageProps) => {
       <OnboardingOptionsContainer options={channelOptions} />
       {projects.length >= 1 && (
         <Button
-          className="absolute top-5 right-5 !mt-0 text-slate-500 hover:text-slate-700"
+          className="absolute right-5 top-5 !mt-0 text-slate-500 hover:text-slate-700"
           variant="ghost"
           asChild>
           <Link href={"/"}>

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/projects/new/settings/components/ProjectSettings.test.tsx

@@ -0,0 +1,124 @@
+import { createProjectAction } from "@/app/(app)/environments/[environmentId]/actions";
+import "@testing-library/jest-dom/vitest";
+import { cleanup, render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { toast } from "react-hot-toast";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { ProjectSettings } from "./ProjectSettings";
+
+// Mocks before imports
+const pushMock = vi.fn();
+vi.mock("next/navigation", () => ({ useRouter: () => ({ push: pushMock }) }));
+vi.mock("@tolgee/react", () => ({ useTranslate: () => ({ t: (key: string) => key }) }));
+vi.mock("react-hot-toast", () => ({ toast: { error: vi.fn() } }));
+vi.mock("@/app/(app)/environments/[environmentId]/actions", () => ({ createProjectAction: vi.fn() }));
+vi.mock("@/lib/utils/helper", () => ({ getFormattedErrorMessage: () => "formatted-error" }));
+vi.mock("@/modules/ui/components/color-picker", () => ({
+  ColorPicker: ({ color, onChange }: any) => (
+    <button data-testid="color-picker" onClick={() => onChange("#000")}>
+      {color}
+    </button>
+  ),
+}));
+vi.mock("@/modules/ui/components/input", () => ({
+  Input: ({ value, onChange, placeholder }: any) => (
+    <input placeholder={placeholder} value={value} onChange={(e) => onChange((e.target as any).value)} />
+  ),
+}));
+vi.mock("@/modules/ui/components/multi-select", () => ({
+  MultiSelect: ({ value, options, onChange }: any) => (
+    <select
+      data-testid="multi-select"
+      multiple
+      value={value}
+      onChange={(e) => onChange(Array.from((e.target as any).selectedOptions).map((o: any) => o.value))}>
+      {options.map((o: any) => (
+        <option key={o.value} value={o.value}>
+          {o.label}
+        </option>
+      ))}
+    </select>
+  ),
+}));
+vi.mock("@/modules/ui/components/survey", () => ({
+  SurveyInline: () => <div data-testid="survey-inline" />,
+}));
+vi.mock("@/lib/templates", () => ({ previewSurvey: () => ({}) }));
+vi.mock("@/modules/ee/teams/team-list/components/create-team-modal", () => ({
+  CreateTeamModal: ({ open }: any) => <div data-testid={open ? "team-modal-open" : "team-modal-closed"} />,
+}));
+
+// Clean up after each test
+afterEach(() => {
+  cleanup();
+  vi.clearAllMocks();
+  localStorage.clear();
+});
+
+describe("ProjectSettings component", () => {
+  const baseProps = {
+    organizationId: "org1",
+    projectMode: "cx",
+    industry: "ind",
+    defaultBrandColor: "#fff",
+    organizationTeams: [],
+    canDoRoleManagement: false,
+    userProjectsCount: 0,
+  } as any;
+
+  const fillAndSubmit = async () => {
+    const nameInput = screen.getByPlaceholderText("e.g. Formbricks");
+    await userEvent.clear(nameInput);
+    await userEvent.type(nameInput, "TestProject");
+    const nextButton = screen.getByRole("button", { name: "common.next" });
+    await userEvent.click(nextButton);
+  };
+
+  test("successful createProject for link channel navigates to surveys and clears localStorage", async () => {
+    (createProjectAction as any).mockResolvedValue({
+      data: { environments: [{ id: "env123", type: "production" }] },
+    });
+    render(<ProjectSettings {...baseProps} channel="link" projectMode="cx" />);
+    await fillAndSubmit();
+    expect(createProjectAction).toHaveBeenCalledWith({
+      organizationId: "org1",
+      data: expect.objectContaining({ teamIds: [] }),
+    });
+    expect(pushMock).toHaveBeenCalledWith("/environments/env123/surveys");
+    expect(localStorage.getItem("FORMBRICKS_SURVEYS_FILTERS_KEY_LS")).toBeNull();
+  });
+
+  test("successful createProject for app channel navigates to connect", async () => {
+    (createProjectAction as any).mockResolvedValue({
+      data: { environments: [{ id: "env456", type: "production" }] },
+    });
+    render(<ProjectSettings {...baseProps} channel="app" projectMode="cx" />);
+    await fillAndSubmit();
+    expect(pushMock).toHaveBeenCalledWith("/environments/env456/connect");
+  });
+
+  test("successful createProject for cx mode navigates to xm-templates when channel is neither link nor app", async () => {
+    (createProjectAction as any).mockResolvedValue({
+      data: { environments: [{ id: "env789", type: "production" }] },
+    });
+    render(<ProjectSettings {...baseProps} channel="unknown" projectMode="cx" />);
+    await fillAndSubmit();
+    expect(pushMock).toHaveBeenCalledWith("/environments/env789/xm-templates");
+  });
+
+  test("shows error toast on createProject error response", async () => {
+    (createProjectAction as any).mockResolvedValue({ error: "err" });
+    render(<ProjectSettings {...baseProps} channel="link" projectMode="cx" />);
+    await fillAndSubmit();
+    expect(toast.error).toHaveBeenCalledWith("formatted-error");
+  });
+
+  test("shows error toast on exception", async () => {
+    (createProjectAction as any).mockImplementation(() => {
+      throw new Error("fail");
+    });
+    render(<ProjectSettings {...baseProps} channel="link" projectMode="cx" />);
+    await fillAndSubmit();
+    expect(toast.error).toHaveBeenCalledWith("organizations.projects.new.settings.project_creation_failed");
+  });
+});

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/projects/new/settings/page.test.tsx

@@ -0,0 +1,106 @@
+import { getTeamsByOrganizationId } from "@/app/(app)/(onboarding)/lib/onboarding";
+import { getUserProjects } from "@/lib/project/service";
+import { getRoleManagementPermission } from "@/modules/ee/license-check/lib/utils";
+import { getOrganizationAuth } from "@/modules/organization/lib/utils";
+import "@testing-library/jest-dom/vitest";
+import { cleanup, render, screen } from "@testing-library/react";
+import { redirect } from "next/navigation";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import Page from "./page";
+
+vi.mock("@/lib/constants", () => ({ DEFAULT_BRAND_COLOR: "#fff" }));
+// Mocks before component import
+vi.mock("@/app/(app)/(onboarding)/lib/onboarding", () => ({ getTeamsByOrganizationId: vi.fn() }));
+vi.mock("@/lib/project/service", () => ({ getUserProjects: vi.fn() }));
+vi.mock("@/modules/ee/license-check/lib/utils", () => ({ getRoleManagementPermission: vi.fn() }));
+vi.mock("@/modules/organization/lib/utils", () => ({ getOrganizationAuth: vi.fn() }));
+vi.mock("@/tolgee/server", () => ({ getTranslate: () => Promise.resolve((key: string) => key) }));
+vi.mock("next/navigation", () => ({ redirect: vi.fn() }));
+vi.mock("next/link", () => ({
+  __esModule: true,
+  default: ({ href, children }: any) => <a href={href}>{children}</a>,
+}));
+vi.mock("@/modules/ui/components/header", () => ({
+  Header: ({ title, subtitle }: any) => (
+    <div>
+      <h1>{title}</h1>
+      <p>{subtitle}</p>
+    </div>
+  ),
+}));
+vi.mock("@/modules/ui/components/button", () => ({
+  Button: ({ children, ...props }: any) => <button {...props}>{children}</button>,
+}));
+vi.mock(
+  "@/app/(app)/(onboarding)/organizations/[organizationId]/projects/new/settings/components/ProjectSettings",
+  () => ({
+    ProjectSettings: (props: any) => <div data-testid="project-settings" data-mode={props.projectMode} />,
+  })
+);
+
+// Cleanup after each test
+afterEach(() => {
+  cleanup();
+  vi.clearAllMocks();
+});
+
+describe("ProjectSettingsPage", () => {
+  const params = Promise.resolve({ organizationId: "org1" });
+  const searchParams = Promise.resolve({ channel: "link", industry: "other", mode: "cx" } as any);
+
+  test("redirects to login when no session user", async () => {
+    vi.mocked(getOrganizationAuth).mockResolvedValueOnce({ session: {} } as any);
+    await Page({ params, searchParams });
+    expect(redirect).toHaveBeenCalledWith("/auth/login");
+  });
+
+  test("throws when teams not found", async () => {
+    vi.mocked(getOrganizationAuth).mockResolvedValueOnce({
+      session: { user: { id: "u1" } },
+      organization: { billing: { plan: "basic" } },
+    } as any);
+    vi.mocked(getUserProjects).mockResolvedValueOnce([] as any);
+    vi.mocked(getTeamsByOrganizationId).mockResolvedValueOnce(null as any);
+    vi.mocked(getRoleManagementPermission).mockResolvedValueOnce(false as any);
+
+    await expect(Page({ params, searchParams })).rejects.toThrow("common.organization_teams_not_found");
+  });
+
+  test("renders header, settings and close link when projects exist", async () => {
+    vi.mocked(getOrganizationAuth).mockResolvedValueOnce({
+      session: { user: { id: "u1" } },
+      organization: { billing: { plan: "basic" } },
+    } as any);
+    vi.mocked(getUserProjects).mockResolvedValueOnce([{ id: "p1" }] as any);
+    vi.mocked(getTeamsByOrganizationId).mockResolvedValueOnce([{ id: "t1", name: "Team1" }] as any);
+    vi.mocked(getRoleManagementPermission).mockResolvedValueOnce(true as any);
+
+    const element = await Page({ params, searchParams });
+    render(element as React.ReactElement);
+
+    // Header
+    expect(screen.getByRole("heading", { level: 1 })).toHaveTextContent(
+      "organizations.projects.new.settings.project_settings_title"
+    );
+    // ProjectSettings stub receives mode prop
+    expect(screen.getByTestId("project-settings")).toHaveAttribute("data-mode", "cx");
+    // Close link for existing projects
+    const link = screen.getByRole("link");
+    expect(link).toHaveAttribute("href", "/");
+  });
+
+  test("renders without close link when no projects", async () => {
+    vi.mocked(getOrganizationAuth).mockResolvedValueOnce({
+      session: { user: { id: "u1" } },
+      organization: { billing: { plan: "basic" } },
+    } as any);
+    vi.mocked(getUserProjects).mockResolvedValueOnce([] as any);
+    vi.mocked(getTeamsByOrganizationId).mockResolvedValueOnce([{ id: "t1", name: "Team1" }] as any);
+    vi.mocked(getRoleManagementPermission).mockResolvedValueOnce(true as any);
+
+    const element = await Page({ params, searchParams });
+    render(element as React.ReactElement);
+
+    expect(screen.queryByRole("link")).toBeNull();
+  });
+});

apps/web/app/(app)/(onboarding)/organizations/components/OnboardingOptionsContainer.test.tsx

@@ -0,0 +1,106 @@
+import "@testing-library/jest-dom/vitest";
+import { cleanup, render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { Home, Settings } from "lucide-react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { OnboardingOptionsContainer } from "./OnboardingOptionsContainer";
+
+describe("OnboardingOptionsContainer", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  test("renders options with links", () => {
+    const options = [
+      {
+        title: "Test Option",
+        description: "Test Description",
+        icon: Home,
+        href: "/test",
+      },
+    ];
+
+    render(<OnboardingOptionsContainer options={options} />);
+    expect(screen.getByText("Test Option")).toBeInTheDocument();
+    expect(screen.getByText("Test Description")).toBeInTheDocument();
+  });
+
+  test("renders options with onClick handler", () => {
+    const onClickMock = vi.fn();
+    const options = [
+      {
+        title: "Click Option",
+        description: "Click Description",
+        icon: Home,
+        onClick: onClickMock,
+      },
+    ];
+
+    render(<OnboardingOptionsContainer options={options} />);
+    expect(screen.getByText("Click Option")).toBeInTheDocument();
+    expect(screen.getByText("Click Description")).toBeInTheDocument();
+  });
+
+  test("renders options with iconText", () => {
+    const options = [
+      {
+        title: "Icon Text Option",
+        description: "Icon Text Description",
+        icon: Home,
+        iconText: "Custom Icon Text",
+      },
+    ];
+
+    render(<OnboardingOptionsContainer options={options} />);
+    expect(screen.getByText("Custom Icon Text")).toBeInTheDocument();
+  });
+
+  test("renders options with loading state", () => {
+    const options = [
+      {
+        title: "Loading Option",
+        description: "Loading Description",
+        icon: Home,
+        isLoading: true,
+      },
+    ];
+
+    render(<OnboardingOptionsContainer options={options} />);
+    expect(screen.getByText("Loading Option")).toBeInTheDocument();
+  });
+
+  test("renders multiple options", () => {
+    const options = [
+      {
+        title: "First Option",
+        description: "First Description",
+        icon: Home,
+      },
+      {
+        title: "Second Option",
+        description: "Second Description",
+        icon: Settings,
+      },
+    ];
+
+    render(<OnboardingOptionsContainer options={options} />);
+    expect(screen.getByText("First Option")).toBeInTheDocument();
+    expect(screen.getByText("Second Option")).toBeInTheDocument();
+  });
+
+  test("calls onClick handler when clicking an option", async () => {
+    const onClickMock = vi.fn();
+    const options = [
+      {
+        title: "Click Option",
+        description: "Click Description",
+        icon: Home,
+        onClick: onClickMock,
+      },
+    ];
+
+    render(<OnboardingOptionsContainer options={options} />);
+    await userEvent.click(screen.getByText("Click Option"));
+    expect(onClickMock).toHaveBeenCalledTimes(1);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/actions/loading.tsx

@@ -33,7 +33,7 @@ const Loading = () => {
                   </div>
                 </div>
               </div>
-              <div className="col-span-2 my-auto flex justify-center text-center text-sm whitespace-nowrap text-slate-500">
+              <div className="col-span-2 my-auto flex justify-center whitespace-nowrap text-center text-sm text-slate-500">
                 <div className="h-4 w-28 animate-pulse rounded-full bg-slate-200"></div>
               </div>
             </div>

apps/web/app/(app)/environments/[environmentId]/components/MainNavigation.tsx

@@ -264,7 +264,7 @@ export const MainNavigation = ({
                 size="icon"
                 onClick={toggleSidebar}
                 className={cn(
-                  "rounded-xl bg-slate-50 p-1 text-slate-600 transition-all hover:bg-slate-100 focus:ring-0 focus:ring-transparent focus:outline-none"
+                  "rounded-xl bg-slate-50 p-1 text-slate-600 transition-all hover:bg-slate-100 focus:outline-none focus:ring-0 focus:ring-transparent"
                 )}>
                 {isCollapsed ? (
                   <PanelLeftOpenIcon strokeWidth={1.5} />

apps/web/app/(app)/environments/[environmentId]/integrations/airtable/components/AddIntegrationModal.test.tsx

@@ -0,0 +1,456 @@
+import { createOrUpdateIntegrationAction } from "@/app/(app)/environments/[environmentId]/integrations/actions";
+import { fetchTables } from "@/app/(app)/environments/[environmentId]/integrations/airtable/lib/airtable";
+import { cleanup, render, screen, waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { useRouter } from "next/navigation";
+import { toast } from "react-hot-toast";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TIntegrationItem } from "@formbricks/types/integration";
+import {
+  TIntegrationAirtable,
+  TIntegrationAirtableConfigData,
+  TIntegrationAirtableCredential,
+  TIntegrationAirtableTables,
+} from "@formbricks/types/integration/airtable";
+import { TSurvey } from "@formbricks/types/surveys/types";
+import { AddIntegrationModal } from "./AddIntegrationModal";
+
+// Mock dependencies
+vi.mock("@/app/(app)/environments/[environmentId]/integrations/actions", () => ({
+  createOrUpdateIntegrationAction: vi.fn(),
+}));
+vi.mock(
+  "@/app/(app)/environments/[environmentId]/integrations/airtable/components/BaseSelectDropdown",
+  () => ({
+    BaseSelectDropdown: ({ control, airtableArray, fetchTable, defaultValue, setValue }) => (
+      <div>
+        <label htmlFor="base">Base</label>
+        <select
+          id="base"
+          defaultValue={defaultValue}
+          onChange={(e) => {
+            control._mockOnChange({ target: { name: "base", value: e.target.value } });
+            setValue("table", ""); // Reset table when base changes
+            fetchTable(e.target.value);
+          }}>
+          <option value="">Select Base</option>
+          {airtableArray.map((item) => (
+            <option key={item.id} value={item.id}>
+              {item.name}
+            </option>
+          ))}
+        </select>
+      </div>
+    ),
+  })
+);
+vi.mock("@/app/(app)/environments/[environmentId]/integrations/airtable/lib/airtable", () => ({
+  fetchTables: vi.fn(),
+}));
+vi.mock("@/lib/i18n/utils", () => ({
+  getLocalizedValue: (value, _locale) => value?.default || value || "",
+}));
+vi.mock("@/lib/utils/recall", () => ({
+  replaceHeadlineRecall: (survey, _locale) => survey,
+}));
+vi.mock("@/modules/ui/components/additional-integration-settings", () => ({
+  AdditionalIntegrationSettings: ({
+    includeVariables,
+    setIncludeVariables,
+    includeHiddenFields,
+    setIncludeHiddenFields,
+    includeMetadata,
+    setIncludeMetadata,
+    includeCreatedAt,
+    setIncludeCreatedAt,
+  }) => (
+    <div data-testid="additional-settings">
+      <input
+        type="checkbox"
+        data-testid="include-variables"
+        checked={includeVariables}
+        onChange={(e) => setIncludeVariables(e.target.checked)}
+      />
+      <input
+        type="checkbox"
+        data-testid="include-hidden"
+        checked={includeHiddenFields}
+        onChange={(e) => setIncludeHiddenFields(e.target.checked)}
+      />
+      <input
+        type="checkbox"
+        data-testid="include-metadata"
+        checked={includeMetadata}
+        onChange={(e) => setIncludeMetadata(e.target.checked)}
+      />
+      <input
+        type="checkbox"
+        data-testid="include-createdat"
+        checked={includeCreatedAt}
+        onChange={(e) => setIncludeCreatedAt(e.target.checked)}
+      />
+    </div>
+  ),
+}));
+vi.mock("@/modules/ui/components/modal", () => ({
+  Modal: ({ children, open, setOpen }) =>
+    open ? (
+      <div data-testid="modal">
+        {children}
+        <button onClick={() => setOpen(false)}>Close Modal</button>
+      </div>
+    ) : null,
+}));
+vi.mock("@/modules/ui/components/alert", () => ({
+  Alert: ({ children }) => <div data-testid="alert">{children}</div>,
+  AlertTitle: ({ children }) => <div data-testid="alert-title">{children}</div>,
+  AlertDescription: ({ children }) => <div data-testid="alert-description">{children}</div>,
+}));
+vi.mock("next/image", () => ({
+  // eslint-disable-next-line @next/next/no-img-element
+  default: (props) => <img alt="test" {...props} />,
+}));
+vi.mock("next/navigation", () => ({
+  useRouter: vi.fn(() => ({ refresh: vi.fn() })),
+}));
+
+// Mock the Select component used for Table and Survey selections
+vi.mock("@/modules/ui/components/select", () => ({
+  Select: ({ children }) => (
+    // Render children, assuming Controller passes props to the Trigger/Value
+    // The actual select logic will be handled by the mocked Controller/field
+    // We need to simulate the structure expected by the Controller render prop
+    <div>{children}</div>
+  ),
+  SelectTrigger: ({ children, ...props }) => <div {...props}>{children}</div>, // Mock Trigger
+  SelectValue: ({ placeholder }) => <span>{placeholder || "Select..."}</span>, // Mock Value display
+  SelectContent: ({ children }) => <div>{children}</div>, // Mock Content wrapper
+  SelectItem: ({ children, value, ...props }) => (
+    // Mock Item - crucial for userEvent.selectOptions if we were using a real select
+    // For Controller, the value change is handled by field.onChange directly
+    <div data-value={value} {...props}>
+      {children}
+    </div>
+  ),
+}));
+
+// Mock react-hook-form Controller to render a simple select
+vi.mock("react-hook-form", async () => {
+  const actual = await vi.importActual("react-hook-form");
+  let fields = {};
+  const mockReset = vi.fn((values) => {
+    fields = values || {}; // Reset fields, optionally with new values
+  });
+
+  return {
+    ...actual,
+    useForm: vi.fn((options) => {
+      fields = options?.defaultValues || {};
+      const mockControlOnChange = (event) => {
+        if (event && event.target) {
+          fields[event.target.name] = event.target.value;
+        }
+      };
+      return {
+        handleSubmit: (fn) => (e) => {
+          e?.preventDefault();
+          fn(fields);
+        },
+        control: {
+          _mockOnChange: mockControlOnChange,
+          // Add other necessary control properties if needed
+          register: vi.fn(),
+          unregister: vi.fn(),
+          getFieldState: vi.fn(() => ({ invalid: false, isDirty: false, isTouched: false, error: null })),
+          _names: { mount: new Set(), unMount: new Set(), array: new Set(), watch: new Set() },
+          _options: {},
+          _proxyFormState: {
+            isDirty: false,
+            isValidating: false,
+            dirtyFields: {},
+            touchedFields: {},
+            errors: {},
+          },
+          _formState: { isDirty: false, isValidating: false, dirtyFields: {}, touchedFields: {}, errors: {} },
+          _updateFormState: vi.fn(),
+          _updateFieldArray: vi.fn(),
+          _executeSchema: vi.fn().mockResolvedValue({ errors: {}, values: {} }),
+          _getWatch: vi.fn(),
+          _subjects: {
+            watch: { subscribe: vi.fn() },
+            array: { subscribe: vi.fn() },
+            state: { subscribe: vi.fn() },
+          },
+          _getDirty: vi.fn(),
+          _reset: vi.fn(),
+          _removeUnmounted: vi.fn(),
+        },
+        watch: (name) => fields[name],
+        setValue: (name, value) => {
+          fields[name] = value;
+        },
+        reset: mockReset,
+        formState: { errors: {}, isDirty: false, isValid: true, isSubmitting: false },
+        getValues: (name) => (name ? fields[name] : fields),
+      };
+    }),
+    Controller: ({ name, defaultValue }) => {
+      // Initialize field value if not already set by reset/defaultValues
+      if (fields[name] === undefined && defaultValue !== undefined) {
+        fields[name] = defaultValue;
+      }
+
+      const field = {
+        onChange: (valueOrEvent) => {
+          const value = valueOrEvent?.target ? valueOrEvent.target.value : valueOrEvent;
+          fields[name] = value;
+          // Re-render might be needed here in a real scenario, but testing library handles it
+        },
+        onBlur: vi.fn(),
+        value: fields[name],
+        name: name,
+        ref: vi.fn(),
+      };
+
+      // Find the corresponding label to associate with the select
+      const labelId = name; // Assuming label 'for' matches field name
+      const labelText =
+        name === "table" ? "environments.integrations.airtable.table_name" : "common.select_survey";
+
+      // Render a simple select element instead of the complex component
+      // This makes interaction straightforward with userEvent.selectOptions
+      return (
+        <>
+          {/* The actual label is rendered outside the Controller in the component */}
+          <select
+            id={labelId}
+            aria-label={labelText} // Use aria-label for accessibility in tests
+            {...field} // Spread field props
+            defaultValue={defaultValue} // Pass defaultValue
+          >
+            {/* Need to dynamically get options based on context, simplified here */}
+            {name === "table" &&
+              mockTables.map((t) => (
+                <option key={t.id} value={t.id}>
+                  {t.name}
+                </option>
+              ))}
+            {name === "survey" &&
+              mockSurveys.map((s) => (
+                <option key={s.id} value={s.id}>
+                  {s.name}
+                </option>
+              ))}
+          </select>
+        </>
+      );
+    },
+    reset: mockReset,
+  };
+});
+
+const environmentId = "test-env-id";
+const mockSurveys: TSurvey[] = [
+  {
+    id: "survey1",
+    name: "Survey 1",
+    questions: [
+      { id: "q1", headline: { default: "Question 1" } },
+      { id: "q2", headline: { default: "Question 2" } },
+    ],
+    hiddenFields: { enabled: true, fieldIds: ["hf1"] },
+    variables: { enabled: true, fieldIds: ["var1"] },
+  } as any,
+  {
+    id: "survey2",
+    name: "Survey 2",
+    questions: [{ id: "q3", headline: { default: "Question 3" } }],
+    hiddenFields: { enabled: false },
+    variables: { enabled: false },
+  } as any,
+];
+const mockAirtableArray: TIntegrationItem[] = [
+  { id: "base1", name: "Base 1" },
+  { id: "base2", name: "Base 2" },
+];
+const mockAirtableIntegration: TIntegrationAirtable = {
+  id: "integration1",
+  type: "airtable",
+  environmentId,
+  config: {
+    key: { access_token: "abc" } as TIntegrationAirtableCredential,
+    email: "test@test.com",
+    data: [],
+  },
+};
+const mockTables: TIntegrationAirtableTables["tables"] = [
+  { id: "table1", name: "Table 1" },
+  { id: "table2", name: "Table 2" },
+];
+const mockSetOpenWithStates = vi.fn();
+const mockRouterRefresh = vi.fn();
+
+describe("AddIntegrationModal", () => {
+  beforeEach(async () => {
+    vi.clearAllMocks();
+    vi.mocked(useRouter).mockReturnValue({ refresh: mockRouterRefresh } as any);
+  });
+
+  afterEach(() => {
+    cleanup();
+  });
+
+  test("renders in add mode correctly", () => {
+    render(
+      <AddIntegrationModal
+        open={true}
+        setOpenWithStates={mockSetOpenWithStates}
+        environmentId={environmentId}
+        airtableArray={mockAirtableArray}
+        surveys={mockSurveys}
+        airtableIntegration={mockAirtableIntegration}
+        isEditMode={false}
+      />
+    );
+
+    expect(screen.getByText("environments.integrations.airtable.link_airtable_table")).toBeInTheDocument();
+    expect(screen.getByLabelText("Base")).toBeInTheDocument();
+    // Use getByLabelText for the mocked selects
+    expect(screen.getByLabelText("environments.integrations.airtable.table_name")).toBeInTheDocument();
+    expect(screen.getByLabelText("common.select_survey")).toBeInTheDocument();
+    expect(screen.getByText("common.save")).toBeInTheDocument();
+    expect(screen.getByText("common.cancel")).toBeInTheDocument();
+    expect(screen.queryByText("common.delete")).not.toBeInTheDocument();
+  });
+
+  test("shows 'No Base Found' error when airtableArray is empty", () => {
+    render(
+      <AddIntegrationModal
+        open={true}
+        setOpenWithStates={mockSetOpenWithStates}
+        environmentId={environmentId}
+        airtableArray={[]}
+        surveys={mockSurveys}
+        airtableIntegration={mockAirtableIntegration}
+        isEditMode={false}
+      />
+    );
+    expect(screen.getByTestId("alert-title")).toHaveTextContent(
+      "environments.integrations.airtable.no_bases_found"
+    );
+  });
+
+  test("shows 'No Surveys Found' warning when surveys array is empty", () => {
+    render(
+      <AddIntegrationModal
+        open={true}
+        setOpenWithStates={mockSetOpenWithStates}
+        environmentId={environmentId}
+        airtableArray={mockAirtableArray}
+        surveys={[]}
+        airtableIntegration={mockAirtableIntegration}
+        isEditMode={false}
+      />
+    );
+    expect(screen.getByText("environments.integrations.create_survey_warning")).toBeInTheDocument();
+  });
+
+  test("fetches and displays tables when a base is selected", async () => {
+    vi.mocked(fetchTables).mockResolvedValue({ tables: mockTables });
+    render(
+      <AddIntegrationModal
+        open={true}
+        setOpenWithStates={mockSetOpenWithStates}
+        environmentId={environmentId}
+        airtableArray={mockAirtableArray}
+        surveys={mockSurveys}
+        airtableIntegration={mockAirtableIntegration}
+        isEditMode={false}
+      />
+    );
+
+    const baseSelect = screen.getByLabelText("Base");
+    await userEvent.selectOptions(baseSelect, "base1");
+
+    expect(fetchTables).toHaveBeenCalledWith(environmentId, "base1");
+    await waitFor(() => {
+      // Use getByLabelText (mocked select)
+      const tableSelect = screen.getByLabelText("environments.integrations.airtable.table_name");
+      expect(tableSelect).toBeEnabled();
+      // Check options within the mocked select
+      expect(tableSelect.querySelector("option[value='table1']")).toBeInTheDocument();
+      expect(tableSelect.querySelector("option[value='table2']")).toBeInTheDocument();
+    });
+  });
+
+  test("handles deletion in edit mode", async () => {
+    const initialData: TIntegrationAirtableConfigData = {
+      baseId: "base1",
+      tableId: "table1",
+      surveyId: "survey1",
+      questionIds: ["q1"],
+      questions: "common.selected_questions",
+      tableName: "Table 1",
+      surveyName: "Survey 1",
+      createdAt: new Date(),
+      includeVariables: false,
+      includeHiddenFields: false,
+      includeMetadata: false,
+      includeCreatedAt: true,
+    };
+    const integrationWithData = {
+      ...mockAirtableIntegration,
+      config: { ...mockAirtableIntegration.config, data: [initialData] },
+    };
+    const defaultData = { ...initialData, index: 0 } as any;
+
+    vi.mocked(fetchTables).mockResolvedValue({ tables: mockTables });
+    vi.mocked(createOrUpdateIntegrationAction).mockResolvedValue({ ok: true, data: {} } as any);
+
+    render(
+      <AddIntegrationModal
+        open={true}
+        setOpenWithStates={mockSetOpenWithStates}
+        environmentId={environmentId}
+        airtableArray={mockAirtableArray}
+        surveys={mockSurveys}
+        airtableIntegration={integrationWithData}
+        isEditMode={true}
+        defaultData={defaultData}
+      />
+    );
+
+    await waitFor(() => expect(fetchTables).toHaveBeenCalled()); // Wait for initial load
+
+    // Click delete
+    await userEvent.click(screen.getByText("common.delete"));
+
+    await waitFor(() => {
+      expect(createOrUpdateIntegrationAction).toHaveBeenCalledTimes(1);
+      const submittedData = vi.mocked(createOrUpdateIntegrationAction).mock.calls[0][0].integrationData;
+      // Expect data array to be empty after deletion
+      expect(submittedData.config.data).toHaveLength(0);
+    });
+
+    expect(toast.success).toHaveBeenCalledWith("environments.integrations.integration_removed_successfully");
+    expect(mockSetOpenWithStates).toHaveBeenCalledWith(false);
+    expect(mockRouterRefresh).toHaveBeenCalled();
+  });
+
+  test("handles cancel button click", async () => {
+    render(
+      <AddIntegrationModal
+        open={true}
+        setOpenWithStates={mockSetOpenWithStates}
+        environmentId={environmentId}
+        airtableArray={mockAirtableArray}
+        surveys={mockSurveys}
+        airtableIntegration={mockAirtableIntegration}
+        isEditMode={false}
+      />
+    );
+
+    await userEvent.click(screen.getByText("common.cancel"));
+    expect(mockSetOpenWithStates).toHaveBeenCalledWith(false);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/integrations/airtable/components/AirtableWrapper.test.tsx

@@ -0,0 +1,134 @@
+import { authorize } from "@/app/(app)/environments/[environmentId]/integrations/airtable/lib/airtable";
+import { cleanup, render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TIntegrationAirtable } from "@formbricks/types/integration/airtable";
+import { AirtableWrapper } from "./AirtableWrapper";
+
+// Mock child components
+vi.mock(
+  "@/app/(app)/environments/[environmentId]/integrations/airtable/components/ManageIntegration",
+  () => ({
+    ManageIntegration: ({ setIsConnected }) => (
+      <div data-testid="manage-integration">
+        <button onClick={() => setIsConnected(false)}>Disconnect</button>
+      </div>
+    ),
+  })
+);
+vi.mock("@/modules/ui/components/connect-integration", () => ({
+  ConnectIntegration: ({ handleAuthorization, isEnabled }) => (
+    <div data-testid="connect-integration">
+      <button onClick={handleAuthorization} disabled={!isEnabled}>
+        Connect
+      </button>
+    </div>
+  ),
+}));
+
+// Mock library function
+vi.mock("@/app/(app)/environments/[environmentId]/integrations/airtable/lib/airtable", () => ({
+  authorize: vi.fn(),
+}));
+
+// Mock image import
+vi.mock("@/images/airtableLogo.svg", () => ({
+  default: "airtable-logo-path",
+}));
+
+// Mock window.location.replace
+Object.defineProperty(window, "location", {
+  value: {
+    replace: vi.fn(),
+  },
+  writable: true,
+});
+
+const environmentId = "test-env-id";
+const webAppUrl = "https://app.formbricks.com";
+const environment = { id: environmentId } as TEnvironment;
+const surveys = [];
+const airtableArray = [];
+const locale = "en-US" as const;
+
+const baseProps = {
+  environmentId,
+  airtableArray,
+  surveys,
+  environment,
+  webAppUrl,
+  locale,
+};
+
+describe("AirtableWrapper", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  test("renders ConnectIntegration when not connected (no integration)", () => {
+    render(<AirtableWrapper {...baseProps} isEnabled={true} airtableIntegration={undefined} />);
+    expect(screen.getByTestId("connect-integration")).toBeInTheDocument();
+    expect(screen.queryByTestId("manage-integration")).not.toBeInTheDocument();
+    expect(screen.getByRole("button", { name: "Connect" })).toBeEnabled();
+  });
+
+  test("renders ConnectIntegration when not connected (integration without key)", () => {
+    const integrationWithoutKey = { config: {} } as TIntegrationAirtable;
+    render(<AirtableWrapper {...baseProps} isEnabled={true} airtableIntegration={integrationWithoutKey} />);
+    expect(screen.getByTestId("connect-integration")).toBeInTheDocument();
+    expect(screen.queryByTestId("manage-integration")).not.toBeInTheDocument();
+  });
+
+  test("renders ConnectIntegration disabled when isEnabled is false", () => {
+    render(<AirtableWrapper {...baseProps} isEnabled={false} airtableIntegration={undefined} />);
+    expect(screen.getByTestId("connect-integration")).toBeInTheDocument();
+    expect(screen.getByRole("button", { name: "Connect" })).toBeDisabled();
+  });
+
+  test("calls authorize and redirects when Connect button is clicked", async () => {
+    const mockAuthorize = vi.mocked(authorize);
+    const redirectUrl = "https://airtable.com/auth";
+    mockAuthorize.mockResolvedValue(redirectUrl);
+
+    render(<AirtableWrapper {...baseProps} isEnabled={true} airtableIntegration={undefined} />);
+
+    const connectButton = screen.getByRole("button", { name: "Connect" });
+    await userEvent.click(connectButton);
+
+    expect(mockAuthorize).toHaveBeenCalledWith(environmentId, webAppUrl);
+    await vi.waitFor(() => {
+      expect(window.location.replace).toHaveBeenCalledWith(redirectUrl);
+    });
+  });
+
+  test("renders ManageIntegration when connected", () => {
+    const connectedIntegration = {
+      id: "int-1",
+      config: { key: { access_token: "abc" }, email: "test@test.com", data: [] },
+    } as unknown as TIntegrationAirtable;
+    render(<AirtableWrapper {...baseProps} isEnabled={true} airtableIntegration={connectedIntegration} />);
+    expect(screen.getByTestId("manage-integration")).toBeInTheDocument();
+    expect(screen.queryByTestId("connect-integration")).not.toBeInTheDocument();
+  });
+
+  test("switches from ManageIntegration to ConnectIntegration when disconnected", async () => {
+    const connectedIntegration = {
+      id: "int-1",
+      config: { key: { access_token: "abc" }, email: "test@test.com", data: [] },
+    } as unknown as TIntegrationAirtable;
+    render(<AirtableWrapper {...baseProps} isEnabled={true} airtableIntegration={connectedIntegration} />);
+
+    // Initially, ManageIntegration is shown
+    expect(screen.getByTestId("manage-integration")).toBeInTheDocument();
+
+    // Simulate disconnection via ManageIntegration's button
+    const disconnectButton = screen.getByRole("button", { name: "Disconnect" });
+    await userEvent.click(disconnectButton);
+
+    // Now, ConnectIntegration should be shown
+    expect(screen.getByTestId("connect-integration")).toBeInTheDocument();
+    expect(screen.queryByTestId("manage-integration")).not.toBeInTheDocument();
+  });
+});

apps/web/app/(app)/environments/[environmentId]/integrations/airtable/components/BaseSelectDropdown.test.tsx

@@ -0,0 +1,125 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import { useForm } from "react-hook-form";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { TIntegrationItem } from "@formbricks/types/integration";
+import { IntegrationModalInputs } from "./AddIntegrationModal";
+import { BaseSelectDropdown } from "./BaseSelectDropdown";
+
+// Mock UI components
+vi.mock("@/modules/ui/components/label", () => ({
+  Label: ({ children, htmlFor }: { children: React.ReactNode; htmlFor: string }) => (
+    <label htmlFor={htmlFor}>{children}</label>
+  ),
+}));
+vi.mock("@/modules/ui/components/select", () => ({
+  Select: ({ children, onValueChange, disabled, defaultValue }) => (
+    <select
+      data-testid="base-select"
+      onChange={(e) => onValueChange(e.target.value)}
+      disabled={disabled}
+      defaultValue={defaultValue}>
+      {children}
+    </select>
+  ),
+  SelectTrigger: ({ children }) => <div>{children}</div>,
+  SelectValue: () => <span>SelectValueMock</span>,
+  SelectContent: ({ children }) => <div>{children}</div>,
+  SelectItem: ({ children, value }) => <option value={value}>{children}</option>,
+}));
+
+// Mock react-hook-form's Controller specifically
+vi.mock("react-hook-form", async () => {
+  const actual = await vi.importActual("react-hook-form");
+  // Keep the actual useForm
+  const originalUseForm = actual.useForm;
+
+  // Mock Controller
+  const MockController = ({ name, _, render, defaultValue }) => {
+    // Minimal mock: call render with a basic field object
+    const field = {
+      onChange: vi.fn(), // Simple spy for field.onChange
+      onBlur: vi.fn(),
+      value: defaultValue, // Use defaultValue passed to Controller
+      name: name,
+      ref: vi.fn(),
+    };
+    // The component passes the render prop result to the actual Select component
+    return render({ field });
+  };
+
+  return {
+    ...actual,
+    useForm: originalUseForm, // Use the actual useForm
+    Controller: MockController, // Use the mocked Controller
+  };
+});
+
+const mockAirtableArray: TIntegrationItem[] = [
+  { id: "base1", name: "Base One" },
+  { id: "base2", name: "Base Two" },
+];
+
+const mockFetchTable = vi.fn();
+
+// Use a wrapper component that utilizes the actual useForm
+const renderComponent = (
+  isLoading = false,
+  defaultValue: string | undefined = undefined,
+  airtableArray = mockAirtableArray
+) => {
+  const Component = () => {
+    // Now uses the actual useForm because Controller is mocked separately
+    const { control, setValue } = useForm<IntegrationModalInputs>({
+      defaultValues: { base: defaultValue },
+    });
+    return (
+      <BaseSelectDropdown
+        control={control}
+        isLoading={isLoading}
+        fetchTable={mockFetchTable} // The spy
+        airtableArray={airtableArray}
+        setValue={setValue} // Actual RHF setValue
+        defaultValue={defaultValue}
+      />
+    );
+  };
+  return render(<Component />);
+};
+
+describe("BaseSelectDropdown", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  test("renders the label and select trigger", () => {
+    renderComponent();
+    expect(screen.getByText("environments.integrations.airtable.airtable_base")).toBeInTheDocument();
+    expect(screen.getByTestId("base-select")).toBeInTheDocument();
+    expect(screen.getByText("SelectValueMock")).toBeInTheDocument(); // From mocked SelectValue
+  });
+
+  test("renders options from airtableArray", () => {
+    renderComponent();
+    const select = screen.getByTestId("base-select");
+    expect(select.querySelectorAll("option")).toHaveLength(mockAirtableArray.length);
+    expect(screen.getByText("Base One")).toBeInTheDocument();
+    expect(screen.getByText("Base Two")).toBeInTheDocument();
+  });
+
+  test("disables the select when isLoading is true", () => {
+    renderComponent(true);
+    expect(screen.getByTestId("base-select")).toBeDisabled();
+  });
+
+  test("enables the select when isLoading is false", () => {
+    renderComponent(false);
+    expect(screen.getByTestId("base-select")).toBeEnabled();
+  });
+
+  test("renders correctly with empty airtableArray", () => {
+    renderComponent(false, undefined, []);
+    const select = screen.getByTestId("base-select");
+    expect(select.querySelectorAll("option")).toHaveLength(0);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/integrations/airtable/lib/airtable.test.ts

@@ -0,0 +1,85 @@
+import { beforeEach, describe, expect, test, vi } from "vitest";
+import { logger } from "@formbricks/logger";
+import { TIntegrationAirtableTables } from "@formbricks/types/integration/airtable";
+import { authorize, fetchTables } from "./airtable";
+
+// Mock the logger
+vi.mock("@formbricks/logger", () => ({
+  logger: {
+    error: vi.fn(),
+  },
+}));
+
+// Mock fetch
+global.fetch = vi.fn();
+
+const environmentId = "test-env-id";
+const baseId = "test-base-id";
+const apiHost = "http://localhost:3000";
+
+describe("Airtable Library", () => {
+  beforeEach(() => {
+    vi.resetAllMocks();
+  });
+
+  describe("fetchTables", () => {
+    test("should fetch tables successfully", async () => {
+      const mockTables: TIntegrationAirtableTables = {
+        tables: [
+          { id: "tbl1", name: "Table 1" },
+          { id: "tbl2", name: "Table 2" },
+        ],
+      };
+      const mockResponse = {
+        ok: true,
+        json: async () => ({ data: mockTables }),
+      };
+      vi.mocked(fetch).mockResolvedValue(mockResponse as Response);
+
+      const tables = await fetchTables(environmentId, baseId);
+
+      expect(fetch).toHaveBeenCalledWith(`/api/v1/integrations/airtable/tables?baseId=${baseId}`, {
+        method: "GET",
+        headers: { environmentId: environmentId },
+        cache: "no-store",
+      });
+      expect(tables).toEqual(mockTables);
+    });
+  });
+
+  describe("authorize", () => {
+    test("should return authUrl successfully", async () => {
+      const mockAuthUrl = "https://airtable.com/oauth2/v1/authorize?...";
+      const mockResponse = {
+        ok: true,
+        json: async () => ({ data: { authUrl: mockAuthUrl } }),
+      };
+      vi.mocked(fetch).mockResolvedValue(mockResponse as Response);
+
+      const authUrl = await authorize(environmentId, apiHost);
+
+      expect(fetch).toHaveBeenCalledWith(`${apiHost}/api/v1/integrations/airtable`, {
+        method: "GET",
+        headers: { environmentId: environmentId },
+      });
+      expect(authUrl).toBe(mockAuthUrl);
+    });
+
+    test("should throw error and log when fetch fails", async () => {
+      const errorText = "Failed to fetch";
+      const mockResponse = {
+        ok: false,
+        text: async () => errorText,
+      };
+      vi.mocked(fetch).mockResolvedValue(mockResponse as Response);
+
+      await expect(authorize(environmentId, apiHost)).rejects.toThrow("Could not create response");
+
+      expect(fetch).toHaveBeenCalledWith(`${apiHost}/api/v1/integrations/airtable`, {
+        method: "GET",
+        headers: { environmentId: environmentId },
+      });
+      expect(logger.error).toHaveBeenCalledWith({ errorText }, "authorize: Could not fetch airtable config");
+    });
+  });
+});

apps/web/app/(app)/environments/[environmentId]/integrations/airtable/page.test.tsx

@@ -0,0 +1,217 @@
+import { getSurveys } from "@/app/(app)/environments/[environmentId]/integrations/lib/surveys";
+import { getAirtableTables } from "@/lib/airtable/service";
+import { WEBAPP_URL } from "@/lib/constants";
+import { getIntegrations } from "@/lib/integration/service";
+import { findMatchingLocale } from "@/lib/utils/locale";
+import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
+import { TEnvironmentAuth } from "@/modules/environments/types/environment-auth";
+import { cleanup, render, screen } from "@testing-library/react";
+import { redirect } from "next/navigation";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TIntegrationItem } from "@formbricks/types/integration";
+import { TIntegrationAirtable, TIntegrationAirtableCredential } from "@formbricks/types/integration/airtable";
+import { TSurvey } from "@formbricks/types/surveys/types";
+import Page from "./page";
+
+// Mock dependencies
+vi.mock("@/app/(app)/environments/[environmentId]/integrations/airtable/components/AirtableWrapper", () => ({
+  AirtableWrapper: vi.fn(() => <div>AirtableWrapper Mock</div>),
+}));
+vi.mock("@/app/(app)/environments/[environmentId]/integrations/lib/surveys");
+vi.mock("@/lib/airtable/service");
+
+let mockAirtableClientId: string | undefined = "test-client-id";
+
+vi.mock("@/lib/constants", () => ({
+  get AIRTABLE_CLIENT_ID() {
+    return mockAirtableClientId;
+  },
+  WEBAPP_URL: "http://localhost:3000",
+  IS_PRODUCTION: true,
+  IS_FORMBRICKS_CLOUD: false,
+  POSTHOG_API_KEY: "mock-posthog-api-key",
+  POSTHOG_HOST: "mock-posthog-host",
+  IS_POSTHOG_CONFIGURED: true,
+  ENCRYPTION_KEY: "mock-encryption-key",
+  ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "test-githubID",
+  GOOGLE_CLIENT_ID: "test-google-client-id",
+  GOOGLE_CLIENT_SECRET: "test-google-client-secret",
+  AZUREAD_CLIENT_ID: "test-azuread-client-id",
+  AZUREAD_CLIENT_SECRET: "test-azure",
+  AZUREAD_TENANT_ID: "test-azuread-tenant-id",
+  OIDC_DISPLAY_NAME: "test-oidc-display-name",
+  OIDC_CLIENT_ID: "test-oidc-client-id",
+  OIDC_ISSUER: "test-oidc-issuer",
+  OIDC_CLIENT_SECRET: "test-oidc-client-secret",
+  OIDC_SIGNING_ALGORITHM: "test-oidc-signing-algorithm",
+  SENTRY_DSN: "mock-sentry-dsn",
+}));
+
+vi.mock("@/lib/integration/service");
+vi.mock("@/lib/utils/locale");
+vi.mock("@/modules/environments/lib/utils");
+vi.mock("@/modules/ui/components/go-back-button", () => ({
+  GoBackButton: vi.fn(() => <div>GoBackButton Mock</div>),
+}));
+vi.mock("@/modules/ui/components/page-content-wrapper", () => ({
+  PageContentWrapper: vi.fn(({ children }) => <div>{children}</div>),
+}));
+vi.mock("@/modules/ui/components/page-header", () => ({
+  PageHeader: vi.fn(({ pageTitle }) => <h1>{pageTitle}</h1>),
+}));
+vi.mock("@/tolgee/server", () => ({
+  getTranslate: async () => (key: string) => key,
+}));
+vi.mock("next/navigation");
+
+const mockEnvironmentId = "test-env-id";
+const mockEnvironment = {
+  id: mockEnvironmentId,
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  type: "development",
+} as unknown as TEnvironment;
+const mockSurveys: TSurvey[] = [{ id: "survey1", name: "Survey 1" } as TSurvey];
+const mockAirtableIntegration: TIntegrationAirtable = {
+  type: "airtable",
+  config: {
+    key: { access_token: "test-token" } as unknown as TIntegrationAirtableCredential,
+    data: [],
+    email: "test@example.com",
+  },
+  environmentId: mockEnvironmentId,
+  id: "int_airtable_123",
+};
+const mockAirtableTables: TIntegrationItem[] = [{ id: "table1", name: "Table 1" } as TIntegrationItem];
+const mockLocale = "en-US";
+
+const props = {
+  params: {
+    environmentId: mockEnvironmentId,
+  },
+};
+
+describe("Airtable Integration Page", () => {
+  beforeEach(() => {
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      environment: mockEnvironment,
+      isReadOnly: false,
+    } as unknown as TEnvironmentAuth);
+    vi.mocked(getSurveys).mockResolvedValue(mockSurveys);
+    vi.mocked(getIntegrations).mockResolvedValue([mockAirtableIntegration]);
+    vi.mocked(getAirtableTables).mockResolvedValue(mockAirtableTables);
+    vi.mocked(findMatchingLocale).mockResolvedValue(mockLocale);
+  });
+
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  test("redirects if user is readOnly", async () => {
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      environment: mockEnvironment,
+      isReadOnly: true,
+    } as unknown as TEnvironmentAuth);
+    await render(await Page(props));
+    expect(redirect).toHaveBeenCalledWith("./");
+  });
+
+  test("renders correctly when integration is configured", async () => {
+    await render(await Page(props));
+
+    expect(screen.getByText("environments.integrations.airtable.airtable_integration")).toBeInTheDocument();
+    expect(screen.getByText("GoBackButton Mock")).toBeInTheDocument();
+    expect(screen.getByText("AirtableWrapper Mock")).toBeInTheDocument();
+
+    expect(vi.mocked(getEnvironmentAuth)).toHaveBeenCalledWith(mockEnvironmentId);
+    expect(vi.mocked(getSurveys)).toHaveBeenCalledWith(mockEnvironmentId);
+    expect(vi.mocked(getIntegrations)).toHaveBeenCalledWith(mockEnvironmentId);
+    expect(vi.mocked(getAirtableTables)).toHaveBeenCalledWith(mockEnvironmentId);
+    expect(vi.mocked(findMatchingLocale)).toHaveBeenCalled();
+
+    const AirtableWrapper = vi.mocked(
+      (
+        await import(
+          "@/app/(app)/environments/[environmentId]/integrations/airtable/components/AirtableWrapper"
+        )
+      ).AirtableWrapper
+    );
+    expect(AirtableWrapper).toHaveBeenCalledWith(
+      {
+        isEnabled: true,
+        airtableIntegration: mockAirtableIntegration,
+        airtableArray: mockAirtableTables,
+        environmentId: mockEnvironmentId,
+        surveys: mockSurveys,
+        environment: mockEnvironment,
+        webAppUrl: WEBAPP_URL,
+        locale: mockLocale,
+      },
+      undefined
+    );
+  });
+
+  test("renders correctly when integration exists but is not configured (no key)", async () => {
+    const integrationWithoutKey = {
+      ...mockAirtableIntegration,
+      config: { ...mockAirtableIntegration.config, key: undefined },
+    } as unknown as TIntegrationAirtable;
+    vi.mocked(getIntegrations).mockResolvedValue([integrationWithoutKey]);
+
+    await render(await Page(props));
+
+    expect(screen.getByText("environments.integrations.airtable.airtable_integration")).toBeInTheDocument();
+    expect(screen.getByText("AirtableWrapper Mock")).toBeInTheDocument();
+
+    expect(vi.mocked(getAirtableTables)).not.toHaveBeenCalled(); // Should not fetch tables if no key
+
+    const AirtableWrapper = vi.mocked(
+      (
+        await import(
+          "@/app/(app)/environments/[environmentId]/integrations/airtable/components/AirtableWrapper"
+        )
+      ).AirtableWrapper
+    );
+    // Update assertion to match the actual call
+    expect(AirtableWrapper).toHaveBeenCalledWith(
+      {
+        isEnabled: true, // isEnabled is true because AIRTABLE_CLIENT_ID is set in beforeEach
+        airtableIntegration: integrationWithoutKey,
+        airtableArray: [], // Should be empty as getAirtableTables is not called
+        environmentId: mockEnvironmentId,
+        surveys: mockSurveys,
+        environment: mockEnvironment,
+        webAppUrl: WEBAPP_URL,
+        locale: mockLocale,
+      },
+      undefined // Change second argument to undefined
+    );
+  });
+
+  test("renders correctly when integration is disabled (no client ID)", async () => {
+    mockAirtableClientId = undefined; // Simulate disabled integration
+
+    await render(await Page(props));
+
+    expect(screen.getByText("environments.integrations.airtable.airtable_integration")).toBeInTheDocument();
+    expect(screen.getByText("AirtableWrapper Mock")).toBeInTheDocument();
+
+    const AirtableWrapper = vi.mocked(
+      (
+        await import(
+          "@/app/(app)/environments/[environmentId]/integrations/airtable/components/AirtableWrapper"
+        )
+      ).AirtableWrapper
+    );
+    expect(AirtableWrapper).toHaveBeenCalledWith(
+      expect.objectContaining({
+        isEnabled: false, // Should be false
+      }),
+      undefined
+    );
+  });
+});

apps/web/app/(app)/environments/[environmentId]/integrations/google-sheets/components/AddIntegrationModal.test.tsx

@@ -0,0 +1,694 @@
+import { AddIntegrationModal } from "@/app/(app)/environments/[environmentId]/integrations/google-sheets/components/AddIntegrationModal";
+import { cleanup, render, screen, waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TEnvironment } from "@formbricks/types/environment";
+import {
+  TIntegrationGoogleSheets,
+  TIntegrationGoogleSheetsConfigData,
+} from "@formbricks/types/integration/google-sheet";
+import { TSurvey, TSurveyQuestion, TSurveyQuestionTypeEnum } from "@formbricks/types/surveys/types";
+
+// Mock actions and utilities
+vi.mock("@/app/(app)/environments/[environmentId]/integrations/actions", () => ({
+  createOrUpdateIntegrationAction: vi.fn(),
+}));
+vi.mock("@/app/(app)/environments/[environmentId]/integrations/google-sheets/actions", () => ({
+  getSpreadsheetNameByIdAction: vi.fn(),
+}));
+vi.mock("@/app/(app)/environments/[environmentId]/integrations/google-sheets/lib/util", () => ({
+  constructGoogleSheetsUrl: (id: string) => `https://docs.google.com/spreadsheets/d/${id}`,
+  extractSpreadsheetIdFromUrl: (url: string) => url.split("/")[5],
+  isValidGoogleSheetsUrl: (url: string) => url.startsWith("https://docs.google.com/spreadsheets/d/"),
+}));
+vi.mock("@/lib/i18n/utils", () => ({
+  getLocalizedValue: (value: any, _locale: string) => value?.default || "",
+}));
+vi.mock("@/lib/utils/recall", () => ({
+  replaceHeadlineRecall: (survey: any) => survey,
+}));
+vi.mock("@/modules/ui/components/additional-integration-settings", () => ({
+  AdditionalIntegrationSettings: ({
+    includeVariables,
+    setIncludeVariables,
+    includeHiddenFields,
+    setIncludeHiddenFields,
+    includeMetadata,
+    setIncludeMetadata,
+    includeCreatedAt,
+    setIncludeCreatedAt,
+  }: any) => (
+    <div>
+      <span>Additional Settings</span>
+      <input
+        data-testid="include-variables"
+        type="checkbox"
+        checked={includeVariables}
+        onChange={(e) => setIncludeVariables(e.target.checked)}
+      />
+      <input
+        data-testid="include-hidden-fields"
+        type="checkbox"
+        checked={includeHiddenFields}
+        onChange={(e) => setIncludeHiddenFields(e.target.checked)}
+      />
+      <input
+        data-testid="include-metadata"
+        type="checkbox"
+        checked={includeMetadata}
+        onChange={(e) => setIncludeMetadata(e.target.checked)}
+      />
+      <input
+        data-testid="include-created-at"
+        type="checkbox"
+        checked={includeCreatedAt}
+        onChange={(e) => setIncludeCreatedAt(e.target.checked)}
+      />
+    </div>
+  ),
+}));
+vi.mock("@/modules/ui/components/dropdown-selector", () => ({
+  DropdownSelector: ({ label, items, selectedItem, setSelectedItem }: any) => (
+    <div>
+      <label>{label}</label>
+      <select
+        data-testid="survey-dropdown"
+        value={selectedItem?.id || ""}
+        onChange={(e) => {
+          const selected = items.find((item: any) => item.id === e.target.value);
+          setSelectedItem(selected);
+        }}>
+        <option value="">Select a survey</option>
+        {items.map((item: any) => (
+          <option key={item.id} value={item.id}>
+            {item.name}
+          </option>
+        ))}
+      </select>
+    </div>
+  ),
+}));
+vi.mock("@/modules/ui/components/modal", () => ({
+  Modal: ({ open, children }: { open: boolean; children: React.ReactNode }) =>
+    open ? <div data-testid="modal">{children}</div> : null,
+}));
+vi.mock("next/image", () => ({
+  // eslint-disable-next-line @next/next/no-img-element
+  default: ({ src, alt }: { src: string; alt: string }) => <img src={src} alt={alt} />,
+}));
+vi.mock("react-hook-form", () => ({
+  useForm: () => ({
+    handleSubmit: (callback: any) => (event: any) => {
+      event.preventDefault();
+      callback();
+    },
+  }),
+}));
+vi.mock("react-hot-toast", () => ({
+  default: {
+    success: vi.fn(),
+    error: vi.fn(),
+  },
+}));
+vi.mock("@tolgee/react", async () => {
+  const MockTolgeeProvider = ({ children }: { children: React.ReactNode }) => <>{children}</>;
+  const useTranslate = () => ({
+    t: (key: string, _?: any) => {
+      // NOSONAR
+      // Simple mock translation function
+      if (key === "common.all_questions") return "All questions";
+      if (key === "common.selected_questions") return "Selected questions";
+      if (key === "environments.integrations.google_sheets.link_google_sheet") return "Link Google Sheet";
+      if (key === "common.update") return "Update";
+      if (key === "common.delete") return "Delete";
+      if (key === "common.cancel") return "Cancel";
+      if (key === "environments.integrations.google_sheets.spreadsheet_url") return "Spreadsheet URL";
+      if (key === "common.select_survey") return "Select survey";
+      if (key === "common.questions") return "Questions";
+      if (key === "environments.integrations.google_sheets.enter_a_valid_spreadsheet_url_error")
+        return "Please enter a valid Google Sheet URL.";
+      if (key === "environments.integrations.please_select_a_survey_error") return "Please select a survey.";
+      if (key === "environments.integrations.select_at_least_one_question_error")
+        return "Please select at least one question.";
+      if (key === "environments.integrations.integration_updated_successfully")
+        return "Integration updated successfully.";
+      if (key === "environments.integrations.integration_added_successfully")
+        return "Integration added successfully.";
+      if (key === "environments.integrations.integration_removed_successfully")
+        return "Integration removed successfully.";
+      if (key === "environments.integrations.google_sheets.google_sheet_logo") return "Google Sheet logo";
+      if (key === "environments.integrations.google_sheets.google_sheets_integration_description")
+        return "Sync responses with Google Sheets.";
+      if (key === "environments.integrations.create_survey_warning")
+        return "You need to create a survey first.";
+      return key; // Return key if no translation is found
+    },
+  });
+  return { TolgeeProvider: MockTolgeeProvider, useTranslate };
+});
+
+// Mock dependencies
+const createOrUpdateIntegrationAction = vi.mocked(
+  (await import("@/app/(app)/environments/[environmentId]/integrations/actions"))
+    .createOrUpdateIntegrationAction
+);
+const getSpreadsheetNameByIdAction = vi.mocked(
+  (await import("@/app/(app)/environments/[environmentId]/integrations/google-sheets/actions"))
+    .getSpreadsheetNameByIdAction
+);
+const toast = vi.mocked((await import("react-hot-toast")).default);
+
+const environmentId = "test-env-id";
+const mockSetOpen = vi.fn();
+
+const surveys: TSurvey[] = [
+  {
+    id: "survey1",
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    name: "Survey 1",
+    type: "app",
+    environmentId: environmentId,
+    status: "inProgress",
+    questions: [
+      {
+        id: "q1",
+        type: TSurveyQuestionTypeEnum.OpenText,
+        headline: { default: "Question 1?" },
+        required: true,
+      } as unknown as TSurveyQuestion,
+      {
+        id: "q2",
+        type: TSurveyQuestionTypeEnum.MultipleChoiceSingle,
+        headline: { default: "Question 2?" },
+        required: false,
+        choices: [
+          { id: "c1", label: { default: "Choice 1" } },
+          { id: "c2", label: { default: "Choice 2" } },
+        ],
+      },
+    ],
+    triggers: [],
+    recontactDays: null,
+    autoClose: null,
+    closeOnDate: null,
+    delay: 0,
+    displayOption: "displayOnce",
+    displayPercentage: null,
+    autoComplete: null,
+    singleUse: null,
+    styling: null,
+    surveyClosedMessage: null,
+    segment: null,
+    languages: [],
+    variables: [],
+    welcomeCard: { enabled: true } as unknown as TSurvey["welcomeCard"],
+    hiddenFields: { enabled: true, fieldIds: [] },
+    pin: null,
+    resultShareKey: null,
+    displayLimit: null,
+  } as unknown as TSurvey,
+  {
+    id: "survey2",
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    name: "Survey 2",
+    type: "link",
+    environmentId: environmentId,
+    status: "draft",
+    questions: [
+      {
+        id: "q3",
+        type: TSurveyQuestionTypeEnum.Rating,
+        headline: { default: "Rate this?" },
+        required: true,
+        scale: "number",
+        range: 5,
+      } as unknown as TSurveyQuestion,
+    ],
+    triggers: [],
+    recontactDays: null,
+    autoClose: null,
+    closeOnDate: null,
+    delay: 0,
+    displayOption: "displayOnce",
+    displayPercentage: null,
+    autoComplete: null,
+    singleUse: null,
+    styling: null,
+    surveyClosedMessage: null,
+    segment: null,
+    languages: [],
+    variables: [],
+    welcomeCard: { enabled: true } as unknown as TSurvey["welcomeCard"],
+    hiddenFields: { enabled: true, fieldIds: [] },
+    pin: null,
+    resultShareKey: null,
+    displayLimit: null,
+  } as unknown as TSurvey,
+];
+
+const mockGoogleSheetIntegration = {
+  id: "integration1",
+  type: "googleSheets",
+  config: {
+    key: {
+      access_token: "mock_access_token",
+      expiry_date: Date.now() + 3600000,
+      refresh_token: "mock_refresh_token",
+      scope: "mock_scope",
+      token_type: "Bearer",
+    },
+    email: "test@example.com",
+    data: [], // Initially empty, will be populated in beforeEach
+  },
+} as unknown as TIntegrationGoogleSheets;
+
+const mockSelectedIntegration: TIntegrationGoogleSheetsConfigData & { index: number } = {
+  spreadsheetId: "existing-sheet-id",
+  spreadsheetName: "Existing Sheet",
+  surveyId: surveys[0].id,
+  surveyName: surveys[0].name,
+  questionIds: [surveys[0].questions[0].id],
+  questions: "Selected questions",
+  createdAt: new Date(),
+  includeVariables: true,
+  includeHiddenFields: false,
+  includeMetadata: true,
+  includeCreatedAt: false,
+  index: 0,
+};
+
+describe("AddIntegrationModal", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  beforeEach(() => {
+    // Reset integration data before each test if needed
+    mockGoogleSheetIntegration.config.data = [
+      { ...mockSelectedIntegration }, // Simulate existing data for update/delete tests
+    ];
+  });
+
+  test("renders correctly when open (create mode)", () => {
+    render(
+      <AddIntegrationModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        googleSheetIntegration={mockGoogleSheetIntegration}
+        selectedIntegration={null}
+      />
+    );
+
+    expect(screen.getByTestId("modal")).toBeInTheDocument();
+    expect(
+      screen.getByText("Link Google Sheet", { selector: "div.text-xl.font-medium" })
+    ).toBeInTheDocument();
+    // Use getByPlaceholderText for the input
+    expect(
+      screen.getByPlaceholderText("https://docs.google.com/spreadsheets/d/<your-spreadsheet-id>")
+    ).toBeInTheDocument();
+    // Use getByTestId for the dropdown
+    expect(screen.getByTestId("survey-dropdown")).toBeInTheDocument();
+    expect(screen.getByText("Cancel")).toBeInTheDocument();
+    expect(screen.getByRole("button", { name: "Link Google Sheet" })).toBeInTheDocument();
+    expect(screen.queryByText("Delete")).not.toBeInTheDocument();
+    expect(screen.queryByText("Questions")).not.toBeInTheDocument();
+  });
+
+  test("renders correctly when open (update mode)", () => {
+    render(
+      <AddIntegrationModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        googleSheetIntegration={mockGoogleSheetIntegration}
+        selectedIntegration={mockSelectedIntegration}
+      />
+    );
+
+    expect(screen.getByTestId("modal")).toBeInTheDocument();
+    expect(
+      screen.getByText("Link Google Sheet", { selector: "div.text-xl.font-medium" })
+    ).toBeInTheDocument();
+    // Use getByPlaceholderText for the input
+    expect(
+      screen.getByPlaceholderText("https://docs.google.com/spreadsheets/d/<your-spreadsheet-id>")
+    ).toHaveValue("https://docs.google.com/spreadsheets/d/existing-sheet-id");
+    expect(screen.getByTestId("survey-dropdown")).toHaveValue(surveys[0].id);
+    expect(screen.getByText("Questions")).toBeInTheDocument();
+    expect(screen.getByText("Delete")).toBeInTheDocument();
+    expect(screen.getByText("Update")).toBeInTheDocument();
+    expect(screen.queryByText("Cancel")).not.toBeInTheDocument();
+    expect(screen.getByTestId("include-variables")).toBeChecked();
+    expect(screen.getByTestId("include-hidden-fields")).not.toBeChecked();
+    expect(screen.getByTestId("include-metadata")).toBeChecked();
+    expect(screen.getByTestId("include-created-at")).not.toBeChecked();
+  });
+
+  test("selects survey and shows questions", async () => {
+    render(
+      <AddIntegrationModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        googleSheetIntegration={mockGoogleSheetIntegration}
+        selectedIntegration={null}
+      />
+    );
+
+    const surveyDropdown = screen.getByTestId("survey-dropdown");
+    await userEvent.selectOptions(surveyDropdown, surveys[1].id);
+
+    expect(screen.getByText("Questions")).toBeInTheDocument();
+    surveys[1].questions.forEach((q) => {
+      expect(screen.getByLabelText(q.headline.default)).toBeInTheDocument();
+      // Initially all questions should be checked when a survey is selected in create mode
+      expect(screen.getByLabelText(q.headline.default)).toBeChecked();
+    });
+  });
+
+  test("handles question selection", async () => {
+    render(
+      <AddIntegrationModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        googleSheetIntegration={mockGoogleSheetIntegration}
+        selectedIntegration={null}
+      />
+    );
+
+    const surveyDropdown = screen.getByTestId("survey-dropdown");
+    await userEvent.selectOptions(surveyDropdown, surveys[0].id);
+
+    const firstQuestionCheckbox = screen.getByLabelText(surveys[0].questions[0].headline.default);
+    expect(firstQuestionCheckbox).toBeChecked(); // Initially checked
+
+    await userEvent.click(firstQuestionCheckbox);
+    expect(firstQuestionCheckbox).not.toBeChecked(); // Unchecked after click
+
+    await userEvent.click(firstQuestionCheckbox);
+    expect(firstQuestionCheckbox).toBeChecked(); // Checked again
+  });
+
+  test("creates integration successfully", async () => {
+    getSpreadsheetNameByIdAction.mockResolvedValue({ data: "Test Sheet Name" });
+    createOrUpdateIntegrationAction.mockResolvedValue({ data: null as any }); // Mock successful action
+
+    render(
+      <AddIntegrationModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        googleSheetIntegration={{
+          ...mockGoogleSheetIntegration,
+          config: { ...mockGoogleSheetIntegration.config, data: [] },
+        }} // Start with empty data
+        selectedIntegration={null}
+      />
+    );
+
+    // Use getByPlaceholderText for the input
+    const urlInput = screen.getByPlaceholderText(
+      "https://docs.google.com/spreadsheets/d/<your-spreadsheet-id>"
+    );
+    const surveyDropdown = screen.getByTestId("survey-dropdown");
+    const submitButton = screen.getByRole("button", { name: "Link Google Sheet" });
+
+    await userEvent.type(urlInput, "https://docs.google.com/spreadsheets/d/new-sheet-id");
+    await userEvent.selectOptions(surveyDropdown, surveys[0].id);
+
+    // Wait for questions to appear and potentially uncheck one
+    const firstQuestionCheckbox = await screen.findByLabelText(surveys[0].questions[0].headline.default);
+    await userEvent.click(firstQuestionCheckbox); // Uncheck first question
+
+    // Check additional settings
+    await userEvent.click(screen.getByTestId("include-variables"));
+    await userEvent.click(screen.getByTestId("include-metadata"));
+
+    await userEvent.click(submitButton);
+
+    await waitFor(() => {
+      expect(getSpreadsheetNameByIdAction).toHaveBeenCalledWith({
+        googleSheetIntegration: expect.any(Object),
+        environmentId,
+        spreadsheetId: "new-sheet-id",
+      });
+    });
+
+    await waitFor(() => {
+      expect(createOrUpdateIntegrationAction).toHaveBeenCalledWith({
+        environmentId,
+        integrationData: expect.objectContaining({
+          type: "googleSheets",
+          config: expect.objectContaining({
+            key: mockGoogleSheetIntegration.config.key,
+            email: mockGoogleSheetIntegration.config.email,
+            data: expect.arrayContaining([
+              expect.objectContaining({
+                spreadsheetId: "new-sheet-id",
+                spreadsheetName: "Test Sheet Name",
+                surveyId: surveys[0].id,
+                surveyName: surveys[0].name,
+                questionIds: surveys[0].questions.slice(1).map((q) => q.id), // Excludes the first question
+                questions: "Selected questions",
+                includeVariables: true,
+                includeHiddenFields: false,
+                includeMetadata: true,
+                includeCreatedAt: true, // Default
+              }),
+            ]),
+          }),
+        }),
+      });
+    });
+
+    await waitFor(() => {
+      expect(toast.success).toHaveBeenCalledWith("Integration added successfully.");
+    });
+    await waitFor(() => {
+      expect(mockSetOpen).toHaveBeenCalledWith(false);
+    });
+  });
+
+  test("deletes integration successfully", async () => {
+    createOrUpdateIntegrationAction.mockResolvedValue({ data: null as any });
+
+    render(
+      <AddIntegrationModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        googleSheetIntegration={mockGoogleSheetIntegration} // Contains initial data at index 0
+        selectedIntegration={mockSelectedIntegration}
+      />
+    );
+
+    const deleteButton = screen.getByText("Delete");
+    await userEvent.click(deleteButton);
+
+    await waitFor(() => {
+      expect(createOrUpdateIntegrationAction).toHaveBeenCalledWith({
+        environmentId,
+        integrationData: expect.objectContaining({
+          config: expect.objectContaining({
+            data: [], // Data array should be empty after deletion
+          }),
+        }),
+      });
+    });
+
+    await waitFor(() => {
+      expect(toast.success).toHaveBeenCalledWith("Integration removed successfully.");
+    });
+    await waitFor(() => {
+      expect(mockSetOpen).toHaveBeenCalledWith(false);
+    });
+  });
+
+  test("shows validation error for invalid URL", async () => {
+    render(
+      <AddIntegrationModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        googleSheetIntegration={mockGoogleSheetIntegration}
+        selectedIntegration={null}
+      />
+    );
+
+    // Use getByPlaceholderText for the input
+    const urlInput = screen.getByPlaceholderText(
+      "https://docs.google.com/spreadsheets/d/<your-spreadsheet-id>"
+    );
+    const surveyDropdown = screen.getByTestId("survey-dropdown");
+    const submitButton = screen.getByRole("button", { name: "Link Google Sheet" });
+
+    await userEvent.type(urlInput, "invalid-url");
+    await userEvent.selectOptions(surveyDropdown, surveys[0].id);
+    await userEvent.click(submitButton);
+
+    await waitFor(() => {
+      expect(toast.error).toHaveBeenCalledWith("Please enter a valid Google Sheet URL.");
+    });
+    expect(createOrUpdateIntegrationAction).not.toHaveBeenCalled();
+    expect(mockSetOpen).not.toHaveBeenCalled();
+  });
+
+  test("shows validation error if no survey selected", async () => {
+    render(
+      <AddIntegrationModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        googleSheetIntegration={mockGoogleSheetIntegration}
+        selectedIntegration={null}
+      />
+    );
+
+    // Use getByPlaceholderText for the input
+    const urlInput = screen.getByPlaceholderText(
+      "https://docs.google.com/spreadsheets/d/<your-spreadsheet-id>"
+    );
+    const submitButton = screen.getByRole("button", { name: "Link Google Sheet" });
+
+    await userEvent.type(urlInput, "https://docs.google.com/spreadsheets/d/some-id");
+    // No survey selected
+    await userEvent.click(submitButton);
+
+    await waitFor(() => {
+      expect(toast.error).toHaveBeenCalledWith("Please select a survey.");
+    });
+    expect(createOrUpdateIntegrationAction).not.toHaveBeenCalled();
+    expect(mockSetOpen).not.toHaveBeenCalled();
+  });
+
+  test("shows validation error if no questions selected", async () => {
+    render(
+      <AddIntegrationModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        googleSheetIntegration={mockGoogleSheetIntegration}
+        selectedIntegration={null}
+      />
+    );
+
+    // Use getByPlaceholderText for the input
+    const urlInput = screen.getByPlaceholderText(
+      "https://docs.google.com/spreadsheets/d/<your-spreadsheet-id>"
+    );
+    const surveyDropdown = screen.getByTestId("survey-dropdown");
+    const submitButton = screen.getByRole("button", { name: "Link Google Sheet" });
+
+    await userEvent.type(urlInput, "https://docs.google.com/spreadsheets/d/some-id");
+    await userEvent.selectOptions(surveyDropdown, surveys[0].id);
+
+    // Uncheck all questions
+    for (const question of surveys[0].questions) {
+      const checkbox = await screen.findByLabelText(question.headline.default);
+      await userEvent.click(checkbox);
+    }
+
+    await userEvent.click(submitButton);
+
+    await waitFor(() => {
+      expect(toast.error).toHaveBeenCalledWith("Please select at least one question.");
+    });
+    expect(createOrUpdateIntegrationAction).not.toHaveBeenCalled();
+    expect(mockSetOpen).not.toHaveBeenCalled();
+  });
+
+  test("shows error toast if createOrUpdateIntegrationAction fails", async () => {
+    const errorMessage = "Failed to update integration";
+    getSpreadsheetNameByIdAction.mockResolvedValue({ data: "Some Sheet Name" });
+    createOrUpdateIntegrationAction.mockRejectedValue(new Error(errorMessage));
+
+    render(
+      <AddIntegrationModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        googleSheetIntegration={mockGoogleSheetIntegration}
+        selectedIntegration={null}
+      />
+    );
+
+    // Use getByPlaceholderText for the input
+    const urlInput = screen.getByPlaceholderText(
+      "https://docs.google.com/spreadsheets/d/<your-spreadsheet-id>"
+    );
+    const surveyDropdown = screen.getByTestId("survey-dropdown");
+    const submitButton = screen.getByRole("button", { name: "Link Google Sheet" });
+
+    await userEvent.type(urlInput, "https://docs.google.com/spreadsheets/d/another-id");
+    await userEvent.selectOptions(surveyDropdown, surveys[0].id);
+    await userEvent.click(submitButton);
+
+    await waitFor(() => {
+      expect(getSpreadsheetNameByIdAction).toHaveBeenCalled();
+    });
+    await waitFor(() => {
+      expect(createOrUpdateIntegrationAction).toHaveBeenCalled();
+    });
+    await waitFor(() => {
+      expect(toast.error).toHaveBeenCalledWith(errorMessage);
+    });
+    expect(mockSetOpen).not.toHaveBeenCalled();
+  });
+
+  test("calls setOpen(false) and resets form on cancel", async () => {
+    render(
+      <AddIntegrationModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        googleSheetIntegration={mockGoogleSheetIntegration}
+        selectedIntegration={null}
+      />
+    );
+
+    // Use getByPlaceholderText for the input
+    const urlInput = screen.getByPlaceholderText(
+      "https://docs.google.com/spreadsheets/d/<your-spreadsheet-id>"
+    );
+    const cancelButton = screen.getByText("Cancel");
+
+    // Simulate some interaction
+    await userEvent.type(urlInput, "https://docs.google.com/spreadsheets/d/temp-id");
+    await userEvent.click(cancelButton);
+
+    expect(mockSetOpen).toHaveBeenCalledWith(false);
+    // Re-render with open=true to check if state was reset (URL should be empty)
+    cleanup();
+    render(
+      <AddIntegrationModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        googleSheetIntegration={mockGoogleSheetIntegration}
+        selectedIntegration={null}
+      />
+    );
+    // Use getByPlaceholderText for the input check after re-render
+    expect(
+      screen.getByPlaceholderText("https://docs.google.com/spreadsheets/d/<your-spreadsheet-id>")
+    ).toHaveValue("");
+  });
+});

apps/web/app/(app)/environments/[environmentId]/integrations/google-sheets/components/GoogleSheetWrapper.test.tsx

@@ -0,0 +1,175 @@
+import { GoogleSheetWrapper } from "@/app/(app)/environments/[environmentId]/integrations/google-sheets/components/GoogleSheetWrapper";
+import { authorize } from "@/app/(app)/environments/[environmentId]/integrations/google-sheets/lib/google";
+import { cleanup, render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { TEnvironment } from "@formbricks/types/environment";
+import {
+  TIntegrationGoogleSheets,
+  TIntegrationGoogleSheetsCredential,
+} from "@formbricks/types/integration/google-sheet";
+import { TSurvey } from "@formbricks/types/surveys/types";
+
+// Mock child components and functions
+vi.mock(
+  "@/app/(app)/environments/[environmentId]/integrations/google-sheets/components/ManageIntegration",
+  () => ({
+    ManageIntegration: vi.fn(({ setOpenAddIntegrationModal }) => (
+      <div data-testid="manage-integration">
+        <button onClick={() => setOpenAddIntegrationModal(true)}>Open Modal</button>
+      </div>
+    )),
+  })
+);
+
+vi.mock("@/modules/ui/components/connect-integration", () => ({
+  ConnectIntegration: vi.fn(({ handleAuthorization }) => (
+    <div data-testid="connect-integration">
+      <button onClick={handleAuthorization}>Connect</button>
+    </div>
+  )),
+}));
+
+vi.mock(
+  "@/app/(app)/environments/[environmentId]/integrations/google-sheets/components/AddIntegrationModal",
+  () => ({
+    AddIntegrationModal: vi.fn(({ open }) =>
+      open ? <div data-testid="add-integration-modal">Modal</div> : null
+    ),
+  })
+);
+
+vi.mock("@/app/(app)/environments/[environmentId]/integrations/google-sheets/lib/google", () => ({
+  authorize: vi.fn(() => Promise.resolve("http://google.com/auth")),
+}));
+
+const mockEnvironment = {
+  id: "test-env-id",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  type: "development",
+  appSetupCompleted: false,
+} as unknown as TEnvironment;
+
+const mockSurveys: TSurvey[] = [];
+const mockWebAppUrl = "http://localhost:3000";
+const mockLocale = "en-US";
+
+const mockGoogleSheetIntegration = {
+  id: "test-integration-id",
+  type: "googleSheets",
+  config: {
+    key: { access_token: "test-token" } as unknown as TIntegrationGoogleSheetsCredential,
+    data: [],
+    email: "test@example.com",
+  },
+} as unknown as TIntegrationGoogleSheets;
+
+describe("GoogleSheetWrapper", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  test("renders ConnectIntegration when not connected", () => {
+    render(
+      <GoogleSheetWrapper
+        isEnabled={true}
+        environment={mockEnvironment}
+        surveys={mockSurveys}
+        webAppUrl={mockWebAppUrl}
+        locale={mockLocale}
+        // No googleSheetIntegration provided initially
+      />
+    );
+    expect(screen.getByTestId("connect-integration")).toBeInTheDocument();
+    expect(screen.queryByTestId("manage-integration")).not.toBeInTheDocument();
+    expect(screen.queryByTestId("add-integration-modal")).not.toBeInTheDocument();
+  });
+
+  test("renders ConnectIntegration when integration exists but has no key", () => {
+    const integrationWithoutKey = {
+      ...mockGoogleSheetIntegration,
+      config: { data: [], email: "test" },
+    } as unknown as TIntegrationGoogleSheets;
+    render(
+      <GoogleSheetWrapper
+        isEnabled={true}
+        environment={mockEnvironment}
+        surveys={mockSurveys}
+        googleSheetIntegration={integrationWithoutKey}
+        webAppUrl={mockWebAppUrl}
+        locale={mockLocale}
+      />
+    );
+    expect(screen.getByTestId("connect-integration")).toBeInTheDocument();
+    expect(screen.queryByTestId("manage-integration")).not.toBeInTheDocument();
+  });
+
+  test("calls authorize when connect button is clicked", async () => {
+    const user = userEvent.setup();
+    // Mock window.location.replace
+    const originalLocation = window.location;
+    // @ts-expect-error
+    delete window.location;
+    window.location = { ...originalLocation, replace: vi.fn() } as any;
+
+    render(
+      <GoogleSheetWrapper
+        isEnabled={true}
+        environment={mockEnvironment}
+        surveys={mockSurveys}
+        webAppUrl={mockWebAppUrl}
+        locale={mockLocale}
+      />
+    );
+
+    const connectButton = screen.getByRole("button", { name: "Connect" });
+    await user.click(connectButton);
+
+    expect(vi.mocked(authorize)).toHaveBeenCalledWith(mockEnvironment.id, mockWebAppUrl);
+    // Need to wait for the promise returned by authorize to resolve
+    await vi.waitFor(() => {
+      expect(window.location.replace).toHaveBeenCalledWith("http://google.com/auth");
+    });
+
+    // Restore window.location
+    window.location = originalLocation as any;
+  });
+
+  test("renders ManageIntegration and AddIntegrationModal when connected", () => {
+    render(
+      <GoogleSheetWrapper
+        isEnabled={true}
+        environment={mockEnvironment}
+        surveys={mockSurveys}
+        googleSheetIntegration={mockGoogleSheetIntegration}
+        webAppUrl={mockWebAppUrl}
+        locale={mockLocale}
+      />
+    );
+    expect(screen.getByTestId("manage-integration")).toBeInTheDocument();
+    // Modal is rendered but initially hidden
+    expect(screen.queryByTestId("add-integration-modal")).not.toBeInTheDocument();
+    expect(screen.queryByTestId("connect-integration")).not.toBeInTheDocument();
+  });
+
+  test("opens AddIntegrationModal when triggered from ManageIntegration", async () => {
+    const user = userEvent.setup();
+    render(
+      <GoogleSheetWrapper
+        isEnabled={true}
+        environment={mockEnvironment}
+        surveys={mockSurveys}
+        googleSheetIntegration={mockGoogleSheetIntegration}
+        webAppUrl={mockWebAppUrl}
+        locale={mockLocale}
+      />
+    );
+
+    expect(screen.queryByTestId("add-integration-modal")).not.toBeInTheDocument();
+    const openModalButton = screen.getByRole("button", { name: "Open Modal" }); // Button inside mocked ManageIntegration
+    await user.click(openModalButton);
+    expect(screen.getByTestId("add-integration-modal")).toBeInTheDocument();
+  });
+});

apps/web/app/(app)/environments/[environmentId]/integrations/google-sheets/lib/google.test.ts

@@ -0,0 +1,61 @@
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { logger } from "@formbricks/logger";
+import { authorize } from "./google";
+
+// Mock the logger
+vi.mock("@formbricks/logger", () => ({
+  logger: {
+    error: vi.fn(),
+  },
+}));
+
+// Mock fetch
+const mockFetch = vi.fn();
+vi.stubGlobal("fetch", mockFetch);
+
+describe("authorize", () => {
+  const environmentId = "test-env-id";
+  const apiHost = "http://test.com";
+  const expectedUrl = `${apiHost}/api/google-sheet`;
+  const expectedHeaders = { environmentId: environmentId };
+
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  test("should return authUrl on successful fetch", async () => {
+    const mockAuthUrl = "https://accounts.google.com/o/oauth2/v2/auth?...";
+    mockFetch.mockResolvedValueOnce({
+      ok: true,
+      json: async () => ({ data: { authUrl: mockAuthUrl } }),
+    });
+
+    const authUrl = await authorize(environmentId, apiHost);
+
+    expect(mockFetch).toHaveBeenCalledWith(expectedUrl, {
+      method: "GET",
+      headers: expectedHeaders,
+    });
+    expect(authUrl).toBe(mockAuthUrl);
+    expect(logger.error).not.toHaveBeenCalled();
+  });
+
+  test("should throw error and log on failed fetch", async () => {
+    const errorText = "Failed to fetch";
+    mockFetch.mockResolvedValueOnce({
+      ok: false,
+      text: async () => errorText,
+    });
+
+    await expect(authorize(environmentId, apiHost)).rejects.toThrow("Could not create response");
+
+    expect(mockFetch).toHaveBeenCalledWith(expectedUrl, {
+      method: "GET",
+      headers: expectedHeaders,
+    });
+    expect(logger.error).toHaveBeenCalledWith(
+      { errorText },
+      "authorize: Could not fetch google sheet config"
+    );
+  });
+});

apps/web/app/(app)/environments/[environmentId]/integrations/google-sheets/lib/util.test.ts

@@ -0,0 +1,50 @@
+import { describe, expect, test } from "vitest";
+import { constructGoogleSheetsUrl, extractSpreadsheetIdFromUrl, isValidGoogleSheetsUrl } from "./util";
+
+describe("Google Sheets Util", () => {
+  describe("extractSpreadsheetIdFromUrl", () => {
+    test("should extract spreadsheet ID from a valid URL", () => {
+      const url =
+        "https://docs.google.com/spreadsheets/d/1aBcDeFgHiJkLmNoPqRsTuVwXyZaBcDeFgHiJkLmNoPq/edit#gid=0";
+      const expectedId = "1aBcDeFgHiJkLmNoPqRsTuVwXyZaBcDeFgHiJkLmNoPq";
+      expect(extractSpreadsheetIdFromUrl(url)).toBe(expectedId);
+    });
+
+    test("should throw an error for an invalid URL", () => {
+      const invalidUrl = "https://not-a-google-sheet-url.com";
+      expect(() => extractSpreadsheetIdFromUrl(invalidUrl)).toThrow("Invalid Google Sheets URL");
+    });
+
+    test("should throw an error for a URL without an ID", () => {
+      const urlWithoutId = "https://docs.google.com/spreadsheets/d/";
+      expect(() => extractSpreadsheetIdFromUrl(urlWithoutId)).toThrow("Invalid Google Sheets URL");
+    });
+  });
+
+  describe("constructGoogleSheetsUrl", () => {
+    test("should construct a valid Google Sheets URL from a spreadsheet ID", () => {
+      const spreadsheetId = "1aBcDeFgHiJkLmNoPqRsTuVwXyZaBcDeFgHiJkLmNoPq";
+      const expectedUrl =
+        "https://docs.google.com/spreadsheets/d/1aBcDeFgHiJkLmNoPqRsTuVwXyZaBcDeFgHiJkLmNoPq";
+      expect(constructGoogleSheetsUrl(spreadsheetId)).toBe(expectedUrl);
+    });
+  });
+
+  describe("isValidGoogleSheetsUrl", () => {
+    test("should return true for a valid Google Sheets URL", () => {
+      const validUrl =
+        "https://docs.google.com/spreadsheets/d/1aBcDeFgHiJkLmNoPqRsTuVwXyZaBcDeFgHiJkLmNoPq/edit#gid=0";
+      expect(isValidGoogleSheetsUrl(validUrl)).toBe(true);
+    });
+
+    test("should return false for an invalid URL", () => {
+      const invalidUrl = "https://not-a-google-sheet-url.com";
+      expect(isValidGoogleSheetsUrl(invalidUrl)).toBe(false);
+    });
+
+    test("should return true for a base Google Sheets URL", () => {
+      const baseUrl = "https://docs.google.com/spreadsheets/d/";
+      expect(isValidGoogleSheetsUrl(baseUrl)).toBe(true);
+    });
+  });
+});

apps/web/app/(app)/environments/[environmentId]/integrations/google-sheets/loading.test.tsx

@@ -0,0 +1,40 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import Loading from "./loading";
+
+// Mock the GoBackButton component
+vi.mock("@/modules/ui/components/go-back-button", () => ({
+  GoBackButton: () => <div>GoBackButton</div>,
+}));
+
+describe("Loading", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  test("renders the loading state correctly", () => {
+    render(<Loading />);
+
+    // Check for GoBackButton mock
+    expect(screen.getByText("GoBackButton")).toBeInTheDocument();
+
+    // Check for the disabled button text
+    expect(screen.getByText("environments.integrations.google_sheets.link_new_sheet")).toBeInTheDocument();
+    expect(
+      screen.getByText("environments.integrations.google_sheets.link_new_sheet").closest("button")
+    ).toHaveClass("pointer-events-none animate-pulse cursor-not-allowed bg-slate-200 select-none");
+
+    // Check for table headers
+    expect(screen.getByText("common.survey")).toBeInTheDocument();
+    expect(screen.getByText("environments.integrations.google_sheets.google_sheet_name")).toBeInTheDocument();
+    expect(screen.getByText("common.questions")).toBeInTheDocument();
+    expect(screen.getByText("common.updated_at")).toBeInTheDocument();
+
+    // Check for placeholder elements (count based on the loop)
+    const placeholders = screen.getAllByRole("generic", { hidden: true }); // Using generic role as divs don't have implicit roles
+    // Calculate expected placeholders: 3 rows * 5 placeholders per row = 15
+    // Plus the button, header divs (4), and the main containers
+    // It's simpler to check if there are *any* pulse animations
+    expect(placeholders.some((el) => el.classList.contains("animate-pulse"))).toBe(true);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/integrations/google-sheets/page.test.tsx

@@ -0,0 +1,228 @@
+import Page from "@/app/(app)/environments/[environmentId]/integrations/google-sheets/page";
+import { getSurveys } from "@/app/(app)/environments/[environmentId]/integrations/lib/surveys";
+import { getIntegrations } from "@/lib/integration/service";
+import { findMatchingLocale } from "@/lib/utils/locale";
+import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
+import { TEnvironmentAuth } from "@/modules/environments/types/environment-auth";
+import { cleanup, render, screen } from "@testing-library/react";
+import { redirect } from "next/navigation";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TEnvironment } from "@formbricks/types/environment";
+import {
+  TIntegrationGoogleSheets,
+  TIntegrationGoogleSheetsCredential,
+} from "@formbricks/types/integration/google-sheet";
+import { TSurvey } from "@formbricks/types/surveys/types";
+
+// Mock dependencies
+vi.mock(
+  "@/app/(app)/environments/[environmentId]/integrations/google-sheets/components/GoogleSheetWrapper",
+  () => ({
+    GoogleSheetWrapper: vi.fn(
+      ({ isEnabled, environment, surveys, googleSheetIntegration, webAppUrl, locale }) => (
+        <div>
+          <span>Mocked GoogleSheetWrapper</span>
+          <span data-testid="isEnabled">{isEnabled.toString()}</span>
+          <span data-testid="environmentId">{environment.id}</span>
+          <span data-testid="surveyCount">{surveys?.length ?? 0}</span>
+          <span data-testid="integrationId">{googleSheetIntegration?.id}</span>
+          <span data-testid="webAppUrl">{webAppUrl}</span>
+          <span data-testid="locale">{locale}</span>
+        </div>
+      )
+    ),
+  })
+);
+vi.mock("@/app/(app)/environments/[environmentId]/integrations/lib/surveys", () => ({
+  getSurveys: vi.fn(),
+}));
+
+let mockGoogleSheetClientId: string | undefined = "test-client-id";
+
+vi.mock("@/lib/constants", () => ({
+  get GOOGLE_SHEETS_CLIENT_ID() {
+    return mockGoogleSheetClientId;
+  },
+  IS_FORMBRICKS_CLOUD: false,
+  POSTHOG_API_KEY: "mock-posthog-api-key",
+  POSTHOG_HOST: "mock-posthog-host",
+  IS_POSTHOG_CONFIGURED: true,
+  ENCRYPTION_KEY: "mock-encryption-key",
+  ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "test-githubID",
+  GOOGLE_CLIENT_ID: "test-google-client-id",
+  GOOGLE_CLIENT_SECRET: "test-google-client-secret",
+  AZUREAD_CLIENT_ID: "test-azuread-client-id",
+  AZUREAD_CLIENT_SECRET: "test-azure",
+  AZUREAD_TENANT_ID: "test-azuread-tenant-id",
+  OIDC_DISPLAY_NAME: "test-oidc-display-name",
+  OIDC_CLIENT_ID: "test-oidc-client-id",
+  OIDC_ISSUER: "test-oidc-issuer",
+  OIDC_CLIENT_SECRET: "test-oidc-client-secret",
+  OIDC_SIGNING_ALGORITHM: "test-oidc-signing-algorithm",
+  WEBAPP_URL: "test-webapp-url",
+  IS_PRODUCTION: false,
+  SENTRY_DSN: "mock-sentry-dsn",
+  GOOGLE_SHEETS_CLIENT_SECRET: "test-client-secret",
+  GOOGLE_SHEETS_REDIRECT_URL: "test-redirect-url",
+}));
+vi.mock("@/lib/integration/service", () => ({
+  getIntegrations: vi.fn(),
+}));
+vi.mock("@/lib/utils/locale", () => ({
+  findMatchingLocale: vi.fn(),
+}));
+vi.mock("@/modules/environments/lib/utils", () => ({
+  getEnvironmentAuth: vi.fn(),
+}));
+vi.mock("@/modules/ui/components/go-back-button", () => ({
+  GoBackButton: vi.fn(({ url }) => <div data-testid="go-back">{url}</div>),
+}));
+vi.mock("@/modules/ui/components/page-content-wrapper", () => ({
+  PageContentWrapper: vi.fn(({ children }) => <div>{children}</div>),
+}));
+vi.mock("@/modules/ui/components/page-header", () => ({
+  PageHeader: vi.fn(({ pageTitle }) => <h1>{pageTitle}</h1>),
+}));
+vi.mock("@/tolgee/server", () => ({
+  getTranslate: async () => (key: string) => key,
+}));
+vi.mock("next/navigation", () => ({
+  redirect: vi.fn(),
+}));
+
+const mockEnvironment = {
+  id: "test-env-id",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  appSetupCompleted: false,
+  type: "development",
+} as unknown as TEnvironment;
+
+const mockSurveys: TSurvey[] = [
+  {
+    id: "survey1",
+    name: "Survey 1",
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    environmentId: "test-env-id",
+    status: "inProgress",
+    type: "app",
+    questions: [],
+    triggers: [],
+    recontactDays: null,
+    autoClose: null,
+    closeOnDate: null,
+    delay: 0,
+    displayOption: "displayOnce",
+    displayPercentage: null,
+    languages: [],
+    pin: null,
+    resultShareKey: null,
+    segment: null,
+    singleUse: null,
+    styling: null,
+    surveyClosedMessage: null,
+    welcomeCard: { enabled: false } as unknown as TSurvey["welcomeCard"],
+    autoComplete: null,
+    runOnDate: null,
+  } as unknown as TSurvey,
+];
+
+const mockGoogleSheetIntegration = {
+  id: "integration1",
+  type: "googleSheets",
+  config: {
+    data: [],
+    key: {
+      refresh_token: "refresh",
+      access_token: "access",
+      expiry_date: Date.now() + 3600000,
+    } as unknown as TIntegrationGoogleSheetsCredential,
+    email: "test@example.com",
+  },
+} as unknown as TIntegrationGoogleSheets;
+
+const mockProps = {
+  params: { environmentId: "test-env-id" },
+};
+
+describe("GoogleSheetsIntegrationPage", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  beforeEach(() => {
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      environment: mockEnvironment,
+      isReadOnly: false,
+    } as TEnvironmentAuth);
+    vi.mocked(getSurveys).mockResolvedValue(mockSurveys);
+    vi.mocked(getIntegrations).mockResolvedValue([mockGoogleSheetIntegration]);
+    vi.mocked(findMatchingLocale).mockResolvedValue("en-US");
+  });
+
+  test("renders the page with GoogleSheetWrapper when enabled and not read-only", async () => {
+    const PageComponent = await Page(mockProps);
+    render(PageComponent);
+
+    expect(
+      screen.getByText("environments.integrations.google_sheets.google_sheets_integration")
+    ).toBeInTheDocument();
+    expect(screen.getByText("Mocked GoogleSheetWrapper")).toBeInTheDocument();
+    expect(screen.getByTestId("isEnabled")).toHaveTextContent("true");
+    expect(screen.getByTestId("environmentId")).toHaveTextContent(mockEnvironment.id);
+    expect(screen.getByTestId("surveyCount")).toHaveTextContent(mockSurveys.length.toString());
+    expect(screen.getByTestId("integrationId")).toHaveTextContent(mockGoogleSheetIntegration.id);
+    expect(screen.getByTestId("webAppUrl")).toHaveTextContent("test-webapp-url");
+    expect(screen.getByTestId("locale")).toHaveTextContent("en-US");
+    expect(screen.getByTestId("go-back")).toHaveTextContent(
+      `test-webapp-url/environments/${mockProps.params.environmentId}/integrations`
+    );
+    expect(vi.mocked(redirect)).not.toHaveBeenCalled();
+  });
+
+  test("calls redirect when user is read-only", async () => {
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      environment: mockEnvironment,
+      isReadOnly: true,
+    } as TEnvironmentAuth);
+
+    const PageComponent = await Page(mockProps);
+    render(PageComponent);
+
+    expect(vi.mocked(redirect)).toHaveBeenCalledWith("./");
+  });
+
+  test("passes isEnabled=false to GoogleSheetWrapper when constants are missing", async () => {
+    mockGoogleSheetClientId = undefined;
+
+    const { default: PageWithMissingConstants } = (await import(
+      "@/app/(app)/environments/[environmentId]/integrations/google-sheets/page"
+    )) as { default: typeof Page };
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      environment: mockEnvironment,
+      isReadOnly: false,
+    } as TEnvironmentAuth);
+    vi.mocked(getSurveys).mockResolvedValue(mockSurveys);
+    vi.mocked(getIntegrations).mockResolvedValue([mockGoogleSheetIntegration]);
+    vi.mocked(findMatchingLocale).mockResolvedValue("en-US");
+
+    const PageComponent = await PageWithMissingConstants(mockProps);
+    render(PageComponent);
+
+    expect(screen.getByTestId("isEnabled")).toHaveTextContent("false");
+  });
+
+  test("handles case where no Google Sheet integration exists", async () => {
+    vi.mocked(getIntegrations).mockResolvedValue([]); // No integrations
+
+    const PageComponent = await Page(mockProps);
+    render(PageComponent);
+
+    expect(screen.getByText("Mocked GoogleSheetWrapper")).toBeInTheDocument();
+    expect(screen.getByTestId("integrationId")).toBeEmptyDOMElement(); // No integration ID passed
+  });
+});

apps/web/app/(app)/environments/[environmentId]/integrations/lib/surveys.test.ts

@@ -0,0 +1,172 @@
+import { cache } from "@/lib/cache";
+import { surveyCache } from "@/lib/survey/cache";
+import { selectSurvey } from "@/lib/survey/service";
+import { transformPrismaSurvey } from "@/lib/survey/utils";
+import { validateInputs } from "@/lib/utils/validate";
+import { Prisma } from "@prisma/client";
+import { beforeEach, describe, expect, test, vi } from "vitest";
+import { prisma } from "@formbricks/database";
+import { logger } from "@formbricks/logger";
+import { DatabaseError } from "@formbricks/types/errors";
+import { TSurvey } from "@formbricks/types/surveys/types";
+import { getSurveys } from "./surveys";
+
+// Mock dependencies
+vi.mock("@/lib/cache");
+vi.mock("@/lib/survey/cache", () => ({
+  surveyCache: {
+    tag: {
+      byEnvironmentId: vi.fn((environmentId) => `survey_environment_${environmentId}`),
+    },
+  },
+}));
+vi.mock("@/lib/survey/service", () => ({
+  selectSurvey: { id: true, name: true, status: true, updatedAt: true }, // Expanded mock based on usage
+}));
+vi.mock("@/lib/survey/utils");
+vi.mock("@/lib/utils/validate");
+vi.mock("@formbricks/database", () => ({
+  prisma: {
+    survey: {
+      findMany: vi.fn(),
+    },
+  },
+}));
+vi.mock("@formbricks/logger", () => ({
+  logger: {
+    error: vi.fn(),
+  },
+}));
+vi.mock("react", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("react")>();
+  return {
+    ...actual,
+    cache: vi.fn((fn) => fn), // Mock reactCache to just return the function
+  };
+});
+
+const environmentId = "test-environment-id";
+// Ensure mockPrismaSurveys includes all fields used in selectSurvey mock
+const mockPrismaSurveys = [
+  { id: "survey1", name: "Survey 1", status: "inProgress", updatedAt: new Date() },
+  { id: "survey2", name: "Survey 2", status: "draft", updatedAt: new Date() },
+];
+const mockTransformedSurveys: TSurvey[] = [
+  {
+    id: "survey1",
+    name: "Survey 1",
+    status: "inProgress",
+    questions: [],
+    triggers: [],
+    recontactDays: null,
+    displayOption: "displayOnce",
+    autoClose: null,
+    delay: 0,
+    autoComplete: null,
+    surveyClosedMessage: null,
+    singleUse: null,
+    welcomeCard: { enabled: false } as unknown as TSurvey["welcomeCard"],
+    hiddenFields: { enabled: false },
+    type: "app", // Changed type to web to match original file
+    environmentId: environmentId,
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    languages: [],
+    styling: null,
+  } as unknown as TSurvey,
+  {
+    id: "survey2",
+    name: "Survey 2",
+    status: "draft",
+    questions: [],
+    triggers: [],
+    recontactDays: null,
+    displayOption: "displayOnce",
+    autoClose: null,
+    delay: 0,
+    autoComplete: null,
+    surveyClosedMessage: null,
+    singleUse: null,
+    welcomeCard: { enabled: false } as unknown as TSurvey["welcomeCard"],
+    hiddenFields: { enabled: false },
+    type: "app",
+    environmentId: environmentId,
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    languages: [],
+    styling: null,
+  } as unknown as TSurvey,
+];
+
+describe("getSurveys", () => {
+  beforeEach(() => {
+    vi.mocked(cache).mockImplementation((fn) => async () => {
+      return fn();
+    });
+  });
+
+  test("should fetch and transform surveys successfully", async () => {
+    vi.mocked(prisma.survey.findMany).mockResolvedValue(mockPrismaSurveys);
+    vi.mocked(transformPrismaSurvey).mockImplementation((survey) => {
+      const found = mockTransformedSurveys.find((ts) => ts.id === survey.id);
+      if (!found) throw new Error("Survey not found in mock transformed data");
+      // Ensure the returned object matches the TSurvey structure precisely
+      return { ...found } as TSurvey;
+    });
+
+    const surveys = await getSurveys(environmentId);
+
+    expect(surveys).toEqual(mockTransformedSurveys);
+    // Use expect.any(ZId) for the Zod schema validation check
+    expect(validateInputs).toHaveBeenCalledWith([environmentId, expect.any(Object)]); // Adjusted expectation
+    expect(prisma.survey.findMany).toHaveBeenCalledWith({
+      where: {
+        environmentId,
+        status: {
+          not: "completed",
+        },
+      },
+      select: selectSurvey,
+      orderBy: {
+        updatedAt: "desc",
+      },
+    });
+    expect(transformPrismaSurvey).toHaveBeenCalledTimes(mockPrismaSurveys.length);
+    expect(transformPrismaSurvey).toHaveBeenCalledWith(mockPrismaSurveys[0]);
+    expect(transformPrismaSurvey).toHaveBeenCalledWith(mockPrismaSurveys[1]);
+    // Check if the inner cache function was called with the correct arguments
+    expect(cache).toHaveBeenCalledWith(
+      expect.any(Function), // The async function passed to cache
+      [`getSurveys-${environmentId}`], // The cache key
+      {
+        tags: [surveyCache.tag.byEnvironmentId(environmentId)], // Cache tags
+      }
+    );
+    // Remove the assertion for reactCache being called within the test execution
+    // expect(reactCache).toHaveBeenCalled(); // Removed this line
+  });
+
+  test("should throw DatabaseError on Prisma known request error", async () => {
+    // No need to mock cache here again as beforeEach handles it
+    const prismaError = new Prisma.PrismaClientKnownRequestError("Test error", {
+      code: "P2025",
+      clientVersion: "5.0.0",
+      meta: {}, // Added meta property
+    });
+    vi.mocked(prisma.survey.findMany).mockRejectedValue(prismaError);
+
+    await expect(getSurveys(environmentId)).rejects.toThrow(DatabaseError);
+    expect(logger.error).toHaveBeenCalledWith({ error: prismaError }, "getSurveys: Could not fetch surveys");
+    expect(cache).toHaveBeenCalled(); // Ensure cache wrapper was still called
+  });
+
+  test("should throw original error on other errors", async () => {
+    // No need to mock cache here again as beforeEach handles it
+    const genericError = new Error("Something went wrong");
+    vi.mocked(prisma.survey.findMany).mockRejectedValue(genericError);
+
+    await expect(getSurveys(environmentId)).rejects.toThrow(genericError);
+    expect(logger.error).not.toHaveBeenCalled();
+    expect(cache).toHaveBeenCalled(); // Ensure cache wrapper was still called
+  });
+});

apps/web/app/(app)/environments/[environmentId]/integrations/lib/webhook.test.ts

@@ -0,0 +1,114 @@
+import { cache } from "@/lib/cache";
+import { webhookCache } from "@/lib/cache/webhook";
+import { validateInputs } from "@/lib/utils/validate";
+import { Prisma } from "@prisma/client";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { prisma } from "@formbricks/database";
+import { DatabaseError } from "@formbricks/types/errors";
+import { getWebhookCountBySource } from "./webhook";
+
+// Mock dependencies
+vi.mock("@/lib/cache");
+vi.mock("@/lib/cache/webhook", () => ({
+  webhookCache: {
+    tag: {
+      byEnvironmentIdAndSource: vi.fn((envId, source) => `webhook_${envId}_${source ?? "all"}`),
+    },
+  },
+}));
+vi.mock("@/lib/utils/validate");
+vi.mock("@formbricks/database", () => ({
+  prisma: {
+    webhook: {
+      count: vi.fn(),
+    },
+  },
+}));
+
+const environmentId = "test-environment-id";
+const sourceZapier = "zapier";
+
+describe("getWebhookCountBySource", () => {
+  beforeEach(() => {
+    vi.mocked(cache).mockImplementation((fn) => async () => {
+      return fn();
+    });
+  });
+
+  afterEach(() => {
+    vi.resetAllMocks();
+  });
+
+  test("should return webhook count for a specific source", async () => {
+    const mockCount = 5;
+    vi.mocked(prisma.webhook.count).mockResolvedValue(mockCount);
+
+    const count = await getWebhookCountBySource(environmentId, sourceZapier);
+
+    expect(count).toBe(mockCount);
+    expect(validateInputs).toHaveBeenCalledWith(
+      [environmentId, expect.any(Object)],
+      [sourceZapier, expect.any(Object)]
+    );
+    expect(prisma.webhook.count).toHaveBeenCalledWith({
+      where: {
+        environmentId,
+        source: sourceZapier,
+      },
+    });
+    expect(cache).toHaveBeenCalledWith(
+      expect.any(Function),
+      [`getWebhookCountBySource-${environmentId}-${sourceZapier}`],
+      {
+        tags: [webhookCache.tag.byEnvironmentIdAndSource(environmentId, sourceZapier)],
+      }
+    );
+  });
+
+  test("should return total webhook count when source is undefined", async () => {
+    const mockCount = 10;
+    vi.mocked(prisma.webhook.count).mockResolvedValue(mockCount);
+
+    const count = await getWebhookCountBySource(environmentId);
+
+    expect(count).toBe(mockCount);
+    expect(validateInputs).toHaveBeenCalledWith(
+      [environmentId, expect.any(Object)],
+      [undefined, expect.any(Object)]
+    );
+    expect(prisma.webhook.count).toHaveBeenCalledWith({
+      where: {
+        environmentId,
+        source: undefined,
+      },
+    });
+    expect(cache).toHaveBeenCalledWith(
+      expect.any(Function),
+      [`getWebhookCountBySource-${environmentId}-undefined`],
+      {
+        tags: [webhookCache.tag.byEnvironmentIdAndSource(environmentId, undefined)],
+      }
+    );
+  });
+
+  test("should throw DatabaseError on Prisma known request error", async () => {
+    const prismaError = new Prisma.PrismaClientKnownRequestError("Test Prisma Error", {
+      code: "P2025",
+      clientVersion: "5.0.0",
+    });
+    vi.mocked(prisma.webhook.count).mockRejectedValue(prismaError);
+
+    await expect(getWebhookCountBySource(environmentId, sourceZapier)).rejects.toThrow(DatabaseError);
+    expect(prisma.webhook.count).toHaveBeenCalledTimes(1);
+    expect(cache).toHaveBeenCalledTimes(1);
+  });
+
+  test("should throw original error on other errors", async () => {
+    const genericError = new Error("Something went wrong");
+    vi.mocked(prisma.webhook.count).mockRejectedValue(genericError);
+
+    await expect(getWebhookCountBySource(environmentId)).rejects.toThrow(genericError);
+    expect(prisma.webhook.count).toHaveBeenCalledTimes(1);
+    expect(cache).toHaveBeenCalledTimes(1);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/integrations/notion/components/AddIntegrationModal.test.tsx

@@ -0,0 +1,606 @@
+import { AddIntegrationModal } from "@/app/(app)/environments/[environmentId]/integrations/notion/components/AddIntegrationModal";
+import { cleanup, render, screen, waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import {
+  TIntegrationNotion,
+  TIntegrationNotionConfigData,
+  TIntegrationNotionCredential,
+  TIntegrationNotionDatabase,
+} from "@formbricks/types/integration/notion";
+import { TSurvey, TSurveyQuestion, TSurveyQuestionTypeEnum } from "@formbricks/types/surveys/types";
+
+// Mock actions and utilities
+vi.mock("@/app/(app)/environments/[environmentId]/integrations/actions", () => ({
+  createOrUpdateIntegrationAction: vi.fn(),
+}));
+vi.mock("@/lib/i18n/utils", () => ({
+  getLocalizedValue: (value: any, _locale: string) => value?.default || "",
+}));
+vi.mock("@/lib/pollyfills/structuredClone", () => ({
+  structuredClone: (obj: any) => JSON.parse(JSON.stringify(obj)),
+}));
+vi.mock("@/lib/utils/recall", () => ({
+  replaceHeadlineRecall: (survey: any) => survey,
+}));
+vi.mock("@/modules/survey/lib/questions", () => ({
+  getQuestionTypes: () => [
+    { id: TSurveyQuestionTypeEnum.OpenText, label: "Open Text" },
+    { id: TSurveyQuestionTypeEnum.MultipleChoiceSingle, label: "Multiple Choice Single" },
+    { id: TSurveyQuestionTypeEnum.Date, label: "Date" },
+  ],
+}));
+vi.mock("@/modules/ui/components/button", () => ({
+  Button: ({ children, onClick, loading, variant, type = "button" }: any) => (
+    <button onClick={onClick} disabled={loading} data-variant={variant} type={type}>
+      {loading ? "Loading..." : children}
+    </button>
+  ),
+}));
+vi.mock("@/modules/ui/components/dropdown-selector", () => ({
+  DropdownSelector: ({ label, items, selectedItem, setSelectedItem, placeholder, disabled }: any) => {
+    // Ensure the selected item is always available as an option
+    const allOptions = [...items];
+    if (selectedItem && !items.some((item: any) => item.id === selectedItem.id)) {
+      // Use a simple object structure consistent with how options are likely used
+      allOptions.push({ id: selectedItem.id, name: selectedItem.name });
+    }
+    // Remove duplicates just in case
+    const uniqueOptions = Array.from(new Map(allOptions.map((item) => [item.id, item])).values());
+
+    return (
+      <div>
+        {label && <label>{label}</label>}
+        <select
+          data-testid={`dropdown-${label?.toLowerCase().replace(/\s+/g, "-") || placeholder?.toLowerCase().replace(/\s+/g, "-")}`}
+          value={selectedItem?.id || ""} // Still set value based on selectedItem prop
+          onChange={(e) => {
+            const selected = uniqueOptions.find((item: any) => item.id === e.target.value);
+            setSelectedItem(selected);
+          }}
+          disabled={disabled}>
+          <option value="">{placeholder || "Select..."}</option>
+          {/* Render options from the potentially augmented list */}
+          {uniqueOptions.map((item: any) => (
+            <option key={item.id} value={item.id}>
+              {item.name}
+            </option>
+          ))}
+        </select>
+      </div>
+    );
+  },
+}));
+vi.mock("@/modules/ui/components/label", () => ({
+  Label: ({ children }: { children: React.ReactNode }) => <label>{children}</label>,
+}));
+vi.mock("@/modules/ui/components/modal", () => ({
+  Modal: ({ open, children }: { open: boolean; children: React.ReactNode }) =>
+    open ? <div data-testid="modal">{children}</div> : null,
+}));
+vi.mock("lucide-react", () => ({
+  PlusIcon: () => <span data-testid="plus-icon">+</span>,
+  XIcon: () => <span data-testid="x-icon">x</span>,
+}));
+vi.mock("next/image", () => ({
+  // eslint-disable-next-line @next/next/no-img-element
+  default: ({ src, alt }: { src: string; alt: string }) => <img src={src} alt={alt} />,
+}));
+vi.mock("react-hook-form", () => ({
+  useForm: () => ({
+    handleSubmit: (callback: any) => (event: any) => {
+      event.preventDefault();
+      callback();
+    },
+  }),
+}));
+vi.mock("react-hot-toast", () => ({
+  default: {
+    success: vi.fn(),
+    error: vi.fn(),
+  },
+}));
+vi.mock("@tolgee/react", async () => {
+  const MockTolgeeProvider = ({ children }: { children: React.ReactNode }) => <>{children}</>;
+  const useTranslate = () => ({
+    t: (key: string, params?: any) => {
+      // NOSONAR
+      // Simple mock translation function
+      if (key === "common.warning") return "Warning";
+      if (key === "common.metadata") return "Metadata";
+      if (key === "common.created_at") return "Created at";
+      if (key === "common.hidden_field") return "Hidden Field";
+      if (key === "environments.integrations.notion.link_notion_database") return "Link Notion Database";
+      if (key === "environments.integrations.notion.sync_responses_with_a_notion_database")
+        return "Sync responses with a Notion database.";
+      if (key === "environments.integrations.notion.select_a_database") return "Select a database";
+      if (key === "common.select_survey") return "Select survey";
+      if (key === "environments.integrations.notion.map_formbricks_fields_to_notion_property")
+        return "Map Formbricks fields to Notion property";
+      if (key === "environments.integrations.notion.select_a_survey_question")
+        return "Select a survey question";
+      if (key === "environments.integrations.notion.select_a_field_to_map") return "Select a field to map";
+      if (key === "common.delete") return "Delete";
+      if (key === "common.cancel") return "Cancel";
+      if (key === "common.update") return "Update";
+      if (key === "environments.integrations.notion.please_select_a_database")
+        return "Please select a database.";
+      if (key === "environments.integrations.please_select_a_survey_error") return "Please select a survey.";
+      if (key === "environments.integrations.notion.please_select_at_least_one_mapping")
+        return "Please select at least one mapping.";
+      if (key === "environments.integrations.notion.please_resolve_mapping_errors")
+        return "Please resolve mapping errors.";
+      if (key === "environments.integrations.notion.please_complete_mapping_fields_with_notion_property")
+        return "Please complete mapping fields.";
+      if (key === "environments.integrations.integration_updated_successfully")
+        return "Integration updated successfully.";
+      if (key === "environments.integrations.integration_added_successfully")
+        return "Integration added successfully.";
+      if (key === "environments.integrations.integration_removed_successfully")
+        return "Integration removed successfully.";
+      if (key === "environments.integrations.notion.notion_logo") return "Notion logo";
+      if (key === "environments.integrations.create_survey_warning")
+        return "You need to create a survey first.";
+      if (key === "environments.integrations.notion.create_at_least_one_database_to_setup_this_integration")
+        return "Create at least one database.";
+      if (key === "environments.integrations.notion.duplicate_connection_warning")
+        return "Duplicate connection warning.";
+      if (key === "environments.integrations.notion.que_name_of_type_cant_be_mapped_to")
+        return `Question ${params.que_name} (${params.question_label}) can't be mapped to ${params.col_name} (${params.col_type}). Allowed types: ${params.mapped_type}`;
+
+      return key; // Return key if no translation is found
+    },
+  });
+  return { TolgeeProvider: MockTolgeeProvider, useTranslate };
+});
+
+// Mock dependencies
+const createOrUpdateIntegrationAction = vi.mocked(
+  (await import("@/app/(app)/environments/[environmentId]/integrations/actions"))
+    .createOrUpdateIntegrationAction
+);
+const toast = vi.mocked((await import("react-hot-toast")).default);
+
+const environmentId = "test-env-id";
+const mockSetOpen = vi.fn();
+
+const surveys: TSurvey[] = [
+  {
+    id: "survey1",
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    name: "Survey 1",
+    type: "app",
+    environmentId: environmentId,
+    status: "inProgress",
+    questions: [
+      {
+        id: "q1",
+        type: TSurveyQuestionTypeEnum.OpenText,
+        headline: { default: "Question 1?" },
+        required: true,
+      } as unknown as TSurveyQuestion,
+      {
+        id: "q2",
+        type: TSurveyQuestionTypeEnum.MultipleChoiceSingle,
+        headline: { default: "Question 2?" },
+        required: false,
+        choices: [
+          { id: "c1", label: { default: "Choice 1" } },
+          { id: "c2", label: { default: "Choice 2" } },
+        ],
+      },
+    ],
+    variables: [{ id: "var1", name: "Variable 1" }],
+    hiddenFields: { enabled: true, fieldIds: ["hf1"] },
+    triggers: [],
+    recontactDays: null,
+    autoClose: null,
+    closeOnDate: null,
+    delay: 0,
+    displayOption: "displayOnce",
+    displayPercentage: null,
+    autoComplete: null,
+    singleUse: null,
+    styling: null,
+    surveyClosedMessage: null,
+    segment: null,
+    languages: [],
+    welcomeCard: { enabled: true } as unknown as TSurvey["welcomeCard"],
+    pin: null,
+    resultShareKey: null,
+    displayLimit: null,
+  } as unknown as TSurvey,
+  {
+    id: "survey2",
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    name: "Survey 2",
+    type: "link",
+    environmentId: environmentId,
+    status: "draft",
+    questions: [
+      {
+        id: "q3",
+        type: TSurveyQuestionTypeEnum.Date,
+        headline: { default: "Date Question?" },
+        required: true,
+      } as unknown as TSurveyQuestion,
+    ],
+    variables: [],
+    hiddenFields: { enabled: false },
+    triggers: [],
+    recontactDays: null,
+    autoClose: null,
+    closeOnDate: null,
+    delay: 0,
+    displayOption: "displayOnce",
+    displayPercentage: null,
+    autoComplete: null,
+    singleUse: null,
+    styling: null,
+    surveyClosedMessage: null,
+    segment: null,
+    languages: [],
+    welcomeCard: { enabled: true } as unknown as TSurvey["welcomeCard"],
+    pin: null,
+    resultShareKey: null,
+    displayLimit: null,
+  } as unknown as TSurvey,
+];
+
+const databases: TIntegrationNotionDatabase[] = [
+  {
+    id: "db1",
+    name: "Database 1 Title",
+    properties: {
+      prop1: { id: "p1", name: "Title Prop", type: "title" },
+      prop2: { id: "p2", name: "Text Prop", type: "rich_text" },
+      prop3: { id: "p3", name: "Number Prop", type: "number" },
+      prop4: { id: "p4", name: "Date Prop", type: "date" },
+      prop5: { id: "p5", name: "Unsupported Prop", type: "formula" }, // Unsupported
+    },
+  },
+  {
+    id: "db2",
+    name: "Database 2 Title",
+    properties: {
+      propA: { id: "pa", name: "Name", type: "title" },
+      propB: { id: "pb", name: "Email", type: "email" },
+    },
+  },
+];
+
+const mockNotionIntegration: TIntegrationNotion = {
+  id: "integration1",
+  type: "notion",
+  environmentId: environmentId,
+  config: {
+    key: {
+      access_token: "token",
+      bot_id: "bot",
+      workspace_name: "ws",
+      workspace_icon: "",
+    } as unknown as TIntegrationNotionCredential,
+    data: [], // Initially empty
+  },
+};
+
+const mockSelectedIntegration: TIntegrationNotionConfigData & { index: number } = {
+  databaseId: databases[0].id,
+  databaseName: databases[0].name,
+  surveyId: surveys[0].id,
+  surveyName: surveys[0].name,
+  mapping: [
+    {
+      column: { id: "p1", name: "Title Prop", type: "title" },
+      question: { id: "q1", name: "Question 1?", type: TSurveyQuestionTypeEnum.OpenText },
+    },
+    {
+      column: { id: "p2", name: "Text Prop", type: "rich_text" },
+      question: { id: "var1", name: "Variable 1", type: TSurveyQuestionTypeEnum.OpenText },
+    },
+  ],
+  createdAt: new Date(),
+  index: 0,
+};
+
+describe("AddIntegrationModal (Notion)", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  beforeEach(() => {
+    // Reset integration data before each test if needed
+    mockNotionIntegration.config.data = [
+      { ...mockSelectedIntegration }, // Simulate existing data for update/delete tests
+    ];
+  });
+
+  test("renders correctly when open (create mode)", () => {
+    render(
+      <AddIntegrationModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        notionIntegration={{
+          ...mockNotionIntegration,
+          config: { ...mockNotionIntegration.config, data: [] },
+        }}
+        databases={databases}
+        selectedIntegration={null}
+      />
+    );
+
+    expect(screen.getByTestId("modal")).toBeInTheDocument();
+    expect(screen.getByText("environments.integrations.notion.link_database")).toBeInTheDocument();
+    expect(screen.getByTestId("dropdown-select-a-database")).toBeInTheDocument();
+    expect(screen.getByTestId("dropdown-select-survey")).toBeInTheDocument();
+    expect(screen.getByText("Cancel")).toBeInTheDocument();
+    expect(
+      screen.getByRole("button", { name: "environments.integrations.notion.link_database" })
+    ).toBeInTheDocument();
+    expect(screen.queryByText("Delete")).not.toBeInTheDocument();
+    expect(screen.queryByText("Map Formbricks fields to Notion property")).not.toBeInTheDocument();
+  });
+
+  test("renders correctly when open (update mode)", async () => {
+    render(
+      <AddIntegrationModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        notionIntegration={mockNotionIntegration}
+        databases={databases}
+        selectedIntegration={mockSelectedIntegration}
+      />
+    );
+
+    expect(screen.getByTestId("modal")).toBeInTheDocument();
+    expect(screen.getByTestId("dropdown-select-a-database")).toHaveValue(databases[0].id);
+    expect(screen.getByTestId("dropdown-select-survey")).toHaveValue(surveys[0].id);
+    expect(screen.getByText("Map Formbricks fields to Notion property")).toBeInTheDocument();
+
+    // Check if mapping rows are rendered
+    await waitFor(() => {
+      const questionDropdowns = screen.getAllByTestId("dropdown-select-a-survey-question");
+      const columnDropdowns = screen.getAllByTestId("dropdown-select-a-field-to-map");
+
+      expect(questionDropdowns).toHaveLength(2); // Expecting two rows based on mockSelectedIntegration
+      expect(columnDropdowns).toHaveLength(2);
+
+      // Assert values for the first row
+      expect(questionDropdowns[0]).toHaveValue("q1");
+      expect(columnDropdowns[0]).toHaveValue("p1");
+
+      // Assert values for the second row
+      expect(questionDropdowns[1]).toHaveValue("var1");
+      expect(columnDropdowns[1]).toHaveValue("p2");
+
+      expect(screen.getAllByTestId("plus-icon").length).toBeGreaterThan(0);
+      expect(screen.getAllByTestId("x-icon").length).toBeGreaterThan(0);
+    });
+
+    expect(screen.getByText("Delete")).toBeInTheDocument();
+    expect(screen.getByText("Update")).toBeInTheDocument();
+    expect(screen.queryByText("Cancel")).not.toBeInTheDocument();
+  });
+
+  test("selects database and survey, shows mapping", async () => {
+    render(
+      <AddIntegrationModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        notionIntegration={{
+          ...mockNotionIntegration,
+          config: { ...mockNotionIntegration.config, data: [] },
+        }}
+        databases={databases}
+        selectedIntegration={null}
+      />
+    );
+
+    const dbDropdown = screen.getByTestId("dropdown-select-a-database");
+    const surveyDropdown = screen.getByTestId("dropdown-select-survey");
+
+    await userEvent.selectOptions(dbDropdown, databases[0].id);
+    await userEvent.selectOptions(surveyDropdown, surveys[0].id);
+
+    expect(screen.getByText("Map Formbricks fields to Notion property")).toBeInTheDocument();
+    expect(screen.getByTestId("dropdown-select-a-survey-question")).toBeInTheDocument();
+    expect(screen.getByTestId("dropdown-select-a-field-to-map")).toBeInTheDocument();
+  });
+
+  test("adds and removes mapping rows", async () => {
+    render(
+      <AddIntegrationModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        notionIntegration={{
+          ...mockNotionIntegration,
+          config: { ...mockNotionIntegration.config, data: [] },
+        }}
+        databases={databases}
+        selectedIntegration={null}
+      />
+    );
+
+    const dbDropdown = screen.getByTestId("dropdown-select-a-database");
+    const surveyDropdown = screen.getByTestId("dropdown-select-survey");
+
+    await userEvent.selectOptions(dbDropdown, databases[0].id);
+    await userEvent.selectOptions(surveyDropdown, surveys[0].id);
+
+    expect(screen.getAllByTestId("dropdown-select-a-survey-question")).toHaveLength(1);
+
+    const plusButton = screen.getByTestId("plus-icon");
+    await userEvent.click(plusButton);
+
+    expect(screen.getAllByTestId("dropdown-select-a-survey-question")).toHaveLength(2);
+
+    const xButton = screen.getAllByTestId("x-icon")[0]; // Get the first X button
+    await userEvent.click(xButton);
+
+    expect(screen.getAllByTestId("dropdown-select-a-survey-question")).toHaveLength(1);
+  });
+
+  test("deletes integration successfully", async () => {
+    createOrUpdateIntegrationAction.mockResolvedValue({ data: null as any });
+
+    render(
+      <AddIntegrationModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        notionIntegration={mockNotionIntegration} // Contains initial data at index 0
+        databases={databases}
+        selectedIntegration={mockSelectedIntegration}
+      />
+    );
+
+    const deleteButton = screen.getByText("Delete");
+    await userEvent.click(deleteButton);
+
+    await waitFor(() => {
+      expect(createOrUpdateIntegrationAction).toHaveBeenCalledWith({
+        environmentId,
+        integrationData: expect.objectContaining({
+          config: expect.objectContaining({
+            data: [], // Data array should be empty after deletion
+          }),
+        }),
+      });
+    });
+
+    await waitFor(() => {
+      expect(toast.success).toHaveBeenCalledWith("Integration removed successfully.");
+    });
+    await waitFor(() => {
+      expect(mockSetOpen).toHaveBeenCalledWith(false);
+    });
+  });
+
+  test("shows validation error if no database selected", async () => {
+    render(
+      <AddIntegrationModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        notionIntegration={{
+          ...mockNotionIntegration,
+          config: { ...mockNotionIntegration.config, data: [] },
+        }}
+        databases={databases}
+        selectedIntegration={null}
+      />
+    );
+    await userEvent.selectOptions(screen.getByTestId("dropdown-select-survey"), surveys[0].id);
+    await userEvent.click(
+      screen.getByRole("button", { name: "environments.integrations.notion.link_database" })
+    );
+    await waitFor(() => {
+      expect(toast.error).toHaveBeenCalledWith("Please select a database.");
+    });
+  });
+
+  test("shows validation error if no survey selected", async () => {
+    render(
+      <AddIntegrationModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        notionIntegration={{
+          ...mockNotionIntegration,
+          config: { ...mockNotionIntegration.config, data: [] },
+        }}
+        databases={databases}
+        selectedIntegration={null}
+      />
+    );
+    await userEvent.selectOptions(screen.getByTestId("dropdown-select-a-database"), databases[0].id);
+    await userEvent.click(
+      screen.getByRole("button", { name: "environments.integrations.notion.link_database" })
+    );
+    await waitFor(() => {
+      expect(toast.error).toHaveBeenCalledWith("Please select a survey.");
+    });
+  });
+
+  test("shows validation error if no mapping defined", async () => {
+    render(
+      <AddIntegrationModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        notionIntegration={{
+          ...mockNotionIntegration,
+          config: { ...mockNotionIntegration.config, data: [] },
+        }}
+        databases={databases}
+        selectedIntegration={null}
+      />
+    );
+    await userEvent.selectOptions(screen.getByTestId("dropdown-select-a-database"), databases[0].id);
+    await userEvent.selectOptions(screen.getByTestId("dropdown-select-survey"), surveys[0].id);
+    // Default mapping row is empty
+    await userEvent.click(
+      screen.getByRole("button", { name: "environments.integrations.notion.link_database" })
+    );
+    await waitFor(() => {
+      expect(toast.error).toHaveBeenCalledWith("Please select at least one mapping.");
+    });
+  });
+
+  test("calls setOpen(false) and resets form on cancel", async () => {
+    render(
+      <AddIntegrationModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        notionIntegration={{
+          ...mockNotionIntegration,
+          config: { ...mockNotionIntegration.config, data: [] },
+        }}
+        databases={databases}
+        selectedIntegration={null}
+      />
+    );
+
+    const dbDropdown = screen.getByTestId("dropdown-select-a-database");
+    const cancelButton = screen.getByText("Cancel");
+
+    await userEvent.selectOptions(dbDropdown, databases[0].id); // Simulate interaction
+    await userEvent.click(cancelButton);
+
+    expect(mockSetOpen).toHaveBeenCalledWith(false);
+    // Re-render with open=true to check if state was reset
+    cleanup();
+    render(
+      <AddIntegrationModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        notionIntegration={{
+          ...mockNotionIntegration,
+          config: { ...mockNotionIntegration.config, data: [] },
+        }}
+        databases={databases}
+        selectedIntegration={null}
+      />
+    );
+    expect(screen.getByTestId("dropdown-select-a-database")).toHaveValue(""); // Should be reset
+  });
+});

apps/web/app/(app)/environments/[environmentId]/integrations/notion/components/NotionWrapper.test.tsx

@@ -0,0 +1,152 @@
+import { authorize } from "@/app/(app)/environments/[environmentId]/integrations/notion/lib/notion";
+import { cleanup, render, screen, waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TIntegrationNotion, TIntegrationNotionCredential } from "@formbricks/types/integration/notion";
+import { TSurvey } from "@formbricks/types/surveys/types";
+import { NotionWrapper } from "./NotionWrapper";
+
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: false,
+  POSTHOG_API_KEY: "mock-posthog-api-key",
+  POSTHOG_HOST: "mock-posthog-host",
+  IS_POSTHOG_CONFIGURED: true,
+  ENCRYPTION_KEY: "mock-encryption-key",
+  ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "test-githubID",
+  GOOGLE_CLIENT_ID: "test-google-client-id",
+  GOOGLE_CLIENT_SECRET: "test-google-client-secret",
+  AZUREAD_CLIENT_ID: "test-azuread-client-id",
+  AZUREAD_CLIENT_SECRET: "test-azure",
+  AZUREAD_TENANT_ID: "test-azuread-tenant-id",
+  OIDC_DISPLAY_NAME: "test-oidc-display-name",
+  OIDC_CLIENT_ID: "test-oidc-client-id",
+  OIDC_ISSUER: "test-oidc-issuer",
+  OIDC_CLIENT_SECRET: "test-oidc-client-secret",
+  OIDC_SIGNING_ALGORITHM: "test-oidc-signing-algorithm",
+  WEBAPP_URL: "test-webapp-url",
+  IS_PRODUCTION: false,
+  SENTRY_DSN: "mock-sentry-dsn",
+  GOOGLE_SHEETS_CLIENT_SECRET: "test-client-secret",
+  GOOGLE_SHEETS_REDIRECT_URL: "test-redirect-url",
+}));
+
+// Mock child components
+vi.mock("@/app/(app)/environments/[environmentId]/integrations/notion/components/ManageIntegration", () => ({
+  ManageIntegration: vi.fn(({ setIsConnected }) => (
+    <div data-testid="manage-integration">
+      <button onClick={() => setIsConnected(false)}>Disconnect</button>
+    </div>
+  )),
+}));
+vi.mock("@/modules/ui/components/connect-integration", () => ({
+  ConnectIntegration: vi.fn(
+    (
+      { handleAuthorization, isEnabled } // Reverted back to isEnabled
+    ) => (
+      <div data-testid="connect-integration">
+        <button onClick={handleAuthorization} disabled={!isEnabled}>
+          {" "}
+          {/* Reverted back to isEnabled */}
+          Connect
+        </button>
+      </div>
+    )
+  ),
+}));
+
+// Mock library function
+vi.mock("@/app/(app)/environments/[environmentId]/integrations/notion/lib/notion", () => ({
+  authorize: vi.fn(),
+}));
+
+// Mock image import
+vi.mock("@/images/notion-logo.svg", () => ({
+  default: "notion-logo-path",
+}));
+
+// Mock window.location.replace
+Object.defineProperty(window, "location", {
+  value: {
+    replace: vi.fn(),
+  },
+  writable: true,
+});
+
+const environmentId = "test-env-id";
+const webAppUrl = "https://app.formbricks.com";
+const environment = { id: environmentId } as TEnvironment;
+const surveys: TSurvey[] = [];
+const databases = [];
+const locale = "en-US" as const;
+
+const mockNotionIntegration: TIntegrationNotion = {
+  id: "int-notion-123",
+  type: "notion",
+  environmentId: environmentId,
+  config: {
+    key: { access_token: "test-token" } as TIntegrationNotionCredential,
+    data: [],
+  },
+};
+
+const baseProps = {
+  environment,
+  surveys,
+  databasesArray: databases, // Renamed databases to databasesArray to match component prop
+  webAppUrl,
+  locale,
+};
+
+describe("NotionWrapper", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  test("renders ConnectIntegration disabled when enabled is false", () => {
+    // Changed description slightly
+    render(<NotionWrapper {...baseProps} enabled={false} notionIntegration={undefined} />); // Changed isEnabled to enabled
+    expect(screen.getByTestId("connect-integration")).toBeInTheDocument();
+    expect(screen.getByRole("button", { name: "Connect" })).toBeDisabled();
+    expect(screen.queryByTestId("manage-integration")).not.toBeInTheDocument();
+  });
+
+  test("renders ConnectIntegration enabled when enabled is true and not connected (no integration)", () => {
+    // Changed description slightly
+    render(<NotionWrapper {...baseProps} enabled={true} notionIntegration={undefined} />); // Changed isEnabled to enabled
+    expect(screen.getByTestId("connect-integration")).toBeInTheDocument();
+    expect(screen.getByRole("button", { name: "Connect" })).toBeEnabled();
+    expect(screen.queryByTestId("manage-integration")).not.toBeInTheDocument();
+  });
+
+  test("renders ConnectIntegration enabled when enabled is true and not connected (integration without key)", () => {
+    // Changed description slightly
+    const integrationWithoutKey = {
+      ...mockNotionIntegration,
+      config: { data: [] },
+    } as unknown as TIntegrationNotion;
+    render(<NotionWrapper {...baseProps} enabled={true} notionIntegration={integrationWithoutKey} />); // Changed isEnabled to enabled
+    expect(screen.getByTestId("connect-integration")).toBeInTheDocument();
+    expect(screen.getByRole("button", { name: "Connect" })).toBeEnabled();
+    expect(screen.queryByTestId("manage-integration")).not.toBeInTheDocument();
+  });
+
+  test("calls authorize and redirects when Connect button is clicked", async () => {
+    const mockAuthorize = vi.mocked(authorize);
+    const redirectUrl = "https://notion.com/auth";
+    mockAuthorize.mockResolvedValue(redirectUrl);
+
+    render(<NotionWrapper {...baseProps} enabled={true} notionIntegration={undefined} />); // Changed isEnabled to enabled
+
+    const connectButton = screen.getByRole("button", { name: "Connect" });
+    await userEvent.click(connectButton);
+
+    expect(mockAuthorize).toHaveBeenCalledWith(environmentId, webAppUrl);
+    await waitFor(() => {
+      expect(window.location.replace).toHaveBeenCalledWith(redirectUrl);
+    });
+  });
+});

apps/web/app/(app)/environments/[environmentId]/integrations/notion/lib/notion.test.ts

@@ -0,0 +1,58 @@
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { logger } from "@formbricks/logger";
+import { authorize } from "./notion";
+
+// Mock the logger
+vi.mock("@formbricks/logger", () => ({
+  logger: {
+    error: vi.fn(),
+  },
+}));
+
+// Mock fetch
+const mockFetch = vi.fn();
+vi.stubGlobal("fetch", mockFetch);
+
+describe("authorize", () => {
+  const environmentId = "test-env-id";
+  const apiHost = "http://test.com";
+  const expectedUrl = `${apiHost}/api/v1/integrations/notion`;
+  const expectedHeaders = { environmentId: environmentId };
+
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  test("should return authUrl on successful fetch", async () => {
+    const mockAuthUrl = "https://api.notion.com/v1/oauth/authorize?...";
+    mockFetch.mockResolvedValueOnce({
+      ok: true,
+      json: async () => ({ data: { authUrl: mockAuthUrl } }),
+    });
+
+    const authUrl = await authorize(environmentId, apiHost);
+
+    expect(mockFetch).toHaveBeenCalledWith(expectedUrl, {
+      method: "GET",
+      headers: expectedHeaders,
+    });
+    expect(authUrl).toBe(mockAuthUrl);
+    expect(logger.error).not.toHaveBeenCalled();
+  });
+
+  test("should throw error and log on failed fetch", async () => {
+    const errorText = "Failed to fetch";
+    mockFetch.mockResolvedValueOnce({
+      ok: false,
+      text: async () => errorText,
+    });
+
+    await expect(authorize(environmentId, apiHost)).rejects.toThrow("Could not create response");
+
+    expect(mockFetch).toHaveBeenCalledWith(expectedUrl, {
+      method: "GET",
+      headers: expectedHeaders,
+    });
+    expect(logger.error).toHaveBeenCalledWith({ errorText }, "authorize: Could not fetch notion config");
+  });
+});

apps/web/app/(app)/environments/[environmentId]/integrations/notion/loading.test.tsx

@@ -0,0 +1,50 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import Loading from "./loading";
+
+// Mock child components
+vi.mock("@/modules/ui/components/button", () => ({
+  Button: ({ children, className }: { children: React.ReactNode; className: string }) => (
+    <button className={className}>{children}</button>
+  ),
+}));
+vi.mock("@/modules/ui/components/go-back-button", () => ({
+  GoBackButton: () => <div data-testid="go-back-button">Go Back</div>,
+}));
+
+// Mock @tolgee/react
+vi.mock("@tolgee/react", () => ({
+  useTranslate: () => ({
+    t: (key: string) => key, // Simple mock translation
+  }),
+}));
+
+describe("Notion Integration Loading", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  test("renders loading state correctly", () => {
+    render(<Loading />);
+
+    // Check for GoBackButton mock
+    expect(screen.getByTestId("go-back-button")).toBeInTheDocument();
+
+    // Check for the disabled button
+    const linkButton = screen.getByText("environments.integrations.notion.link_database");
+    expect(linkButton).toBeInTheDocument();
+    expect(linkButton.closest("button")).toHaveClass(
+      "pointer-events-none animate-pulse cursor-not-allowed select-none bg-slate-200"
+    );
+
+    // Check for table headers
+    expect(screen.getByText("common.survey")).toBeInTheDocument();
+    expect(screen.getByText("environments.integrations.notion.database_name")).toBeInTheDocument();
+    expect(screen.getByText("common.updated_at")).toBeInTheDocument();
+
+    // Check for placeholder elements (skeleton loaders)
+    // There should be 3 rows * 5 pulse divs per row = 15 pulse divs
+    const pulseDivs = screen.getAllByText("", { selector: "div.animate-pulse" });
+    expect(pulseDivs.length).toBeGreaterThanOrEqual(15); // Check if at least 15 pulse divs are rendered
+  });
+});

apps/web/app/(app)/environments/[environmentId]/integrations/notion/page.test.tsx

@@ -0,0 +1,250 @@
+import { getSurveys } from "@/app/(app)/environments/[environmentId]/integrations/lib/surveys";
+import Page from "@/app/(app)/environments/[environmentId]/integrations/notion/page";
+import { getIntegrationByType } from "@/lib/integration/service";
+import { getNotionDatabases } from "@/lib/notion/service";
+import { findMatchingLocale } from "@/lib/utils/locale";
+import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
+import { TEnvironmentAuth } from "@/modules/environments/types/environment-auth";
+import { cleanup, render, screen } from "@testing-library/react";
+import { redirect } from "next/navigation";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TIntegrationNotion, TIntegrationNotionDatabase } from "@formbricks/types/integration/notion";
+import { TSurvey } from "@formbricks/types/surveys/types";
+
+// Mock dependencies
+vi.mock("@/app/(app)/environments/[environmentId]/integrations/notion/components/NotionWrapper", () => ({
+  NotionWrapper: vi.fn(
+    ({ enabled, environment, surveys, notionIntegration, webAppUrl, databasesArray, locale }) => (
+      <div>
+        <span>Mocked NotionWrapper</span>
+        <span data-testid="enabled">{enabled.toString()}</span>
+        <span data-testid="environmentId">{environment.id}</span>
+        <span data-testid="surveyCount">{surveys?.length ?? 0}</span>
+        <span data-testid="integrationId">{notionIntegration?.id}</span>
+        <span data-testid="webAppUrl">{webAppUrl}</span>
+        <span data-testid="databaseCount">{databasesArray?.length ?? 0}</span>
+        <span data-testid="locale">{locale}</span>
+      </div>
+    )
+  ),
+}));
+vi.mock("@/app/(app)/environments/[environmentId]/integrations/lib/surveys", () => ({
+  getSurveys: vi.fn(),
+}));
+
+let mockNotionClientId: string | undefined = "test-client-id";
+let mockNotionClientSecret: string | undefined = "test-client-secret";
+let mockNotionAuthUrl: string | undefined = "https://notion.com/auth";
+let mockNotionRedirectUri: string | undefined = "https://app.formbricks.com/redirect";
+
+vi.mock("@/lib/constants", () => ({
+  get NOTION_OAUTH_CLIENT_ID() {
+    return mockNotionClientId;
+  },
+  get NOTION_OAUTH_CLIENT_SECRET() {
+    return mockNotionClientSecret;
+  },
+  get NOTION_AUTH_URL() {
+    return mockNotionAuthUrl;
+  },
+  get NOTION_REDIRECT_URI() {
+    return mockNotionRedirectUri;
+  },
+  WEBAPP_URL: "test-webapp-url",
+  IS_FORMBRICKS_CLOUD: false,
+  POSTHOG_API_KEY: "mock-posthog-api-key",
+  POSTHOG_HOST: "mock-posthog-host",
+  IS_POSTHOG_CONFIGURED: true,
+  ENCRYPTION_KEY: "mock-encryption-key",
+  ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "test-githubID",
+  GOOGLE_CLIENT_ID: "test-google-client-id",
+  GOOGLE_CLIENT_SECRET: "test-google-client-secret",
+  AZUREAD_CLIENT_ID: "test-azuread-client-id",
+  AZUREAD_CLIENT_SECRET: "test-azure",
+  AZUREAD_TENANT_ID: "test-azuread-tenant-id",
+  OIDC_DISPLAY_NAME: "test-oidc-display-name",
+  OIDC_CLIENT_ID: "test-oidc-client-id",
+  OIDC_ISSUER: "test-oidc-issuer",
+  OIDC_CLIENT_SECRET: "test-oidc-client-secret",
+  OIDC_SIGNING_ALGORITHM: "test-oidc-signing-algorithm",
+  IS_PRODUCTION: false,
+  SENTRY_DSN: "mock-sentry-dsn",
+}));
+vi.mock("@/lib/integration/service", () => ({
+  getIntegrationByType: vi.fn(),
+}));
+vi.mock("@/lib/notion/service", () => ({
+  getNotionDatabases: vi.fn(),
+}));
+vi.mock("@/lib/utils/locale", () => ({
+  findMatchingLocale: vi.fn(),
+}));
+vi.mock("@/modules/environments/lib/utils", () => ({
+  getEnvironmentAuth: vi.fn(),
+}));
+vi.mock("@/modules/ui/components/go-back-button", () => ({
+  GoBackButton: vi.fn(({ url }) => <div data-testid="go-back">{url}</div>),
+}));
+vi.mock("@/modules/ui/components/page-content-wrapper", () => ({
+  PageContentWrapper: vi.fn(({ children }) => <div>{children}</div>),
+}));
+vi.mock("@/modules/ui/components/page-header", () => ({
+  PageHeader: vi.fn(({ pageTitle }) => <h1>{pageTitle}</h1>),
+}));
+vi.mock("@/tolgee/server", () => ({
+  getTranslate: async () => (key: string) => key,
+}));
+vi.mock("next/navigation", () => ({
+  redirect: vi.fn(),
+}));
+
+const mockEnvironment = {
+  id: "test-env-id",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  appSetupCompleted: false,
+  type: "development",
+} as unknown as TEnvironment;
+
+const mockSurveys: TSurvey[] = [
+  {
+    id: "survey1",
+    name: "Survey 1",
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    environmentId: "test-env-id",
+    status: "inProgress",
+    type: "app",
+    questions: [],
+    triggers: [],
+    recontactDays: null,
+    autoClose: null,
+    closeOnDate: null,
+    delay: 0,
+    displayOption: "displayOnce",
+    displayPercentage: null,
+    languages: [],
+    pin: null,
+    resultShareKey: null,
+    segment: null,
+    singleUse: null,
+    styling: null,
+    surveyClosedMessage: null,
+    welcomeCard: { enabled: false } as unknown as TSurvey["welcomeCard"],
+    autoComplete: null,
+    runOnDate: null,
+  } as unknown as TSurvey,
+];
+
+const mockNotionIntegration = {
+  id: "integration1",
+  type: "notion",
+  config: {
+    data: [],
+    key: { bot_id: "bot-id-123" },
+    email: "test@example.com",
+  },
+} as unknown as TIntegrationNotion;
+
+const mockDatabases: TIntegrationNotionDatabase[] = [
+  { id: "db1", name: "Database 1", properties: {} },
+  { id: "db2", name: "Database 2", properties: {} },
+];
+
+const mockProps = {
+  params: { environmentId: "test-env-id" },
+};
+
+describe("NotionIntegrationPage", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  beforeEach(() => {
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      environment: mockEnvironment,
+      isReadOnly: false,
+    } as TEnvironmentAuth);
+    vi.mocked(getSurveys).mockResolvedValue(mockSurveys);
+    vi.mocked(getIntegrationByType).mockResolvedValue(mockNotionIntegration);
+    vi.mocked(getNotionDatabases).mockResolvedValue(mockDatabases);
+    vi.mocked(findMatchingLocale).mockResolvedValue("en-US");
+    mockNotionClientId = "test-client-id";
+    mockNotionClientSecret = "test-client-secret";
+    mockNotionAuthUrl = "https://notion.com/auth";
+    mockNotionRedirectUri = "https://app.formbricks.com/redirect";
+  });
+
+  test("renders the page with NotionWrapper when enabled and not read-only", async () => {
+    const PageComponent = await Page(mockProps);
+    render(PageComponent);
+
+    expect(screen.getByText("environments.integrations.notion.notion_integration")).toBeInTheDocument();
+    expect(screen.getByText("Mocked NotionWrapper")).toBeInTheDocument();
+    expect(screen.getByTestId("enabled")).toHaveTextContent("true");
+    expect(screen.getByTestId("environmentId")).toHaveTextContent(mockEnvironment.id);
+    expect(screen.getByTestId("surveyCount")).toHaveTextContent(mockSurveys.length.toString());
+    expect(screen.getByTestId("integrationId")).toHaveTextContent(mockNotionIntegration.id);
+    expect(screen.getByTestId("webAppUrl")).toHaveTextContent("test-webapp-url");
+    expect(screen.getByTestId("databaseCount")).toHaveTextContent(mockDatabases.length.toString());
+    expect(screen.getByTestId("locale")).toHaveTextContent("en-US");
+    expect(screen.getByTestId("go-back")).toHaveTextContent(
+      `test-webapp-url/environments/${mockProps.params.environmentId}/integrations`
+    );
+    expect(vi.mocked(redirect)).not.toHaveBeenCalled();
+    expect(vi.mocked(getNotionDatabases)).toHaveBeenCalledWith(mockEnvironment.id);
+  });
+
+  test("calls redirect when user is read-only", async () => {
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      environment: mockEnvironment,
+      isReadOnly: true,
+    } as TEnvironmentAuth);
+
+    const PageComponent = await Page(mockProps);
+    render(PageComponent);
+
+    expect(vi.mocked(redirect)).toHaveBeenCalledWith("./");
+  });
+
+  test("passes enabled=false to NotionWrapper when constants are missing", async () => {
+    mockNotionClientId = undefined; // Simulate missing constant
+
+    const PageComponent = await Page(mockProps);
+    render(PageComponent);
+
+    expect(screen.getByTestId("enabled")).toHaveTextContent("false");
+  });
+
+  test("handles case where no Notion integration exists", async () => {
+    vi.mocked(getIntegrationByType).mockResolvedValue(null); // No integration
+
+    const PageComponent = await Page(mockProps);
+    render(PageComponent);
+
+    expect(screen.getByText("Mocked NotionWrapper")).toBeInTheDocument();
+    expect(screen.getByTestId("integrationId")).toBeEmptyDOMElement(); // No integration ID passed
+    expect(screen.getByTestId("databaseCount")).toHaveTextContent("0"); // No databases fetched
+    expect(vi.mocked(getNotionDatabases)).not.toHaveBeenCalled();
+  });
+
+  test("handles case where integration exists but has no key (bot_id)", async () => {
+    const integrationWithoutKey = {
+      ...mockNotionIntegration,
+      config: { ...mockNotionIntegration.config, key: undefined },
+    } as unknown as TIntegrationNotion;
+    vi.mocked(getIntegrationByType).mockResolvedValue(integrationWithoutKey);
+
+    const PageComponent = await Page(mockProps);
+    render(PageComponent);
+
+    expect(screen.getByText("Mocked NotionWrapper")).toBeInTheDocument();
+    expect(screen.getByTestId("integrationId")).toHaveTextContent(integrationWithoutKey.id);
+    expect(screen.getByTestId("databaseCount")).toHaveTextContent("0"); // No databases fetched
+    expect(vi.mocked(getNotionDatabases)).not.toHaveBeenCalled();
+  });
+});

apps/web/app/(app)/environments/[environmentId]/integrations/page.test.tsx

@@ -0,0 +1,243 @@
+import { getWebhookCountBySource } from "@/app/(app)/environments/[environmentId]/integrations/lib/webhook";
+import Page from "@/app/(app)/environments/[environmentId]/integrations/page";
+import { getIntegrations } from "@/lib/integration/service";
+import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
+import { TEnvironmentAuth } from "@/modules/environments/types/environment-auth";
+import { cleanup, render, screen } from "@testing-library/react";
+import { redirect } from "next/navigation";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TIntegration } from "@formbricks/types/integration";
+
+// Mock dependencies
+vi.mock("@/app/(app)/environments/[environmentId]/integrations/lib/webhook", () => ({
+  getWebhookCountBySource: vi.fn(),
+}));
+
+vi.mock("@/lib/integration/service", () => ({
+  getIntegrations: vi.fn(),
+}));
+
+vi.mock("@/modules/environments/lib/utils", () => ({
+  getEnvironmentAuth: vi.fn(),
+}));
+
+vi.mock("@/modules/ui/components/integration-card", () => ({
+  Card: ({ label, description, statusText, disabled }) => (
+    <div data-testid={`card-${label}`}>
+      <h1>{label}</h1>
+      <p>{description}</p>
+      <span>{statusText}</span>
+      {disabled && <span>Disabled</span>}
+    </div>
+  ),
+}));
+
+vi.mock("@/modules/ui/components/page-content-wrapper", () => ({
+  PageContentWrapper: ({ children }) => <div>{children}</div>,
+}));
+
+vi.mock("@/modules/ui/components/page-header", () => ({
+  PageHeader: ({ pageTitle }) => <h1>{pageTitle}</h1>,
+}));
+
+vi.mock("@/tolgee/server", () => ({
+  getTranslate: async () => (key: string) => key,
+}));
+
+vi.mock("next/image", () => ({
+  // eslint-disable-next-line @next/next/no-img-element
+  default: ({ alt }) => <img alt={alt} />,
+}));
+
+vi.mock("next/navigation", () => ({
+  redirect: vi.fn(),
+}));
+
+const mockEnvironment = {
+  id: "test-env-id",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  type: "development",
+  appSetupCompleted: true,
+} as unknown as TEnvironment;
+
+const mockIntegrations: TIntegration[] = [
+  {
+    id: "google-sheets-id",
+    type: "googleSheets",
+    environmentId: "test-env-id",
+    config: { data: [], email: "test@example.com" } as unknown as TIntegration["config"],
+  },
+  {
+    id: "slack-id",
+    type: "slack",
+    environmentId: "test-env-id",
+    config: { data: [] } as unknown as TIntegration["config"],
+  },
+];
+
+const mockParams = { environmentId: "test-env-id" };
+const mockProps = { params: mockParams };
+
+describe("Integrations Page", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  beforeEach(() => {
+    vi.mocked(getWebhookCountBySource).mockResolvedValue(0);
+    vi.mocked(getIntegrations).mockResolvedValue([]);
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      environment: mockEnvironment,
+      isReadOnly: false,
+      isBilling: false,
+    } as unknown as TEnvironmentAuth);
+  });
+
+  test("renders the page header and integration cards", async () => {
+    vi.mocked(getWebhookCountBySource).mockImplementation(async (envId, source) => {
+      if (source === "zapier") return 1;
+      if (source === "user") return 2;
+      return 0;
+    });
+    vi.mocked(getIntegrations).mockResolvedValue(mockIntegrations);
+
+    const PageComponent = await Page(mockProps);
+    render(PageComponent);
+
+    expect(screen.getByText("common.integrations")).toBeInTheDocument(); // Page Header
+    expect(screen.getByTestId("card-Javascript SDK")).toBeInTheDocument();
+    expect(
+      screen.getByText("environments.integrations.website_or_app_integration_description")
+    ).toBeInTheDocument();
+    expect(screen.getAllByText("common.connected")[0]).toBeInTheDocument(); // JS SDK status
+
+    expect(screen.getByTestId("card-Zapier")).toBeInTheDocument();
+    expect(screen.getByText("environments.integrations.zapier_integration_description")).toBeInTheDocument();
+    expect(screen.getByText("1 zap")).toBeInTheDocument(); // Zapier status
+
+    expect(screen.getByTestId("card-Webhooks")).toBeInTheDocument();
+    expect(screen.getByText("environments.integrations.webhook_integration_description")).toBeInTheDocument();
+    expect(screen.getByText("2 webhooks")).toBeInTheDocument(); // Webhook status
+
+    expect(screen.getByTestId("card-Google Sheets")).toBeInTheDocument();
+    expect(
+      screen.getByText("environments.integrations.google_sheet_integration_description")
+    ).toBeInTheDocument();
+    expect(screen.getAllByText("common.connected")[1]).toBeInTheDocument(); // Google Sheets status
+
+    expect(screen.getByTestId("card-Airtable")).toBeInTheDocument();
+    expect(
+      screen.getByText("environments.integrations.airtable_integration_description")
+    ).toBeInTheDocument();
+    expect(screen.getAllByText("common.not_connected")[0]).toBeInTheDocument(); // Airtable status
+
+    expect(screen.getByTestId("card-Slack")).toBeInTheDocument();
+    expect(screen.getByText("environments.integrations.slack_integration_description")).toBeInTheDocument();
+    expect(screen.getAllByText("common.connected")[2]).toBeInTheDocument(); // Slack status
+
+    expect(screen.getByTestId("card-n8n")).toBeInTheDocument();
+    expect(screen.getByText("environments.integrations.n8n_integration_description")).toBeInTheDocument();
+    expect(screen.getAllByText("common.not_connected")[1]).toBeInTheDocument(); // n8n status
+
+    expect(screen.getByTestId("card-Make.com")).toBeInTheDocument();
+    expect(screen.getByText("environments.integrations.make_integration_description")).toBeInTheDocument();
+    expect(screen.getAllByText("common.not_connected")[2]).toBeInTheDocument(); // Make status
+
+    expect(screen.getByTestId("card-Notion")).toBeInTheDocument();
+    expect(screen.getByText("environments.integrations.notion_integration_description")).toBeInTheDocument();
+    expect(screen.getAllByText("common.not_connected")[3]).toBeInTheDocument(); // Notion status
+
+    expect(screen.getByTestId("card-Activepieces")).toBeInTheDocument();
+    expect(
+      screen.getByText("environments.integrations.activepieces_integration_description")
+    ).toBeInTheDocument();
+    expect(screen.getAllByText("common.not_connected")[4]).toBeInTheDocument(); // Activepieces status
+  });
+
+  test("renders disabled cards when isReadOnly is true", async () => {
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      environment: mockEnvironment,
+      isReadOnly: true,
+      isBilling: false,
+    } as unknown as TEnvironmentAuth);
+
+    const PageComponent = await Page(mockProps);
+    render(PageComponent);
+
+    // JS SDK and Webhooks should not be disabled
+    expect(screen.getByTestId("card-Javascript SDK")).not.toHaveTextContent("Disabled");
+    expect(screen.getByTestId("card-Webhooks")).not.toHaveTextContent("Disabled");
+
+    // Other cards should be disabled
+    expect(screen.getByTestId("card-Zapier")).toHaveTextContent("Disabled");
+    expect(screen.getByTestId("card-Google Sheets")).toHaveTextContent("Disabled");
+    expect(screen.getByTestId("card-Airtable")).toHaveTextContent("Disabled");
+    expect(screen.getByTestId("card-Slack")).toHaveTextContent("Disabled");
+    expect(screen.getByTestId("card-n8n")).toHaveTextContent("Disabled");
+    expect(screen.getByTestId("card-Make.com")).toHaveTextContent("Disabled");
+    expect(screen.getByTestId("card-Notion")).toHaveTextContent("Disabled");
+    expect(screen.getByTestId("card-Activepieces")).toHaveTextContent("Disabled");
+  });
+
+  test("redirects when isBilling is true", async () => {
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      environment: mockEnvironment,
+      isReadOnly: false,
+      isBilling: true,
+    } as unknown as TEnvironmentAuth);
+
+    await Page(mockProps);
+
+    expect(vi.mocked(redirect)).toHaveBeenCalledWith(
+      `/environments/${mockParams.environmentId}/settings/billing`
+    );
+  });
+
+  test("renders correct status text for single integration", async () => {
+    vi.mocked(getWebhookCountBySource).mockImplementation(async (envId, source) => {
+      if (source === "n8n") return 1;
+      if (source === "make") return 1;
+      if (source === "activepieces") return 1;
+      return 0;
+    });
+
+    const PageComponent = await Page(mockProps);
+    render(PageComponent);
+
+    expect(screen.getByTestId("card-n8n")).toHaveTextContent("1 common.integration");
+    expect(screen.getByTestId("card-Make.com")).toHaveTextContent("1 common.integration");
+    expect(screen.getByTestId("card-Activepieces")).toHaveTextContent("1 common.integration");
+  });
+
+  test("renders correct status text for multiple integrations", async () => {
+    vi.mocked(getWebhookCountBySource).mockImplementation(async (envId, source) => {
+      if (source === "n8n") return 3;
+      if (source === "make") return 4;
+      if (source === "activepieces") return 5;
+      return 0;
+    });
+
+    const PageComponent = await Page(mockProps);
+    render(PageComponent);
+
+    expect(screen.getByTestId("card-n8n")).toHaveTextContent("3 common.integrations");
+    expect(screen.getByTestId("card-Make.com")).toHaveTextContent("4 common.integrations");
+    expect(screen.getByTestId("card-Activepieces")).toHaveTextContent("5 common.integrations");
+  });
+
+  test("renders not connected status when widgetSetupCompleted is false", async () => {
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      environment: { ...mockEnvironment, appSetupCompleted: false },
+      isReadOnly: false,
+      isBilling: false,
+    } as unknown as TEnvironmentAuth);
+
+    const PageComponent = await Page(mockProps);
+    render(PageComponent);
+
+    expect(screen.getByTestId("card-Javascript SDK")).toHaveTextContent("common.not_connected");
+  });
+});

apps/web/app/(app)/environments/[environmentId]/integrations/slack/components/AddChannelMappingModal.test.tsx

@@ -0,0 +1,750 @@
+import { createOrUpdateIntegrationAction } from "@/app/(app)/environments/[environmentId]/integrations/actions";
+import { cleanup, render, screen, waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TIntegrationItem } from "@formbricks/types/integration";
+import {
+  TIntegrationSlack,
+  TIntegrationSlackConfigData,
+  TIntegrationSlackCredential,
+} from "@formbricks/types/integration/slack";
+import { TSurvey, TSurveyQuestion, TSurveyQuestionTypeEnum } from "@formbricks/types/surveys/types";
+import { AddChannelMappingModal } from "./AddChannelMappingModal";
+
+// Mock dependencies
+vi.mock("@/app/(app)/environments/[environmentId]/integrations/actions", () => ({
+  createOrUpdateIntegrationAction: vi.fn(),
+}));
+vi.mock("@/lib/i18n/utils", () => ({
+  getLocalizedValue: (value: any, _locale: string) => value?.default || "",
+}));
+vi.mock("@/lib/utils/recall", () => ({
+  replaceHeadlineRecall: (survey: any) => survey,
+}));
+vi.mock("@/modules/ui/components/additional-integration-settings", () => ({
+  AdditionalIntegrationSettings: ({
+    includeVariables,
+    setIncludeVariables,
+    includeHiddenFields,
+    setIncludeHiddenFields,
+    includeMetadata,
+    setIncludeMetadata,
+    includeCreatedAt,
+    setIncludeCreatedAt,
+  }: any) => (
+    <div>
+      <span>Additional Settings</span>
+      <input
+        data-testid="include-variables"
+        type="checkbox"
+        checked={includeVariables}
+        onChange={(e) => setIncludeVariables(e.target.checked)}
+      />
+      <input
+        data-testid="include-hidden-fields"
+        type="checkbox"
+        checked={includeHiddenFields}
+        onChange={(e) => setIncludeHiddenFields(e.target.checked)}
+      />
+      <input
+        data-testid="include-metadata"
+        type="checkbox"
+        checked={includeMetadata}
+        onChange={(e) => setIncludeMetadata(e.target.checked)}
+      />
+      <input
+        data-testid="include-created-at"
+        type="checkbox"
+        checked={includeCreatedAt}
+        onChange={(e) => setIncludeCreatedAt(e.target.checked)}
+      />
+    </div>
+  ),
+}));
+vi.mock("@/modules/ui/components/dropdown-selector", () => ({
+  DropdownSelector: ({ label, items, selectedItem, setSelectedItem, disabled }: any) => (
+    <div>
+      <label>{label}</label>
+      <select
+        data-testid={label.includes("channel") ? "channel-dropdown" : "survey-dropdown"}
+        value={selectedItem?.id || ""}
+        onChange={(e) => {
+          const selected = items.find((item: any) => item.id === e.target.value);
+          setSelectedItem(selected);
+        }}
+        disabled={disabled}>
+        <option value="">Select...</option>
+        {items.map((item: any) => (
+          <option key={item.id} value={item.id}>
+            {item.name}
+          </option>
+        ))}
+      </select>
+    </div>
+  ),
+}));
+vi.mock("@/modules/ui/components/modal", () => ({
+  Modal: ({ open, children }: { open: boolean; children: React.ReactNode }) =>
+    open ? <div data-testid="modal">{children}</div> : null,
+}));
+vi.mock("next/image", () => ({
+  // eslint-disable-next-line @next/next/no-img-element
+  default: ({ src, alt }: { src: string; alt: string }) => <img src={src} alt={alt} />,
+}));
+vi.mock("next/link", () => ({
+  default: ({ href, children, ...props }: any) => (
+    <a href={href} {...props}>
+      {children}
+    </a>
+  ),
+}));
+vi.mock("react-hook-form", () => ({
+  useForm: () => ({
+    handleSubmit: (callback: any) => (event: any) => {
+      event.preventDefault();
+      callback();
+    },
+  }),
+}));
+vi.mock("react-hot-toast", () => ({
+  default: {
+    success: vi.fn(),
+    error: vi.fn(),
+  },
+}));
+vi.mock("@tolgee/react", async () => {
+  const MockTolgeeProvider = ({ children }: { children: React.ReactNode }) => <>{children}</>;
+  const useTranslate = () => ({
+    t: (key: string, _?: any) => {
+      // NOSONAR
+      // Simple mock translation function
+      if (key === "common.all_questions") return "All questions";
+      if (key === "common.selected_questions") return "Selected questions";
+      if (key === "environments.integrations.slack.link_slack_channel") return "Link Slack Channel";
+      if (key === "common.update") return "Update";
+      if (key === "common.delete") return "Delete";
+      if (key === "common.cancel") return "Cancel";
+      if (key === "environments.integrations.slack.select_channel") return "Select channel";
+      if (key === "common.select_survey") return "Select survey";
+      if (key === "common.questions") return "Questions";
+      if (key === "environments.integrations.slack.please_select_a_channel")
+        return "Please select a channel.";
+      if (key === "environments.integrations.please_select_a_survey_error") return "Please select a survey.";
+      if (key === "environments.integrations.select_at_least_one_question_error")
+        return "Please select at least one question.";
+      if (key === "environments.integrations.integration_updated_successfully")
+        return "Integration updated successfully.";
+      if (key === "environments.integrations.integration_added_successfully")
+        return "Integration added successfully.";
+      if (key === "environments.integrations.integration_removed_successfully")
+        return "Integration removed successfully.";
+      if (key === "environments.integrations.slack.dont_see_your_channel") return "Don't see your channel?";
+      if (key === "common.note") return "Note";
+      if (key === "environments.integrations.slack.already_connected_another_survey")
+        return "This channel is already connected to another survey.";
+      if (key === "environments.integrations.slack.create_at_least_one_channel_error")
+        return "Please create at least one channel in Slack first.";
+      if (key === "environments.integrations.create_survey_warning")
+        return "You need to create a survey first.";
+      if (key === "environments.integrations.slack.link_channel") return "Link Channel";
+      return key; // Return key if no translation is found
+    },
+  });
+  return { TolgeeProvider: MockTolgeeProvider, useTranslate };
+});
+vi.mock("lucide-react", () => ({
+  CircleHelpIcon: () => <div data-testid="circle-help-icon" />,
+  Check: () => <div data-testid="check-icon" />, // Add the Check icon mock
+  Loader2: () => <div data-testid="loader-icon" />, // Add the Loader2 icon mock
+}));
+
+// Mock dependencies
+const createOrUpdateIntegrationActionMock = vi.mocked(createOrUpdateIntegrationAction);
+const toast = vi.mocked((await import("react-hot-toast")).default);
+
+const environmentId = "test-env-id";
+const mockSetOpen = vi.fn();
+
+const surveys: TSurvey[] = [
+  {
+    id: "survey1",
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    name: "Survey 1",
+    type: "app",
+    environmentId: environmentId,
+    status: "inProgress",
+    questions: [
+      {
+        id: "q1",
+        type: TSurveyQuestionTypeEnum.OpenText,
+        headline: { default: "Question 1?" },
+        required: true,
+      } as unknown as TSurveyQuestion,
+      {
+        id: "q2",
+        type: TSurveyQuestionTypeEnum.MultipleChoiceSingle,
+        headline: { default: "Question 2?" },
+        required: false,
+        choices: [
+          { id: "c1", label: { default: "Choice 1" } },
+          { id: "c2", label: { default: "Choice 2" } },
+        ],
+      },
+    ],
+    triggers: [],
+    recontactDays: null,
+    autoClose: null,
+    closeOnDate: null,
+    delay: 0,
+    displayOption: "displayOnce",
+    displayPercentage: null,
+    autoComplete: null,
+    singleUse: null,
+    styling: null,
+    surveyClosedMessage: null,
+    segment: null,
+    languages: [],
+    variables: [],
+    welcomeCard: { enabled: true } as unknown as TSurvey["welcomeCard"],
+    hiddenFields: { enabled: true, fieldIds: [] },
+    pin: null,
+    resultShareKey: null,
+    displayLimit: null,
+  } as unknown as TSurvey,
+  {
+    id: "survey2",
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    name: "Survey 2",
+    type: "link",
+    environmentId: environmentId,
+    status: "draft",
+    questions: [
+      {
+        id: "q3",
+        type: TSurveyQuestionTypeEnum.Rating,
+        headline: { default: "Rate this?" },
+        required: true,
+        scale: "number",
+        range: 5,
+      } as unknown as TSurveyQuestion,
+    ],
+    triggers: [],
+    recontactDays: null,
+    autoClose: null,
+    closeOnDate: null,
+    delay: 0,
+    displayOption: "displayOnce",
+    displayPercentage: null,
+    autoComplete: null,
+    singleUse: null,
+    styling: null,
+    surveyClosedMessage: null,
+    segment: null,
+    languages: [],
+    variables: [],
+    welcomeCard: { enabled: true } as unknown as TSurvey["welcomeCard"],
+    hiddenFields: { enabled: true, fieldIds: [] },
+    pin: null,
+    resultShareKey: null,
+    displayLimit: null,
+  } as unknown as TSurvey,
+];
+
+const channels: TIntegrationItem[] = [
+  { id: "channel1", name: "#general" },
+  { id: "channel2", name: "#random" },
+];
+
+const mockSlackIntegration: TIntegrationSlack = {
+  id: "integration1",
+  type: "slack",
+  environmentId: environmentId,
+  config: {
+    key: {
+      access_token: "xoxb-test-token",
+      team_name: "Test Team",
+      team_id: "T123",
+    } as unknown as TIntegrationSlackCredential,
+    data: [], // Initially empty
+  },
+};
+
+const mockSelectedIntegration: TIntegrationSlackConfigData & { index: number } = {
+  channelId: channels[0].id,
+  channelName: channels[0].name,
+  surveyId: surveys[0].id,
+  surveyName: surveys[0].name,
+  questionIds: [surveys[0].questions[0].id],
+  questions: "Selected questions",
+  createdAt: new Date(),
+  includeVariables: true,
+  includeHiddenFields: false,
+  includeMetadata: true,
+  includeCreatedAt: false,
+  index: 0,
+};
+
+describe("AddChannelMappingModal", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  beforeEach(() => {
+    // Reset integration data before each test if needed
+    mockSlackIntegration.config.data = [
+      { ...mockSelectedIntegration }, // Simulate existing data for update/delete tests
+    ];
+  });
+
+  test("renders correctly when open (create mode)", () => {
+    render(
+      <AddChannelMappingModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        slackIntegration={mockSlackIntegration}
+        channels={channels}
+        selectedIntegration={null}
+      />
+    );
+
+    expect(screen.getByTestId("modal")).toBeInTheDocument();
+    expect(
+      screen.getByText("Link Slack Channel", { selector: "div.text-xl.font-medium" })
+    ).toBeInTheDocument();
+    expect(screen.getByTestId("channel-dropdown")).toBeInTheDocument();
+    expect(screen.getByTestId("survey-dropdown")).toBeInTheDocument();
+    expect(screen.getByText("Cancel")).toBeInTheDocument();
+    expect(screen.getByRole("button", { name: "Link Channel" })).toBeInTheDocument();
+    expect(screen.queryByText("Delete")).not.toBeInTheDocument();
+    expect(screen.queryByText("Questions")).not.toBeInTheDocument();
+    expect(screen.getByTestId("circle-help-icon")).toBeInTheDocument();
+    expect(screen.getByText("Don't see your channel?")).toBeInTheDocument();
+  });
+
+  test("renders correctly when open (update mode)", () => {
+    render(
+      <AddChannelMappingModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        slackIntegration={mockSlackIntegration}
+        channels={channels}
+        selectedIntegration={mockSelectedIntegration}
+      />
+    );
+
+    expect(screen.getByTestId("modal")).toBeInTheDocument();
+    expect(
+      screen.getByText("Link Slack Channel", { selector: "div.text-xl.font-medium" })
+    ).toBeInTheDocument();
+    expect(screen.getByTestId("channel-dropdown")).toHaveValue(channels[0].id);
+    expect(screen.getByTestId("survey-dropdown")).toHaveValue(surveys[0].id);
+    expect(screen.getByText("Questions")).toBeInTheDocument();
+    expect(screen.getByText("Delete")).toBeInTheDocument();
+    expect(screen.getByText("Update")).toBeInTheDocument();
+    expect(screen.queryByText("Cancel")).not.toBeInTheDocument();
+    expect(screen.getByTestId("include-variables")).toBeChecked();
+    expect(screen.getByTestId("include-hidden-fields")).not.toBeChecked();
+    expect(screen.getByTestId("include-metadata")).toBeChecked();
+    expect(screen.getByTestId("include-created-at")).not.toBeChecked();
+  });
+
+  test("selects survey and shows questions", async () => {
+    render(
+      <AddChannelMappingModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        slackIntegration={mockSlackIntegration}
+        channels={channels}
+        selectedIntegration={null}
+      />
+    );
+
+    const surveyDropdown = screen.getByTestId("survey-dropdown");
+    await userEvent.selectOptions(surveyDropdown, surveys[1].id);
+
+    expect(screen.getByText("Questions")).toBeInTheDocument();
+    surveys[1].questions.forEach((q) => {
+      expect(screen.getByLabelText(q.headline.default)).toBeInTheDocument();
+      // Initially all questions should be checked when a survey is selected in create mode
+      expect(screen.getByLabelText(q.headline.default)).toBeChecked();
+    });
+  });
+
+  test("handles question selection", async () => {
+    render(
+      <AddChannelMappingModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        slackIntegration={mockSlackIntegration}
+        channels={channels}
+        selectedIntegration={null}
+      />
+    );
+
+    const surveyDropdown = screen.getByTestId("survey-dropdown");
+    await userEvent.selectOptions(surveyDropdown, surveys[0].id);
+
+    const firstQuestionCheckbox = screen.getByLabelText(surveys[0].questions[0].headline.default);
+    expect(firstQuestionCheckbox).toBeChecked(); // Initially checked
+
+    await userEvent.click(firstQuestionCheckbox);
+    expect(firstQuestionCheckbox).not.toBeChecked(); // Unchecked after click
+
+    await userEvent.click(firstQuestionCheckbox);
+    expect(firstQuestionCheckbox).toBeChecked(); // Checked again
+  });
+
+  test("creates integration successfully", async () => {
+    createOrUpdateIntegrationActionMock.mockResolvedValue({ data: null as any }); // Mock successful action
+
+    render(
+      <AddChannelMappingModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        slackIntegration={{ ...mockSlackIntegration, config: { ...mockSlackIntegration.config, data: [] } }} // Start with empty data
+        channels={channels}
+        selectedIntegration={null}
+      />
+    );
+
+    const channelDropdown = screen.getByTestId("channel-dropdown");
+    const surveyDropdown = screen.getByTestId("survey-dropdown");
+    const submitButton = screen.getByRole("button", { name: "Link Channel" });
+
+    await userEvent.selectOptions(channelDropdown, channels[1].id);
+    await userEvent.selectOptions(surveyDropdown, surveys[0].id);
+
+    // Wait for questions to appear and potentially uncheck one
+    const firstQuestionCheckbox = await screen.findByLabelText(surveys[0].questions[0].headline.default);
+    await userEvent.click(firstQuestionCheckbox); // Uncheck first question
+
+    // Check additional settings
+    await userEvent.click(screen.getByTestId("include-variables"));
+    await userEvent.click(screen.getByTestId("include-metadata"));
+
+    await userEvent.click(submitButton);
+
+    await waitFor(() => {
+      expect(createOrUpdateIntegrationActionMock).toHaveBeenCalledWith({
+        environmentId,
+        integrationData: expect.objectContaining({
+          type: "slack",
+          config: expect.objectContaining({
+            key: mockSlackIntegration.config.key,
+            data: expect.arrayContaining([
+              expect.objectContaining({
+                channelId: channels[1].id,
+                channelName: channels[1].name,
+                surveyId: surveys[0].id,
+                surveyName: surveys[0].name,
+                questionIds: surveys[0].questions.slice(1).map((q) => q.id), // Excludes the first question
+                questions: "Selected questions",
+                includeVariables: true,
+                includeHiddenFields: false,
+                includeMetadata: true,
+                includeCreatedAt: true, // Default
+              }),
+            ]),
+          }),
+        }),
+      });
+    });
+
+    await waitFor(() => {
+      expect(toast.success).toHaveBeenCalledWith("Integration added successfully.");
+    });
+    await waitFor(() => {
+      expect(mockSetOpen).toHaveBeenCalledWith(false);
+    });
+  });
+
+  test("deletes integration successfully", async () => {
+    createOrUpdateIntegrationActionMock.mockResolvedValue({ data: null as any });
+
+    render(
+      <AddChannelMappingModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        slackIntegration={mockSlackIntegration} // Contains initial data at index 0
+        channels={channels}
+        selectedIntegration={mockSelectedIntegration}
+      />
+    );
+
+    const deleteButton = screen.getByText("Delete");
+    await userEvent.click(deleteButton);
+
+    await waitFor(() => {
+      expect(createOrUpdateIntegrationActionMock).toHaveBeenCalledWith({
+        environmentId,
+        integrationData: expect.objectContaining({
+          config: expect.objectContaining({
+            data: [], // Data array should be empty after deletion
+          }),
+        }),
+      });
+    });
+
+    await waitFor(() => {
+      expect(toast.success).toHaveBeenCalledWith("Integration removed successfully.");
+    });
+    await waitFor(() => {
+      expect(mockSetOpen).toHaveBeenCalledWith(false);
+    });
+  });
+
+  test("shows validation error if no channel selected", async () => {
+    render(
+      <AddChannelMappingModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        slackIntegration={mockSlackIntegration}
+        channels={channels}
+        selectedIntegration={null}
+      />
+    );
+
+    const surveyDropdown = screen.getByTestId("survey-dropdown");
+    const submitButton = screen.getByRole("button", { name: "Link Channel" });
+
+    await userEvent.selectOptions(surveyDropdown, surveys[0].id);
+    // No channel selected
+    await userEvent.click(submitButton);
+
+    await waitFor(() => {
+      expect(toast.error).toHaveBeenCalledWith("Please select a channel.");
+    });
+    expect(createOrUpdateIntegrationActionMock).not.toHaveBeenCalled();
+    expect(mockSetOpen).not.toHaveBeenCalled();
+  });
+
+  test("shows validation error if no survey selected", async () => {
+    render(
+      <AddChannelMappingModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        slackIntegration={mockSlackIntegration}
+        channels={channels}
+        selectedIntegration={null}
+      />
+    );
+
+    const channelDropdown = screen.getByTestId("channel-dropdown");
+    const submitButton = screen.getByRole("button", { name: "Link Channel" });
+
+    await userEvent.selectOptions(channelDropdown, channels[0].id);
+    // No survey selected
+    await userEvent.click(submitButton);
+
+    await waitFor(() => {
+      expect(toast.error).toHaveBeenCalledWith("Please select a survey.");
+    });
+    expect(createOrUpdateIntegrationActionMock).not.toHaveBeenCalled();
+    expect(mockSetOpen).not.toHaveBeenCalled();
+  });
+
+  test("shows validation error if no questions selected", async () => {
+    render(
+      <AddChannelMappingModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        slackIntegration={mockSlackIntegration}
+        channels={channels}
+        selectedIntegration={null}
+      />
+    );
+
+    const channelDropdown = screen.getByTestId("channel-dropdown");
+    const surveyDropdown = screen.getByTestId("survey-dropdown");
+    const submitButton = screen.getByRole("button", { name: "Link Channel" });
+
+    await userEvent.selectOptions(channelDropdown, channels[0].id);
+    await userEvent.selectOptions(surveyDropdown, surveys[0].id);
+
+    // Uncheck all questions
+    for (const question of surveys[0].questions) {
+      const checkbox = await screen.findByLabelText(question.headline.default);
+      await userEvent.click(checkbox);
+    }
+
+    await userEvent.click(submitButton);
+
+    await waitFor(() => {
+      expect(toast.error).toHaveBeenCalledWith("Please select at least one question.");
+    });
+    expect(createOrUpdateIntegrationActionMock).not.toHaveBeenCalled();
+    expect(mockSetOpen).not.toHaveBeenCalled();
+  });
+
+  test("shows error toast if createOrUpdateIntegrationAction fails", async () => {
+    const errorMessage = "Failed to update integration";
+    createOrUpdateIntegrationActionMock.mockRejectedValue(new Error(errorMessage));
+
+    render(
+      <AddChannelMappingModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        slackIntegration={mockSlackIntegration}
+        channels={channels}
+        selectedIntegration={null}
+      />
+    );
+
+    const channelDropdown = screen.getByTestId("channel-dropdown");
+    const surveyDropdown = screen.getByTestId("survey-dropdown");
+    const submitButton = screen.getByRole("button", { name: "Link Channel" });
+
+    await userEvent.selectOptions(channelDropdown, channels[0].id);
+    await userEvent.selectOptions(surveyDropdown, surveys[0].id);
+    await userEvent.click(submitButton);
+
+    await waitFor(() => {
+      expect(createOrUpdateIntegrationActionMock).toHaveBeenCalled();
+    });
+    await waitFor(() => {
+      expect(toast.error).toHaveBeenCalledWith(errorMessage);
+    });
+    expect(mockSetOpen).not.toHaveBeenCalled();
+  });
+
+  test("calls setOpen(false) and resets form on cancel", async () => {
+    render(
+      <AddChannelMappingModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        slackIntegration={mockSlackIntegration}
+        channels={channels}
+        selectedIntegration={null}
+      />
+    );
+
+    const channelDropdown = screen.getByTestId("channel-dropdown");
+    const cancelButton = screen.getByText("Cancel");
+
+    // Simulate some interaction
+    await userEvent.selectOptions(channelDropdown, channels[0].id);
+    await userEvent.click(cancelButton);
+
+    expect(mockSetOpen).toHaveBeenCalledWith(false);
+    // Re-render with open=true to check if state was reset (channel should be unselected)
+    cleanup();
+    render(
+      <AddChannelMappingModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        slackIntegration={mockSlackIntegration}
+        channels={channels}
+        selectedIntegration={null}
+      />
+    );
+    expect(screen.getByTestId("channel-dropdown")).toHaveValue("");
+  });
+
+  test("shows warning when selected channel is already connected (add mode)", async () => {
+    // Add an existing connection for channel1
+    const integrationWithExisting = {
+      ...mockSlackIntegration,
+      config: {
+        ...mockSlackIntegration.config,
+        data: [
+          {
+            channelId: "channel1",
+            channelName: "#general",
+            surveyId: "survey-other",
+            surveyName: "Other Survey",
+            questionIds: ["q-other"],
+            questions: "All questions",
+            createdAt: new Date(),
+          } as TIntegrationSlackConfigData,
+        ],
+      },
+    };
+
+    render(
+      <AddChannelMappingModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        slackIntegration={integrationWithExisting}
+        channels={channels}
+        selectedIntegration={null} // Add mode
+      />
+    );
+
+    const channelDropdown = screen.getByTestId("channel-dropdown");
+    await userEvent.selectOptions(channelDropdown, "channel1");
+
+    expect(screen.getByText("This channel is already connected to another survey.")).toBeInTheDocument();
+  });
+
+  test("does not show warning when selected channel is the one being edited", async () => {
+    // Edit the existing connection for channel1
+    const integrationToEdit = {
+      ...mockSlackIntegration,
+      config: {
+        ...mockSlackIntegration.config,
+        data: [
+          {
+            channelId: "channel1",
+            channelName: "#general",
+            surveyId: "survey1",
+            surveyName: "Survey 1",
+            questionIds: ["q1"],
+            questions: "Selected questions",
+            createdAt: new Date(),
+            index: 0,
+          } as TIntegrationSlackConfigData & { index: number },
+        ],
+      },
+    };
+    const selectedIntegrationForEdit = integrationToEdit.config.data[0];
+
+    render(
+      <AddChannelMappingModal
+        environmentId={environmentId}
+        open={true}
+        surveys={surveys}
+        setOpen={mockSetOpen}
+        slackIntegration={integrationToEdit}
+        channels={channels}
+        selectedIntegration={selectedIntegrationForEdit} // Edit mode
+      />
+    );
+
+    const channelDropdown = screen.getByTestId("channel-dropdown");
+    // Channel is already selected via selectedIntegration prop
+    expect(channelDropdown).toHaveValue("channel1");
+
+    expect(
+      screen.queryByText("This channel is already connected to another survey.")
+    ).not.toBeInTheDocument();
+  });
+});

apps/web/app/(app)/environments/[environmentId]/integrations/slack/components/SlackWrapper.test.tsx

@@ -0,0 +1,171 @@
+import { cleanup, render, screen, waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TIntegrationItem } from "@formbricks/types/integration";
+import { TIntegrationSlack, TIntegrationSlackCredential } from "@formbricks/types/integration/slack";
+import { TSurvey } from "@formbricks/types/surveys/types";
+import { TUserLocale } from "@formbricks/types/user";
+import { getSlackChannelsAction } from "../actions";
+import { authorize } from "../lib/slack";
+import { SlackWrapper } from "./SlackWrapper";
+
+// Mock child components and actions
+vi.mock("@/app/(app)/environments/[environmentId]/integrations/slack/actions", () => ({
+  getSlackChannelsAction: vi.fn(),
+}));
+
+vi.mock(
+  "@/app/(app)/environments/[environmentId]/integrations/slack/components/AddChannelMappingModal",
+  () => ({
+    AddChannelMappingModal: vi.fn(({ open }) => (open ? <div data-testid="add-modal">Add Modal</div> : null)),
+  })
+);
+
+vi.mock("@/app/(app)/environments/[environmentId]/integrations/slack/components/ManageIntegration", () => ({
+  ManageIntegration: vi.fn(({ setOpenAddIntegrationModal, setIsConnected, handleSlackAuthorization }) => (
+    <div data-testid="manage-integration">
+      <button onClick={() => setOpenAddIntegrationModal(true)}>Open Modal</button>
+      <button onClick={() => setIsConnected(false)}>Disconnect</button>
+      <button onClick={handleSlackAuthorization}>Reconnect</button>
+    </div>
+  )),
+}));
+
+vi.mock("@/app/(app)/environments/[environmentId]/integrations/slack/lib/slack", () => ({
+  authorize: vi.fn(),
+}));
+
+vi.mock("@/images/slacklogo.png", () => ({
+  default: "slack-logo-path",
+}));
+
+vi.mock("@/modules/ui/components/connect-integration", () => ({
+  ConnectIntegration: vi.fn(({ handleAuthorization, isEnabled }) => (
+    <div data-testid="connect-integration">
+      <button onClick={handleAuthorization} disabled={!isEnabled}>
+        Connect
+      </button>
+    </div>
+  )),
+}));
+
+// Mock window.location.replace
+Object.defineProperty(window, "location", {
+  value: {
+    replace: vi.fn(),
+  },
+  writable: true,
+});
+
+const mockEnvironment = { id: "test-env-id" } as TEnvironment;
+const mockSurveys: TSurvey[] = [];
+const mockWebAppUrl = "http://localhost:3000";
+const mockLocale: TUserLocale = "en-US";
+const mockSlackChannels: TIntegrationItem[] = [{ id: "C123", name: "general" }];
+
+const mockSlackIntegration: TIntegrationSlack = {
+  id: "slack-int-1",
+  type: "slack",
+  environmentId: "test-env-id",
+  config: {
+    key: { access_token: "xoxb-valid-token" } as unknown as TIntegrationSlackCredential,
+    data: [],
+  },
+};
+
+const baseProps = {
+  environment: mockEnvironment,
+  surveys: mockSurveys,
+  webAppUrl: mockWebAppUrl,
+  locale: mockLocale,
+};
+
+describe("SlackWrapper", () => {
+  beforeEach(() => {
+    vi.mocked(getSlackChannelsAction).mockResolvedValue({ data: mockSlackChannels });
+    vi.mocked(authorize).mockResolvedValue("https://slack.com/auth");
+  });
+
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  test("renders ConnectIntegration when not connected (no integration)", () => {
+    render(<SlackWrapper {...baseProps} isEnabled={true} slackIntegration={undefined} />);
+    expect(screen.getByTestId("connect-integration")).toBeInTheDocument();
+    expect(screen.queryByTestId("manage-integration")).not.toBeInTheDocument();
+    expect(screen.getByRole("button", { name: "Connect" })).toBeEnabled();
+  });
+
+  test("renders ConnectIntegration when not connected (integration without key)", () => {
+    const integrationWithoutKey = { ...mockSlackIntegration, config: { data: [], email: "test" } } as any;
+    render(<SlackWrapper {...baseProps} isEnabled={true} slackIntegration={integrationWithoutKey} />);
+    expect(screen.getByTestId("connect-integration")).toBeInTheDocument();
+    expect(screen.queryByTestId("manage-integration")).not.toBeInTheDocument();
+  });
+
+  test("renders ConnectIntegration disabled when isEnabled is false", () => {
+    render(<SlackWrapper {...baseProps} isEnabled={false} slackIntegration={undefined} />);
+    expect(screen.getByTestId("connect-integration")).toBeInTheDocument();
+    expect(screen.getByRole("button", { name: "Connect" })).toBeDisabled();
+  });
+
+  test("calls authorize and redirects when Connect button is clicked", async () => {
+    render(<SlackWrapper {...baseProps} isEnabled={true} slackIntegration={undefined} />);
+    const connectButton = screen.getByRole("button", { name: "Connect" });
+    await userEvent.click(connectButton);
+
+    expect(authorize).toHaveBeenCalledWith(mockEnvironment.id, mockWebAppUrl);
+    await waitFor(() => {
+      expect(window.location.replace).toHaveBeenCalledWith("https://slack.com/auth");
+    });
+  });
+
+  test("renders ManageIntegration and AddChannelMappingModal (hidden) when connected", () => {
+    render(<SlackWrapper {...baseProps} isEnabled={true} slackIntegration={mockSlackIntegration} />);
+    expect(screen.getByTestId("manage-integration")).toBeInTheDocument();
+    expect(screen.queryByTestId("connect-integration")).not.toBeInTheDocument();
+    expect(screen.queryByTestId("add-modal")).not.toBeInTheDocument(); // Modal is initially hidden
+  });
+
+  test("calls getSlackChannelsAction on mount", async () => {
+    render(<SlackWrapper {...baseProps} isEnabled={true} slackIntegration={mockSlackIntegration} />);
+    await waitFor(() => {
+      expect(getSlackChannelsAction).toHaveBeenCalledWith({ environmentId: mockEnvironment.id });
+    });
+  });
+
+  test("switches from ManageIntegration to ConnectIntegration when disconnected", async () => {
+    render(<SlackWrapper {...baseProps} isEnabled={true} slackIntegration={mockSlackIntegration} />);
+    expect(screen.getByTestId("manage-integration")).toBeInTheDocument();
+
+    const disconnectButton = screen.getByRole("button", { name: "Disconnect" });
+    await userEvent.click(disconnectButton);
+
+    expect(screen.getByTestId("connect-integration")).toBeInTheDocument();
+    expect(screen.queryByTestId("manage-integration")).not.toBeInTheDocument();
+  });
+
+  test("opens AddChannelMappingModal when triggered from ManageIntegration", async () => {
+    render(<SlackWrapper {...baseProps} isEnabled={true} slackIntegration={mockSlackIntegration} />);
+    expect(screen.queryByTestId("add-modal")).not.toBeInTheDocument();
+
+    const openModalButton = screen.getByRole("button", { name: "Open Modal" });
+    await userEvent.click(openModalButton);
+
+    expect(screen.getByTestId("add-modal")).toBeInTheDocument();
+  });
+
+  test("calls handleSlackAuthorization when reconnect button is clicked in ManageIntegration", async () => {
+    render(<SlackWrapper {...baseProps} isEnabled={true} slackIntegration={mockSlackIntegration} />);
+    const reconnectButton = screen.getByRole("button", { name: "Reconnect" });
+    await userEvent.click(reconnectButton);
+
+    expect(authorize).toHaveBeenCalledWith(mockEnvironment.id, mockWebAppUrl);
+    await waitFor(() => {
+      expect(window.location.replace).toHaveBeenCalledWith("https://slack.com/auth");
+    });
+  });
+});

apps/web/app/(app)/environments/[environmentId]/integrations/slack/lib/slack.test.ts

@@ -0,0 +1,51 @@
+import { describe, expect, test, vi } from "vitest";
+import { logger } from "@formbricks/logger";
+import { authorize } from "./slack";
+
+// Mock the logger
+vi.mock("@formbricks/logger", () => ({
+  logger: {
+    error: vi.fn(),
+  },
+}));
+
+// Mock fetch
+global.fetch = vi.fn();
+
+describe("authorize", () => {
+  const environmentId = "test-env-id";
+  const apiHost = "http://test.com";
+  const expectedUrl = `${apiHost}/api/v1/integrations/slack`;
+  const expectedAuthUrl = "http://slack.com/auth";
+
+  test("should return authUrl on successful fetch", async () => {
+    vi.mocked(fetch).mockResolvedValueOnce({
+      ok: true,
+      json: async () => ({ data: { authUrl: expectedAuthUrl } }),
+    } as Response);
+
+    const authUrl = await authorize(environmentId, apiHost);
+
+    expect(fetch).toHaveBeenCalledWith(expectedUrl, {
+      method: "GET",
+      headers: { environmentId },
+    });
+    expect(authUrl).toBe(expectedAuthUrl);
+  });
+
+  test("should throw error and log error on failed fetch", async () => {
+    const errorText = "Failed to fetch";
+    vi.mocked(fetch).mockResolvedValueOnce({
+      ok: false,
+      text: async () => errorText,
+    } as Response);
+
+    await expect(authorize(environmentId, apiHost)).rejects.toThrow("Could not create response");
+
+    expect(fetch).toHaveBeenCalledWith(expectedUrl, {
+      method: "GET",
+      headers: { environmentId },
+    });
+    expect(logger.error).toHaveBeenCalledWith({ errorText }, "authorize: Could not fetch slack config");
+  });
+});

apps/web/app/(app)/environments/[environmentId]/integrations/slack/page.test.tsx

@@ -0,0 +1,222 @@
+import { getSurveys } from "@/app/(app)/environments/[environmentId]/integrations/lib/surveys";
+import { SlackWrapper } from "@/app/(app)/environments/[environmentId]/integrations/slack/components/SlackWrapper";
+import Page from "@/app/(app)/environments/[environmentId]/integrations/slack/page";
+import { getIntegrationByType } from "@/lib/integration/service";
+import { findMatchingLocale } from "@/lib/utils/locale";
+import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
+import { TEnvironmentAuth } from "@/modules/environments/types/environment-auth";
+import { cleanup, render, screen } from "@testing-library/react";
+import { redirect } from "next/navigation";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TEnvironment } from "@formbricks/types/environment";
+import { TIntegrationSlack, TIntegrationSlackCredential } from "@formbricks/types/integration/slack";
+import { TSurvey } from "@formbricks/types/surveys/types";
+
+// Mock dependencies
+vi.mock("@/app/(app)/environments/[environmentId]/integrations/lib/surveys", () => ({
+  getSurveys: vi.fn(),
+}));
+
+vi.mock("@/app/(app)/environments/[environmentId]/integrations/slack/components/SlackWrapper", () => ({
+  SlackWrapper: vi.fn(({ isEnabled, environment, surveys, slackIntegration, webAppUrl, locale }) => (
+    <div data-testid="slack-wrapper">
+      Mock SlackWrapper: isEnabled={isEnabled.toString()}, envId={environment.id}, surveys=
+      {surveys.length}, integrationId={slackIntegration?.id}, webAppUrl={webAppUrl}, locale={locale}
+    </div>
+  )),
+}));
+
+vi.mock("@/lib/constants", () => ({
+  IS_PRODUCTION: true,
+  IS_FORMBRICKS_CLOUD: false,
+  POSTHOG_API_KEY: "mock-posthog-api-key",
+  POSTHOG_HOST: "mock-posthog-host",
+  IS_POSTHOG_CONFIGURED: true,
+  ENCRYPTION_KEY: "mock-encryption-key",
+  ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "test-githubID",
+  GOOGLE_CLIENT_ID: "test-google-client-id",
+  GOOGLE_CLIENT_SECRET: "test-google-client-secret",
+  AZUREAD_CLIENT_ID: "test-azuread-client-id",
+  AZUREAD_CLIENT_SECRET: "test-azure",
+  AZUREAD_TENANT_ID: "test-azuread-tenant-id",
+  OIDC_DISPLAY_NAME: "test-oidc-display-name",
+  OIDC_CLIENT_ID: "test-oidc-client-id",
+  OIDC_ISSUER: "test-oidc-issuer",
+  OIDC_CLIENT_SECRET: "test-oidc-client-secret",
+  OIDC_SIGNING_ALGORITHM: "test-oidc-signing-algorithm",
+  SENTRY_DSN: "mock-sentry-dsn",
+  SLACK_CLIENT_ID: "test-slack-client-id",
+  SLACK_CLIENT_SECRET: "test-slack-client-secret",
+  WEBAPP_URL: "http://test.formbricks.com",
+}));
+
+vi.mock("@/lib/integration/service", () => ({
+  getIntegrationByType: vi.fn(),
+}));
+
+vi.mock("@/lib/utils/locale", () => ({
+  findMatchingLocale: vi.fn(),
+}));
+
+vi.mock("@/modules/environments/lib/utils", () => ({
+  getEnvironmentAuth: vi.fn(),
+}));
+
+vi.mock("@/modules/ui/components/go-back-button", () => ({
+  GoBackButton: vi.fn(({ url }) => <div data-testid="go-back-button">Go Back: {url}</div>),
+}));
+
+vi.mock("@/modules/ui/components/page-content-wrapper", () => ({
+  PageContentWrapper: vi.fn(({ children }) => <div>{children}</div>),
+}));
+
+vi.mock("@/modules/ui/components/page-header", () => ({
+  PageHeader: vi.fn(({ pageTitle }) => <h1 data-testid="page-header">{pageTitle}</h1>),
+}));
+
+vi.mock("@/tolgee/server", () => ({
+  getTranslate: async () => (key: string) => key,
+}));
+
+vi.mock("next/navigation", () => ({
+  redirect: vi.fn(),
+}));
+
+// Mock data
+const environmentId = "test-env-id";
+const mockEnvironment = {
+  id: environmentId,
+  createdAt: new Date(),
+  type: "development",
+} as unknown as TEnvironment;
+const mockSurveys: TSurvey[] = [
+  {
+    id: "survey1",
+    name: "Survey 1",
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    environmentId: environmentId,
+    status: "inProgress",
+    type: "link",
+    questions: [],
+    triggers: [],
+    recontactDays: null,
+    displayOption: "displayOnce",
+    autoClose: null,
+    delay: 0,
+    autoComplete: null,
+    surveyClosedMessage: null,
+    singleUse: null,
+    welcomeCard: { enabled: false } as unknown as TSurvey["welcomeCard"],
+    hiddenFields: { enabled: false },
+    languages: [],
+    styling: null,
+    segment: null,
+    resultShareKey: null,
+    displayPercentage: null,
+    closeOnDate: null,
+    runOnDate: null,
+  } as unknown as TSurvey,
+];
+const mockSlackIntegration = {
+  id: "slack-int-id",
+  type: "slack",
+  config: {
+    data: [],
+    key: "test-key" as unknown as TIntegrationSlackCredential,
+  },
+} as unknown as TIntegrationSlack;
+const mockLocale = "en-US";
+const mockParams = { params: { environmentId } };
+
+describe("SlackIntegrationPage", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  beforeEach(() => {
+    vi.mocked(getSurveys).mockResolvedValue(mockSurveys);
+    vi.mocked(getIntegrationByType).mockResolvedValue(mockSlackIntegration);
+    vi.mocked(findMatchingLocale).mockResolvedValue(mockLocale);
+  });
+
+  test("renders correctly when user is not read-only", async () => {
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      isReadOnly: false,
+      environment: mockEnvironment,
+    } as unknown as TEnvironmentAuth);
+
+    const tree = await Page(mockParams);
+    render(tree);
+
+    expect(screen.getByTestId("page-header")).toHaveTextContent(
+      "environments.integrations.slack.slack_integration"
+    );
+    expect(screen.getByTestId("go-back-button")).toHaveTextContent(
+      `Go Back: http://test.formbricks.com/environments/${environmentId}/integrations`
+    );
+    expect(screen.getByTestId("slack-wrapper")).toBeInTheDocument();
+
+    // Check props passed to SlackWrapper
+    expect(vi.mocked(SlackWrapper)).toHaveBeenCalledWith(
+      {
+        isEnabled: true, // Since SLACK_CLIENT_ID and SLACK_CLIENT_SECRET are mocked
+        environment: mockEnvironment,
+        surveys: mockSurveys,
+        slackIntegration: mockSlackIntegration,
+        webAppUrl: "http://test.formbricks.com",
+        locale: mockLocale,
+      },
+      undefined
+    );
+
+    expect(vi.mocked(redirect)).not.toHaveBeenCalled();
+  });
+
+  test("redirects when user is read-only", async () => {
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      isReadOnly: true,
+      environment: mockEnvironment,
+    } as unknown as TEnvironmentAuth);
+
+    // Need to actually call the component function to trigger the redirect logic
+    await Page(mockParams);
+
+    expect(vi.mocked(redirect)).toHaveBeenCalledWith("./");
+    expect(vi.mocked(SlackWrapper)).not.toHaveBeenCalled();
+  });
+
+  test("renders correctly when Slack integration is not configured", async () => {
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      isReadOnly: false,
+      environment: mockEnvironment,
+    } as unknown as TEnvironmentAuth);
+    vi.mocked(getIntegrationByType).mockResolvedValue(null); // Simulate no integration found
+
+    const tree = await Page(mockParams);
+    render(tree);
+
+    expect(screen.getByTestId("page-header")).toHaveTextContent(
+      "environments.integrations.slack.slack_integration"
+    );
+    expect(screen.getByTestId("slack-wrapper")).toBeInTheDocument();
+
+    // Check props passed to SlackWrapper when integration is null
+    expect(vi.mocked(SlackWrapper)).toHaveBeenCalledWith(
+      {
+        isEnabled: true,
+        environment: mockEnvironment,
+        surveys: mockSurveys,
+        slackIntegration: null, // Expecting null here
+        webAppUrl: "http://test.formbricks.com",
+        locale: mockLocale,
+      },
+      undefined
+    );
+
+    expect(vi.mocked(redirect)).not.toHaveBeenCalled();
+  });
+});

apps/web/app/(app)/environments/[environmentId]/integrations/webhooks/page.test.tsx

@@ -0,0 +1,14 @@
+import { render } from "@testing-library/react";
+import { describe, expect, test, vi } from "vitest";
+import WebhooksPage from "./page";
+
+vi.mock("@/modules/integrations/webhooks/page", () => ({
+  WebhooksPage: vi.fn(() => <div>WebhooksPageMock</div>),
+}));
+
+describe("WebhooksIntegrationPage", () => {
+  test("renders WebhooksPage component", () => {
+    render(<WebhooksPage params={{ environmentId: "test-env-id" }} />);
+    expect(WebhooksPage).toHaveBeenCalled();
+  });
+});

apps/web/app/(app)/environments/[environmentId]/page.test.tsx

@@ -0,0 +1,138 @@
+import { getMembershipByUserIdOrganizationId } from "@/lib/membership/service";
+import { getAccessFlags } from "@/lib/membership/utils";
+import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
+import { redirect } from "next/navigation";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { TMembership } from "@formbricks/types/memberships";
+import { TOrganization, TOrganizationBilling } from "@formbricks/types/organizations";
+import EnvironmentPage from "./page";
+
+vi.mock("@/lib/membership/service", () => ({
+  getMembershipByUserIdOrganizationId: vi.fn(),
+}));
+
+vi.mock("@/lib/membership/utils", () => ({
+  getAccessFlags: vi.fn(),
+}));
+
+vi.mock("@/modules/environments/lib/utils", () => ({
+  getEnvironmentAuth: vi.fn(),
+}));
+
+vi.mock("next/navigation", () => ({
+  redirect: vi.fn(),
+}));
+
+describe("EnvironmentPage", () => {
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  const mockEnvironmentId = "test-environment-id";
+  const mockUserId = "test-user-id";
+  const mockOrganizationId = "test-organization-id";
+
+  const mockSession = {
+    user: {
+      id: mockUserId,
+      name: "Test User",
+      email: "test@example.com",
+      imageUrl: "",
+      twoFactorEnabled: false,
+      identityProvider: "email",
+      createdAt: new Date(),
+      updatedAt: new Date(),
+      emailVerified: new Date(),
+      role: "user",
+      objective: "other",
+    },
+    expires: new Date(Date.now() + 3600 * 1000).toISOString(), // 1 hour from now
+  } as any;
+
+  const mockOrganization: TOrganization = {
+    id: mockOrganizationId,
+    name: "Test Organization",
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    billing: {
+      stripeCustomerId: "cus_123",
+    } as unknown as TOrganizationBilling,
+  } as unknown as TOrganization;
+
+  test("should redirect to billing settings if isBilling is true", async () => {
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      session: mockSession,
+      organization: mockOrganization,
+      environment: { id: mockEnvironmentId, type: "production", product: { id: "prodId" } },
+    } as any); // Using 'any' for brevity as environment type is complex and not core to this test
+
+    const mockMembership: TMembership = {
+      userId: mockUserId,
+      organizationId: mockOrganizationId,
+      role: "owner" as any,
+      accepted: true,
+    };
+    vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValue(mockMembership);
+    vi.mocked(getAccessFlags).mockReturnValue({ isBilling: true, isOwner: true } as any);
+
+    await EnvironmentPage({ params: { environmentId: mockEnvironmentId } });
+
+    expect(redirect).toHaveBeenCalledWith(`/environments/${mockEnvironmentId}/settings/billing`);
+  });
+
+  test("should redirect to surveys if isBilling is false", async () => {
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      session: mockSession,
+      organization: mockOrganization,
+      environment: { id: mockEnvironmentId, type: "production", product: { id: "prodId" } },
+    } as any);
+
+    const mockMembership: TMembership = {
+      userId: mockUserId,
+      organizationId: mockOrganizationId,
+      role: "developer" as any, // Role that would result in isBilling: false
+      accepted: true,
+    };
+    vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValue(mockMembership);
+    vi.mocked(getAccessFlags).mockReturnValue({ isBilling: false, isOwner: false } as any);
+
+    await EnvironmentPage({ params: { environmentId: mockEnvironmentId } });
+
+    expect(redirect).toHaveBeenCalledWith(`/environments/${mockEnvironmentId}/surveys`);
+  });
+
+  test("should handle session being null", async () => {
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      session: null, // Simulate no active session
+      organization: mockOrganization,
+      environment: { id: mockEnvironmentId, type: "production", product: { id: "prodId" } },
+    } as any);
+
+    // Membership fetch might return null or throw, depending on implementation when userId is undefined
+    vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValue(null);
+    // Access flags would likely be all false if membership is null
+    vi.mocked(getAccessFlags).mockReturnValue({ isBilling: false, isOwner: false } as any);
+
+    await EnvironmentPage({ params: { environmentId: mockEnvironmentId } });
+
+    // Expect redirect to surveys as default when isBilling is false
+    expect(redirect).toHaveBeenCalledWith(`/environments/${mockEnvironmentId}/surveys`);
+  });
+
+  test("should handle currentUserMembership being null", async () => {
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      session: mockSession,
+      organization: mockOrganization,
+      environment: { id: mockEnvironmentId, type: "production", product: { id: "prodId" } },
+    } as any);
+
+    vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValue(null); // Simulate no membership found
+    // Access flags would likely be all false if membership is null
+    vi.mocked(getAccessFlags).mockReturnValue({ isBilling: false, isOwner: false } as any);
+
+    await EnvironmentPage({ params: { environmentId: mockEnvironmentId } });
+
+    // Expect redirect to surveys as default when isBilling is false
+    expect(redirect).toHaveBeenCalledWith(`/environments/${mockEnvironmentId}/surveys`);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/project/(setup)/app-connection/loading.test.tsx

@@ -0,0 +1,15 @@
+import { AppConnectionLoading as OriginalAppConnectionLoading } from "@/modules/projects/settings/(setup)/app-connection/loading";
+import { describe, expect, test, vi } from "vitest";
+import AppConnectionLoading from "./loading";
+
+// Mock the original component to ensure we are testing the re-export
+vi.mock("@/modules/projects/settings/(setup)/app-connection/loading", () => ({
+  AppConnectionLoading: () => <div data-testid="mock-app-connection-loading">Mock AppConnectionLoading</div>,
+}));
+
+describe("AppConnectionLoading Re-export", () => {
+  test("should re-export AppConnectionLoading from the correct module", () => {
+    // Check if the re-exported component is the same as the original (mocked) component
+    expect(AppConnectionLoading).toBe(OriginalAppConnectionLoading);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/project/(setup)/app-connection/page.test.tsx

@@ -0,0 +1,33 @@
+import { AppConnectionPage as OriginalAppConnectionPage } from "@/modules/projects/settings/(setup)/app-connection/page";
+import { describe, expect, test, vi } from "vitest";
+import AppConnectionPage from "./page";
+
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: false,
+  POSTHOG_API_KEY: "mock-posthog-api-key",
+  POSTHOG_HOST: "mock-posthog-host",
+  IS_POSTHOG_CONFIGURED: true,
+  ENCRYPTION_KEY: "mock-encryption-key",
+  ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "test-githubID",
+  GOOGLE_CLIENT_ID: "test-google-client-id",
+  GOOGLE_CLIENT_SECRET: "test-google-client-secret",
+  AZUREAD_CLIENT_ID: "test-azuread-client-id",
+  AZUREAD_CLIENT_SECRET: "test-azure",
+  AZUREAD_TENANT_ID: "test-azuread-tenant-id",
+  OIDC_DISPLAY_NAME: "test-oidc-display-name",
+  OIDC_CLIENT_ID: "test-oidc-client-id",
+  OIDC_ISSUER: "test-oidc-issuer",
+  OIDC_CLIENT_SECRET: "test-oidc-client-secret",
+  OIDC_SIGNING_ALGORITHM: "test-oidc-signing-algorithm",
+  WEBAPP_URL: "test-webapp-url",
+  IS_PRODUCTION: false,
+  SENTRY_DSN: "mock-sentry-dsn",
+}));
+
+describe("AppConnectionPage Re-export", () => {
+  test("should re-export AppConnectionPage correctly", () => {
+    expect(AppConnectionPage).toBe(OriginalAppConnectionPage);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/project/general/loading.test.tsx

@@ -0,0 +1,17 @@
+import { GeneralSettingsLoading as OriginalGeneralSettingsLoading } from "@/modules/projects/settings/general/loading";
+import { describe, expect, test, vi } from "vitest";
+import GeneralSettingsLoadingPage from "./loading";
+
+// Mock the original component to ensure we are testing the re-export
+vi.mock("@/modules/projects/settings/general/loading", () => ({
+  GeneralSettingsLoading: () => (
+    <div data-testid="mock-general-settings-loading">Mock GeneralSettingsLoading</div>
+  ),
+}));
+
+describe("GeneralSettingsLoadingPage Re-export", () => {
+  test("should re-export GeneralSettingsLoading from the correct module", () => {
+    // Check if the re-exported component is the same as the original (mocked) component
+    expect(GeneralSettingsLoadingPage).toBe(OriginalGeneralSettingsLoading);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/project/general/page.test.tsx

@@ -0,0 +1,33 @@
+import { GeneralSettingsPage } from "@/modules/projects/settings/general/page";
+import { describe, expect, test, vi } from "vitest";
+import Page from "./page";
+
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: false,
+  POSTHOG_API_KEY: "mock-posthog-api-key",
+  POSTHOG_HOST: "mock-posthog-host",
+  IS_POSTHOG_CONFIGURED: true,
+  ENCRYPTION_KEY: "mock-encryption-key",
+  ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "test-githubID",
+  GOOGLE_CLIENT_ID: "test-google-client-id",
+  GOOGLE_CLIENT_SECRET: "test-google-client-secret",
+  AZUREAD_CLIENT_ID: "test-azuread-client-id",
+  AZUREAD_CLIENT_SECRET: "test-azure",
+  AZUREAD_TENANT_ID: "test-azuread-tenant-id",
+  OIDC_DISPLAY_NAME: "test-oidc-display-name",
+  OIDC_CLIENT_ID: "test-oidc-client-id",
+  OIDC_ISSUER: "test-oidc-issuer",
+  OIDC_CLIENT_SECRET: "test-oidc-client-secret",
+  OIDC_SIGNING_ALGORITHM: "test-oidc-signing-algorithm",
+  WEBAPP_URL: "test-webapp-url",
+  IS_PRODUCTION: false,
+  SENTRY_DSN: "mock-sentry-dsn",
+}));
+
+describe("GeneralSettingsPage re-export", () => {
+  test("should re-export GeneralSettingsPage component", () => {
+    expect(Page).toBe(GeneralSettingsPage);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/project/languages/loading.test.tsx

@@ -0,0 +1,15 @@
+import { LanguagesLoading as OriginalLanguagesLoading } from "@/modules/ee/languages/loading";
+import { describe, expect, test, vi } from "vitest";
+import LanguagesLoading from "./loading";
+
+// Mock the original component to ensure we are testing the re-export
+vi.mock("@/modules/ee/languages/loading", () => ({
+  LanguagesLoading: () => <div data-testid="mock-languages-loading">Mock LanguagesLoading</div>,
+}));
+
+describe("LanguagesLoadingPage Re-export", () => {
+  test("should re-export LanguagesLoading from the correct module", () => {
+    // Check if the re-exported component is the same as the original (mocked) component
+    expect(LanguagesLoading).toBe(OriginalLanguagesLoading);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/project/languages/page.test.tsx

@@ -0,0 +1,33 @@
+import { LanguagesPage } from "@/modules/ee/languages/page";
+import { describe, expect, test, vi } from "vitest";
+import Page from "./page";
+
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: false,
+  POSTHOG_API_KEY: "mock-posthog-api-key",
+  POSTHOG_HOST: "mock-posthog-host",
+  IS_POSTHOG_CONFIGURED: true,
+  ENCRYPTION_KEY: "mock-encryption-key",
+  ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "test-githubID",
+  GOOGLE_CLIENT_ID: "test-google-client-id",
+  GOOGLE_CLIENT_SECRET: "test-google-client-secret",
+  AZUREAD_CLIENT_ID: "test-azuread-client-id",
+  AZUREAD_CLIENT_SECRET: "test-azure",
+  AZUREAD_TENANT_ID: "test-azuread-tenant-id",
+  OIDC_DISPLAY_NAME: "test-oidc-display-name",
+  OIDC_CLIENT_ID: "test-oidc-client-id",
+  OIDC_ISSUER: "test-oidc-issuer",
+  OIDC_CLIENT_SECRET: "test-oidc-client-secret",
+  OIDC_SIGNING_ALGORITHM: "test-oidc-signing-algorithm",
+  WEBAPP_URL: "test-webapp-url",
+  IS_PRODUCTION: false,
+  SENTRY_DSN: "mock-sentry-dsn",
+}));
+
+describe("LanguagesPage re-export", () => {
+  test("should re-export LanguagesPage component", () => {
+    expect(Page).toBe(LanguagesPage);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/project/layout.test.tsx

@@ -0,0 +1,24 @@
+import { cleanup, render } from "@testing-library/react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import ProjectLayout, { metadata as layoutMetadata } from "./layout";
+
+vi.mock("@/modules/projects/settings/layout", () => ({
+  ProjectSettingsLayout: ({ children }) => <div data-testid="project-settings-layout">{children}</div>,
+  metadata: { title: "Mocked Project Settings" },
+}));
+
+describe("ProjectLayout", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  test("renders ProjectSettingsLayout", () => {
+    const { getByTestId } = render(<ProjectLayout>Child Content</ProjectLayout>);
+    expect(getByTestId("project-settings-layout")).toBeInTheDocument();
+    expect(getByTestId("project-settings-layout")).toHaveTextContent("Child Content");
+  });
+
+  test("exports metadata from @/modules/projects/settings/layout", () => {
+    expect(layoutMetadata).toEqual({ title: "Mocked Project Settings" });
+  });
+});

apps/web/app/(app)/environments/[environmentId]/project/look/loading.test.tsx

@@ -0,0 +1,17 @@
+import { ProjectLookSettingsLoading as OriginalProjectLookSettingsLoading } from "@/modules/projects/settings/look/loading";
+import { describe, expect, test, vi } from "vitest";
+import ProjectLookSettingsLoading from "./loading";
+
+// Mock the original component to ensure we are testing the re-export
+vi.mock("@/modules/projects/settings/look/loading", () => ({
+  ProjectLookSettingsLoading: () => (
+    <div data-testid="mock-project-look-settings-loading">Mock ProjectLookSettingsLoading</div>
+  ),
+}));
+
+describe("ProjectLookSettingsLoadingPage Re-export", () => {
+  test("should re-export ProjectLookSettingsLoading from the correct module", () => {
+    // Check if the re-exported component is the same as the original (mocked) component
+    expect(ProjectLookSettingsLoading).toBe(OriginalProjectLookSettingsLoading);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/project/look/page.test.tsx

@@ -0,0 +1,33 @@
+import { ProjectLookSettingsPage } from "@/modules/projects/settings/look/page";
+import { describe, expect, test, vi } from "vitest";
+import Page from "./page";
+
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: false,
+  POSTHOG_API_KEY: "mock-posthog-api-key",
+  POSTHOG_HOST: "mock-posthog-host",
+  IS_POSTHOG_CONFIGURED: true,
+  ENCRYPTION_KEY: "mock-encryption-key",
+  ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "test-githubID",
+  GOOGLE_CLIENT_ID: "test-google-client-id",
+  GOOGLE_CLIENT_SECRET: "test-google-client-secret",
+  AZUREAD_CLIENT_ID: "test-azuread-client-id",
+  AZUREAD_CLIENT_SECRET: "test-azure",
+  AZUREAD_TENANT_ID: "test-azuread-tenant-id",
+  OIDC_DISPLAY_NAME: "test-oidc-display-name",
+  OIDC_CLIENT_ID: "test-oidc-client-id",
+  OIDC_ISSUER: "test-oidc-issuer",
+  OIDC_CLIENT_SECRET: "test-oidc-client-secret",
+  OIDC_SIGNING_ALGORITHM: "test-oidc-signing-algorithm",
+  WEBAPP_URL: "test-webapp-url",
+  IS_PRODUCTION: false,
+  SENTRY_DSN: "mock-sentry-dsn",
+}));
+
+describe("ProjectLookSettingsPage re-export", () => {
+  test("should re-export ProjectLookSettingsPage component", () => {
+    expect(Page).toBe(ProjectLookSettingsPage);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/project/page.test.tsx

@@ -0,0 +1,33 @@
+import { ProjectSettingsPage } from "@/modules/projects/settings/page";
+import { describe, expect, test, vi } from "vitest";
+import Page from "./page";
+
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: false,
+  POSTHOG_API_KEY: "mock-posthog-api-key",
+  POSTHOG_HOST: "mock-posthog-host",
+  IS_POSTHOG_CONFIGURED: true,
+  ENCRYPTION_KEY: "mock-encryption-key",
+  ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "test-githubID",
+  GOOGLE_CLIENT_ID: "test-google-client-id",
+  GOOGLE_CLIENT_SECRET: "test-google-client-secret",
+  AZUREAD_CLIENT_ID: "test-azuread-client-id",
+  AZUREAD_CLIENT_SECRET: "test-azure",
+  AZUREAD_TENANT_ID: "test-azuread-tenant-id",
+  OIDC_DISPLAY_NAME: "test-oidc-display-name",
+  OIDC_CLIENT_ID: "test-oidc-client-id",
+  OIDC_ISSUER: "test-oidc-issuer",
+  OIDC_CLIENT_SECRET: "test-oidc-client-secret",
+  OIDC_SIGNING_ALGORITHM: "test-oidc-signing-algorithm",
+  WEBAPP_URL: "test-webapp-url",
+  IS_PRODUCTION: false,
+  SENTRY_DSN: "mock-sentry-dsn",
+}));
+
+describe("ProjectSettingsPage re-export", () => {
+  test("should re-export ProjectSettingsPage component", () => {
+    expect(Page).toBe(ProjectSettingsPage);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/project/tags/loading.test.tsx

@@ -0,0 +1,15 @@
+import { TagsLoading as OriginalTagsLoading } from "@/modules/projects/settings/tags/loading";
+import { describe, expect, test, vi } from "vitest";
+import TagsLoading from "./loading";
+
+// Mock the original component to ensure we are testing the re-export
+vi.mock("@/modules/projects/settings/tags/loading", () => ({
+  TagsLoading: () => <div data-testid="mock-tags-loading">Mock TagsLoading</div>,
+}));
+
+describe("TagsLoadingPage Re-export", () => {
+  test("should re-export TagsLoading from the correct module", () => {
+    // Check if the re-exported component is the same as the original (mocked) component
+    expect(TagsLoading).toBe(OriginalTagsLoading);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/project/tags/page.test.tsx

@@ -0,0 +1,33 @@
+import { TagsPage } from "@/modules/projects/settings/tags/page";
+import { describe, expect, test, vi } from "vitest";
+import Page from "./page";
+
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: false,
+  POSTHOG_API_KEY: "mock-posthog-api-key",
+  POSTHOG_HOST: "mock-posthog-host",
+  IS_POSTHOG_CONFIGURED: true,
+  ENCRYPTION_KEY: "mock-encryption-key",
+  ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "test-githubID",
+  GOOGLE_CLIENT_ID: "test-google-client-id",
+  GOOGLE_CLIENT_SECRET: "test-google-client-secret",
+  AZUREAD_CLIENT_ID: "test-azuread-client-id",
+  AZUREAD_CLIENT_SECRET: "test-azure",
+  AZUREAD_TENANT_ID: "test-azuread-tenant-id",
+  OIDC_DISPLAY_NAME: "test-oidc-display-name",
+  OIDC_CLIENT_ID: "test-oidc-client-id",
+  OIDC_ISSUER: "test-oidc-issuer",
+  OIDC_CLIENT_SECRET: "test-oidc-client-secret",
+  OIDC_SIGNING_ALGORITHM: "test-oidc-signing-algorithm",
+  WEBAPP_URL: "test-webapp-url",
+  IS_PRODUCTION: false,
+  SENTRY_DSN: "mock-sentry-dsn",
+}));
+
+describe("TagsPage re-export", () => {
+  test("should re-export TagsPage component", () => {
+    expect(Page).toBe(TagsPage);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/project/teams/page.test.tsx

@@ -0,0 +1,33 @@
+import { ProjectTeams } from "@/modules/ee/teams/project-teams/page";
+import { describe, expect, test, vi } from "vitest";
+import Page from "./page";
+
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: false,
+  POSTHOG_API_KEY: "mock-posthog-api-key",
+  POSTHOG_HOST: "mock-posthog-host",
+  IS_POSTHOG_CONFIGURED: true,
+  ENCRYPTION_KEY: "mock-encryption-key",
+  ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "test-githubID",
+  GOOGLE_CLIENT_ID: "test-google-client-id",
+  GOOGLE_CLIENT_SECRET: "test-google-client-secret",
+  AZUREAD_CLIENT_ID: "test-azuread-client-id",
+  AZUREAD_CLIENT_SECRET: "test-azure",
+  AZUREAD_TENANT_ID: "test-azuread-tenant-id",
+  OIDC_DISPLAY_NAME: "test-oidc-display-name",
+  OIDC_CLIENT_ID: "test-oidc-client-id",
+  OIDC_ISSUER: "test-oidc-issuer",
+  OIDC_CLIENT_SECRET: "test-oidc-client-secret",
+  OIDC_SIGNING_ALGORITHM: "test-oidc-signing-algorithm",
+  WEBAPP_URL: "test-webapp-url",
+  IS_PRODUCTION: false,
+  SENTRY_DSN: "mock-sentry-dsn",
+}));
+
+describe("ProjectTeams re-export", () => {
+  test("should re-export ProjectTeams component", () => {
+    expect(Page).toBe(ProjectTeams);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(account)/components/AccountSettingsNavbar.test.tsx

@@ -0,0 +1,148 @@
+import { SecondaryNavigation } from "@/modules/ui/components/secondary-navigation";
+import { cleanup, render } from "@testing-library/react";
+import { usePathname } from "next/navigation";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { AccountSettingsNavbar } from "./AccountSettingsNavbar";
+
+vi.mock("next/navigation", () => ({
+  usePathname: vi.fn(),
+}));
+
+vi.mock("@/modules/ui/components/secondary-navigation", () => ({
+  SecondaryNavigation: vi.fn(() => <div>SecondaryNavigationMock</div>),
+}));
+
+vi.mock("@tolgee/react", () => ({
+  useTranslate: () => ({
+    t: (key: string) => {
+      if (key === "common.profile") return "Profile";
+      if (key === "common.notifications") return "Notifications";
+      return key;
+    },
+  }),
+}));
+
+describe("AccountSettingsNavbar", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  test("renders correctly and sets profile as current when pathname includes /profile", () => {
+    vi.mocked(usePathname).mockReturnValue("/environments/testEnvId/settings/profile");
+    render(<AccountSettingsNavbar environmentId="testEnvId" activeId="profile" />);
+
+    expect(SecondaryNavigation).toHaveBeenCalledWith(
+      {
+        navigation: [
+          {
+            id: "profile",
+            label: "Profile",
+            href: "/environments/testEnvId/settings/profile",
+            current: true,
+          },
+          {
+            id: "notifications",
+            label: "Notifications",
+            href: "/environments/testEnvId/settings/notifications",
+            current: false,
+          },
+        ],
+        activeId: "profile",
+        loading: undefined,
+      },
+      undefined
+    );
+  });
+
+  test("sets notifications as current when pathname includes /notifications", () => {
+    vi.mocked(usePathname).mockReturnValue("/environments/testEnvId/settings/notifications");
+    render(<AccountSettingsNavbar environmentId="testEnvId" activeId="notifications" />);
+
+    expect(SecondaryNavigation).toHaveBeenCalledWith(
+      expect.objectContaining({
+        navigation: [
+          {
+            id: "profile",
+            label: "Profile",
+            href: "/environments/testEnvId/settings/profile",
+            current: false,
+          },
+          {
+            id: "notifications",
+            label: "Notifications",
+            href: "/environments/testEnvId/settings/notifications",
+            current: true,
+          },
+        ],
+        activeId: "notifications",
+      }),
+      undefined
+    );
+  });
+
+  test("passes loading prop to SecondaryNavigation", () => {
+    vi.mocked(usePathname).mockReturnValue("/environments/testEnvId/settings/profile");
+    render(<AccountSettingsNavbar environmentId="testEnvId" activeId="profile" loading={true} />);
+
+    expect(SecondaryNavigation).toHaveBeenCalledWith(
+      expect.objectContaining({
+        loading: true,
+      }),
+      undefined
+    );
+  });
+
+  test("handles undefined environmentId gracefully in hrefs", () => {
+    vi.mocked(usePathname).mockReturnValue("/environments/undefined/settings/profile");
+    render(<AccountSettingsNavbar activeId="profile" />); // environmentId is undefined
+
+    expect(SecondaryNavigation).toHaveBeenCalledWith(
+      expect.objectContaining({
+        navigation: [
+          {
+            id: "profile",
+            label: "Profile",
+            href: "/environments/undefined/settings/profile",
+            current: true,
+          },
+          {
+            id: "notifications",
+            label: "Notifications",
+            href: "/environments/undefined/settings/notifications",
+            current: false,
+          },
+        ],
+      }),
+      undefined
+    );
+  });
+
+  test("handles null pathname gracefully", () => {
+    vi.mocked(usePathname).mockReturnValue("");
+    render(<AccountSettingsNavbar environmentId="testEnvId" activeId="profile" />);
+
+    expect(SecondaryNavigation).toHaveBeenCalledWith(
+      expect.objectContaining({
+        navigation: [
+          {
+            id: "profile",
+            label: "Profile",
+            href: "/environments/testEnvId/settings/profile",
+            current: false,
+          },
+          {
+            id: "notifications",
+            label: "Notifications",
+            href: "/environments/testEnvId/settings/notifications",
+            current: false,
+          },
+        ],
+      }),
+      undefined
+    );
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(account)/layout.test.tsx

@@ -0,0 +1,95 @@
+import { getOrganizationByEnvironmentId } from "@/lib/organization/service";
+import { getProjectByEnvironmentId } from "@/lib/project/service";
+import { cleanup, render, screen } from "@testing-library/react";
+import { Session, getServerSession } from "next-auth";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TOrganization } from "@formbricks/types/organizations";
+import { TProject } from "@formbricks/types/project";
+import AccountSettingsLayout from "./layout";
+
+// Mock dependencies
+vi.mock("@/lib/organization/service");
+vi.mock("@/lib/project/service");
+vi.mock("next-auth", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("next-auth")>();
+  return {
+    ...actual,
+    getServerSession: vi.fn(),
+  };
+});
+
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: false,
+  POSTHOG_API_KEY: "mock-posthog-api-key",
+  POSTHOG_HOST: "mock-posthog-host",
+  IS_POSTHOG_CONFIGURED: true,
+  ENCRYPTION_KEY: "mock-encryption-key",
+  ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "test-githubID",
+  GOOGLE_CLIENT_ID: "test-google-client-id",
+  GOOGLE_CLIENT_SECRET: "test-google-client-secret",
+  AZUREAD_CLIENT_ID: "test-azuread-client-id",
+  AZUREAD_CLIENT_SECRET: "test-azure",
+  AZUREAD_TENANT_ID: "test-azuread-tenant-id",
+  OIDC_DISPLAY_NAME: "test-oidc-display-name",
+  OIDC_CLIENT_ID: "test-oidc-client-id",
+  OIDC_ISSUER: "test-oidc-issuer",
+  OIDC_CLIENT_SECRET: "test-oidc-client-secret",
+  OIDC_SIGNING_ALGORITHM: "test-oidc-signing-algorithm",
+  WEBAPP_URL: "test-webapp-url",
+  IS_PRODUCTION: false,
+  SENTRY_DSN: "mock-sentry-dsn",
+}));
+
+const mockGetOrganizationByEnvironmentId = vi.mocked(getOrganizationByEnvironmentId);
+const mockGetProjectByEnvironmentId = vi.mocked(getProjectByEnvironmentId);
+const mockGetServerSession = vi.mocked(getServerSession);
+
+const mockOrganization = { id: "org_test_id" } as unknown as TOrganization;
+const mockProject = { id: "project_test_id" } as unknown as TProject;
+const mockSession = { user: { id: "user_test_id" } } as unknown as Session;
+
+const t = (key: any) => key;
+vi.mock("@/tolgee/server", () => ({
+  getTranslate: async () => t,
+}));
+
+const mockProps = {
+  params: { environmentId: "env_test_id" },
+  children: <div>Child Content</div>,
+};
+
+describe("AccountSettingsLayout", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  beforeEach(() => {
+    vi.resetAllMocks();
+
+    mockGetOrganizationByEnvironmentId.mockResolvedValue(mockOrganization);
+    mockGetProjectByEnvironmentId.mockResolvedValue(mockProject);
+    mockGetServerSession.mockResolvedValue(mockSession);
+  });
+
+  test("should render children when all data is fetched successfully", async () => {
+    render(await AccountSettingsLayout(mockProps));
+    expect(screen.getByText("Child Content")).toBeInTheDocument();
+  });
+
+  test("should throw error if organization is not found", async () => {
+    mockGetOrganizationByEnvironmentId.mockResolvedValue(null);
+    await expect(AccountSettingsLayout(mockProps)).rejects.toThrowError("common.organization_not_found");
+  });
+
+  test("should throw error if project is not found", async () => {
+    mockGetProjectByEnvironmentId.mockResolvedValue(null);
+    await expect(AccountSettingsLayout(mockProps)).rejects.toThrowError("common.project_not_found");
+  });
+
+  test("should throw error if session is not found", async () => {
+    mockGetServerSession.mockResolvedValue(null);
+    await expect(AccountSettingsLayout(mockProps)).rejects.toThrowError("common.session_not_found");
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(account)/notifications/components/EditAlerts.test.tsx

@@ -0,0 +1,268 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { TUser } from "@formbricks/types/user";
+import { Membership } from "../types";
+import { EditAlerts } from "./EditAlerts";
+
+// Mock dependencies
+vi.mock("@/modules/ui/components/tooltip", () => ({
+  Tooltip: ({ children }: { children: React.ReactNode }) => <div data-testid="tooltip">{children}</div>,
+  TooltipContent: ({ children }: { children: React.ReactNode }) => (
+    <div data-testid="tooltip-content">{children}</div>
+  ),
+  TooltipProvider: ({ children }: { children: React.ReactNode }) => (
+    <div data-testid="tooltip-provider">{children}</div>
+  ),
+  TooltipTrigger: ({ children }: { children: React.ReactNode }) => (
+    <div data-testid="tooltip-trigger">{children}</div>
+  ),
+}));
+
+vi.mock("lucide-react", () => ({
+  HelpCircleIcon: () => <div data-testid="help-circle-icon" />,
+  UsersIcon: () => <div data-testid="users-icon" />,
+}));
+
+vi.mock("next/link", () => ({
+  default: ({ children, href }: { children: React.ReactNode; href: string }) => (
+    <a href={href} data-testid="link">
+      {children}
+    </a>
+  ),
+}));
+
+const mockNotificationSwitch = vi.fn();
+vi.mock("./NotificationSwitch", () => ({
+  NotificationSwitch: (props: any) => {
+    mockNotificationSwitch(props);
+    return (
+      <div data-testid={`notification-switch-${props.surveyOrProjectOrOrganizationId}`}>
+        NotificationSwitch
+      </div>
+    );
+  },
+}));
+
+const mockUser = {
+  id: "user1",
+  name: "Test User",
+  email: "test@example.com",
+  notificationSettings: {
+    alert: {},
+    weeklySummary: {},
+    unsubscribedOrganizationIds: [],
+  },
+  role: "project_manager",
+  objective: "other",
+  emailVerified: new Date(),
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  identityProvider: "email",
+  twoFactorEnabled: false,
+} as unknown as TUser;
+
+const mockMemberships: Membership[] = [
+  {
+    organization: {
+      id: "org1",
+      name: "Organization 1",
+      projects: [
+        {
+          id: "proj1",
+          name: "Project 1",
+          environments: [
+            {
+              id: "env1",
+              surveys: [
+                { id: "survey1", name: "Survey 1 Org 1 Proj 1" },
+                { id: "survey2", name: "Survey 2 Org 1 Proj 1" },
+              ],
+            },
+          ],
+        },
+        {
+          id: "proj2",
+          name: "Project 2",
+          environments: [
+            {
+              id: "env2",
+              surveys: [{ id: "survey3", name: "Survey 3 Org 1 Proj 2" }],
+            },
+          ],
+        },
+      ],
+    },
+  },
+  {
+    organization: {
+      id: "org2",
+      name: "Organization 2",
+      projects: [
+        {
+          id: "proj3",
+          name: "Project 3",
+          environments: [
+            {
+              id: "env3",
+              surveys: [{ id: "survey4", name: "Survey 4 Org 2 Proj 3" }],
+            },
+          ],
+        },
+      ],
+    },
+  },
+  {
+    organization: {
+      id: "org3",
+      name: "Organization 3 No Surveys",
+      projects: [
+        {
+          id: "proj4",
+          name: "Project 4",
+          environments: [
+            {
+              id: "env4",
+              surveys: [], // No surveys in this environment
+            },
+          ],
+        },
+      ],
+    },
+  },
+];
+
+const environmentId = "test-env-id";
+const autoDisableNotificationType = "someType";
+const autoDisableNotificationElementId = "someElementId";
+
+describe("EditAlerts", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  test("renders correctly with multiple memberships and surveys", () => {
+    render(
+      <EditAlerts
+        memberships={mockMemberships}
+        user={mockUser}
+        environmentId={environmentId}
+        autoDisableNotificationType={autoDisableNotificationType}
+        autoDisableNotificationElementId={autoDisableNotificationElementId}
+      />
+    );
+
+    // Check organization names
+    expect(screen.getByText("Organization 1")).toBeInTheDocument();
+    expect(screen.getByText("Organization 2")).toBeInTheDocument();
+    expect(screen.getByText("Organization 3 No Surveys")).toBeInTheDocument();
+
+    // Check survey names and project names as subtext
+    expect(screen.getByText("Survey 1 Org 1 Proj 1")).toBeInTheDocument();
+    expect(screen.getAllByText("Project 1")[0]).toBeInTheDocument(); // Project name under survey
+    expect(screen.getByText("Survey 2 Org 1 Proj 1")).toBeInTheDocument();
+    expect(screen.getByText("Survey 3 Org 1 Proj 2")).toBeInTheDocument();
+    expect(screen.getAllByText("Project 2")[0]).toBeInTheDocument();
+    expect(screen.getByText("Survey 4 Org 2 Proj 3")).toBeInTheDocument();
+    expect(screen.getAllByText("Project 3")[0]).toBeInTheDocument();
+
+    // Check "No surveys found" message for org3
+    const org3Heading = screen.getByText("Organization 3 No Surveys");
+    expect(org3Heading.parentElement?.parentElement?.parentElement).toHaveTextContent(
+      "common.no_surveys_found"
+    );
+
+    // Check NotificationSwitch calls
+    // Org 1 auto-subscribe
+    expect(mockNotificationSwitch).toHaveBeenCalledWith(
+      expect.objectContaining({
+        surveyOrProjectOrOrganizationId: "org1",
+        notificationType: "unsubscribedOrganizationIds",
+        autoDisableNotificationType,
+        autoDisableNotificationElementId,
+      })
+    );
+    // Survey 1
+    expect(mockNotificationSwitch).toHaveBeenCalledWith(
+      expect.objectContaining({
+        surveyOrProjectOrOrganizationId: "survey1",
+        notificationType: "alert",
+        autoDisableNotificationType,
+        autoDisableNotificationElementId,
+      })
+    );
+    // Survey 4
+    expect(mockNotificationSwitch).toHaveBeenCalledWith(
+      expect.objectContaining({
+        surveyOrProjectOrOrganizationId: "survey4",
+        notificationType: "alert",
+        autoDisableNotificationType,
+        autoDisableNotificationElementId,
+      })
+    );
+
+    // Check tooltip
+    expect(screen.getAllByTestId("tooltip-provider").length).toBeGreaterThan(0);
+    expect(screen.getAllByTestId("tooltip").length).toBeGreaterThan(0);
+    expect(screen.getAllByTestId("tooltip-trigger").length).toBeGreaterThan(0);
+    expect(screen.getAllByTestId("tooltip-content")[0]).toHaveTextContent(
+      "environments.settings.notifications.every_response_tooltip"
+    );
+    expect(screen.getAllByTestId("help-circle-icon").length).toBeGreaterThan(0);
+
+    // Check invite link
+    const inviteLinks = screen.getAllByTestId("link");
+    const specificInviteLink = inviteLinks.find(
+      (link) => link.getAttribute("href") === `/environments/${environmentId}/settings/general`
+    );
+    expect(specificInviteLink).toBeInTheDocument();
+    expect(specificInviteLink).toHaveTextContent("common.invite_them");
+
+    // Check UsersIcon
+    expect(screen.getAllByTestId("users-icon").length).toBe(mockMemberships.length);
+  });
+
+  test("renders correctly when a membership has no surveys", () => {
+    const singleMembershipNoSurveys: Membership[] = [
+      {
+        organization: {
+          id: "org-no-survey",
+          name: "Org Without Surveys",
+          projects: [
+            {
+              id: "proj-no-survey",
+              name: "Project Without Surveys",
+              environments: [
+                {
+                  id: "env-no-survey",
+                  surveys: [],
+                },
+              ],
+            },
+          ],
+        },
+      },
+    ];
+    render(
+      <EditAlerts
+        memberships={singleMembershipNoSurveys}
+        user={mockUser}
+        environmentId={environmentId}
+        autoDisableNotificationType={autoDisableNotificationType}
+        autoDisableNotificationElementId={autoDisableNotificationElementId}
+      />
+    );
+
+    expect(screen.getByText("Org Without Surveys")).toBeInTheDocument();
+    expect(screen.getByText("common.no_surveys_found")).toBeInTheDocument();
+    expect(screen.queryByText("Survey 1 Org 1 Proj 1")).not.toBeInTheDocument(); // Ensure other surveys aren't rendered
+
+    // Check NotificationSwitch for organization auto-subscribe
+    expect(mockNotificationSwitch).toHaveBeenCalledWith(
+      expect.objectContaining({
+        surveyOrProjectOrOrganizationId: "org-no-survey",
+        notificationType: "unsubscribedOrganizationIds",
+      })
+    );
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(account)/notifications/components/EditWeeklySummary.test.tsx

@@ -0,0 +1,166 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { TUser } from "@formbricks/types/user";
+import { Membership } from "../types";
+import { EditWeeklySummary } from "./EditWeeklySummary";
+
+vi.mock("lucide-react", () => ({
+  UsersIcon: () => <div data-testid="users-icon" />,
+}));
+
+vi.mock("next/link", () => ({
+  default: ({ children, href }: { children: React.ReactNode; href: string }) => (
+    <a href={href} data-testid="link">
+      {children}
+    </a>
+  ),
+}));
+
+const mockNotificationSwitch = vi.fn();
+vi.mock("./NotificationSwitch", () => ({
+  NotificationSwitch: (props: any) => {
+    mockNotificationSwitch(props);
+    return (
+      <div data-testid={`notification-switch-${props.surveyOrProjectOrOrganizationId}`}>
+        NotificationSwitch
+      </div>
+    );
+  },
+}));
+
+const mockT = vi.fn((key) => key);
+vi.mock("@tolgee/react", () => ({
+  useTranslate: () => ({
+    t: mockT,
+  }),
+}));
+
+const mockUser = {
+  id: "user1",
+  name: "Test User",
+  email: "test@example.com",
+  notificationSettings: {
+    alert: {},
+    weeklySummary: {
+      proj1: true,
+      proj3: false,
+    },
+    unsubscribedOrganizationIds: [],
+  },
+  role: "project_manager",
+  objective: "other",
+  emailVerified: new Date(),
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  identityProvider: "email",
+  twoFactorEnabled: false,
+} as unknown as TUser;
+
+const mockMemberships: Membership[] = [
+  {
+    organization: {
+      id: "org1",
+      name: "Organization 1",
+      projects: [
+        { id: "proj1", name: "Project 1", environments: [] },
+        { id: "proj2", name: "Project 2", environments: [] },
+      ],
+    },
+  },
+  {
+    organization: {
+      id: "org2",
+      name: "Organization 2",
+      projects: [{ id: "proj3", name: "Project 3", environments: [] }],
+    },
+  },
+];
+
+const environmentId = "test-env-id";
+
+describe("EditWeeklySummary", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  test("renders correctly with multiple memberships and projects", () => {
+    render(<EditWeeklySummary memberships={mockMemberships} user={mockUser} environmentId={environmentId} />);
+
+    expect(screen.getByText("Organization 1")).toBeInTheDocument();
+    expect(screen.getByText("Project 1")).toBeInTheDocument();
+    expect(screen.getByText("Project 2")).toBeInTheDocument();
+    expect(screen.getByText("Organization 2")).toBeInTheDocument();
+    expect(screen.getByText("Project 3")).toBeInTheDocument();
+
+    expect(mockNotificationSwitch).toHaveBeenCalledWith(
+      expect.objectContaining({
+        surveyOrProjectOrOrganizationId: "proj1",
+        notificationSettings: mockUser.notificationSettings,
+        notificationType: "weeklySummary",
+      })
+    );
+    expect(screen.getByTestId("notification-switch-proj1")).toBeInTheDocument();
+
+    expect(mockNotificationSwitch).toHaveBeenCalledWith(
+      expect.objectContaining({
+        surveyOrProjectOrOrganizationId: "proj2",
+        notificationSettings: mockUser.notificationSettings,
+        notificationType: "weeklySummary",
+      })
+    );
+    expect(screen.getByTestId("notification-switch-proj2")).toBeInTheDocument();
+
+    expect(mockNotificationSwitch).toHaveBeenCalledWith(
+      expect.objectContaining({
+        surveyOrProjectOrOrganizationId: "proj3",
+        notificationSettings: mockUser.notificationSettings,
+        notificationType: "weeklySummary",
+      })
+    );
+    expect(screen.getByTestId("notification-switch-proj3")).toBeInTheDocument();
+
+    const inviteLinks = screen.getAllByTestId("link");
+    expect(inviteLinks.length).toBe(mockMemberships.length);
+    inviteLinks.forEach((link) => {
+      expect(link).toHaveAttribute("href", `/environments/${environmentId}/settings/general`);
+      expect(link).toHaveTextContent("common.invite_them");
+    });
+
+    expect(screen.getAllByTestId("users-icon").length).toBe(mockMemberships.length);
+
+    expect(screen.getAllByText("common.project")[0]).toBeInTheDocument();
+    expect(screen.getAllByText("common.weekly_summary")[0]).toBeInTheDocument();
+    expect(
+      screen.getAllByText("environments.settings.notifications.want_to_loop_in_organization_mates?").length
+    ).toBe(mockMemberships.length);
+  });
+
+  test("renders correctly with no memberships", () => {
+    render(<EditWeeklySummary memberships={[]} user={mockUser} environmentId={environmentId} />);
+    expect(screen.queryByText("Organization 1")).not.toBeInTheDocument();
+    expect(screen.queryByTestId("users-icon")).not.toBeInTheDocument();
+  });
+
+  test("renders correctly when an organization has no projects", () => {
+    const membershipsWithNoProjects: Membership[] = [
+      {
+        organization: {
+          id: "org3",
+          name: "Organization No Projects",
+          projects: [],
+        },
+      },
+    ];
+    render(
+      <EditWeeklySummary
+        memberships={membershipsWithNoProjects}
+        user={mockUser}
+        environmentId={environmentId}
+      />
+    );
+    expect(screen.getByText("Organization No Projects")).toBeInTheDocument();
+    expect(screen.queryByText("Project 1")).not.toBeInTheDocument(); // Check that no projects are listed under it
+    expect(mockNotificationSwitch).not.toHaveBeenCalled(); // No projects, so no switches for projects
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(account)/notifications/components/IntegrationsTip.test.tsx

@@ -0,0 +1,36 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { IntegrationsTip } from "./IntegrationsTip";
+
+vi.mock("@/modules/ui/components/icons", () => ({
+  SlackIcon: () => <div data-testid="slack-icon" />,
+}));
+
+const mockT = vi.fn((key) => key);
+vi.mock("@tolgee/react", () => ({
+  useTranslate: () => ({
+    t: mockT,
+  }),
+}));
+
+const environmentId = "test-env-id";
+
+describe("IntegrationsTip", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  test("renders the component with correct text and link", () => {
+    render(<IntegrationsTip environmentId={environmentId} />);
+
+    expect(screen.getByTestId("slack-icon")).toBeInTheDocument();
+    expect(
+      screen.getByText("environments.settings.notifications.need_slack_or_discord_notifications?")
+    ).toBeInTheDocument();
+
+    const linkElement = screen.getByText("environments.settings.notifications.use_the_integration");
+    expect(linkElement).toBeInTheDocument();
+    expect(linkElement).toHaveAttribute("href", `/environments/${environmentId}/integrations`);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(account)/notifications/components/NotificationSwitch.test.tsx

@@ -0,0 +1,249 @@
+import { act, cleanup, render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import toast from "react-hot-toast";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TUserNotificationSettings } from "@formbricks/types/user";
+import { updateNotificationSettingsAction } from "../actions";
+import { NotificationSwitch } from "./NotificationSwitch";
+
+vi.mock("@/modules/ui/components/switch", () => ({
+  Switch: vi.fn(({ checked, disabled, onCheckedChange, id, "aria-label": ariaLabel }) => (
+    <input
+      type="checkbox"
+      data-testid={id}
+      aria-label={ariaLabel}
+      checked={checked}
+      disabled={disabled}
+      onChange={onCheckedChange}
+    />
+  )),
+}));
+
+vi.mock("../actions", () => ({
+  updateNotificationSettingsAction: vi.fn(() => Promise.resolve()),
+}));
+
+const surveyId = "survey1";
+const projectId = "project1";
+const organizationId = "org1";
+
+const baseNotificationSettings: TUserNotificationSettings = {
+  alert: {},
+  weeklySummary: {},
+  unsubscribedOrganizationIds: [],
+};
+
+describe("NotificationSwitch", () => {
+  let user: ReturnType<typeof userEvent.setup>;
+
+  beforeEach(() => {
+    user = userEvent.setup();
+    vi.clearAllMocks();
+  });
+
+  afterEach(() => {
+    cleanup();
+  });
+
+  const renderSwitch = (props: Partial<React.ComponentProps<typeof NotificationSwitch>>) => {
+    const defaultProps: React.ComponentProps<typeof NotificationSwitch> = {
+      surveyOrProjectOrOrganizationId: surveyId,
+      notificationSettings: JSON.parse(JSON.stringify(baseNotificationSettings)),
+      notificationType: "alert",
+    };
+    return render(<NotificationSwitch {...defaultProps} {...props} />);
+  };
+
+  test("renders with initial checked state for 'alert' (true)", () => {
+    const settings = { ...baseNotificationSettings, alert: { [surveyId]: true } };
+    renderSwitch({ notificationSettings: settings, notificationType: "alert" });
+    const switchInput = screen.getByLabelText("toggle notification settings for alert") as HTMLInputElement;
+    expect(switchInput.checked).toBe(true);
+  });
+
+  test("renders with initial checked state for 'alert' (false)", () => {
+    const settings = { ...baseNotificationSettings, alert: { [surveyId]: false } };
+    renderSwitch({ notificationSettings: settings, notificationType: "alert" });
+    const switchInput = screen.getByLabelText("toggle notification settings for alert") as HTMLInputElement;
+    expect(switchInput.checked).toBe(false);
+  });
+
+  test("renders with initial checked state for 'weeklySummary' (true)", () => {
+    const settings = { ...baseNotificationSettings, weeklySummary: { [projectId]: true } };
+    renderSwitch({
+      surveyOrProjectOrOrganizationId: projectId,
+      notificationSettings: settings,
+      notificationType: "weeklySummary",
+    });
+    const switchInput = screen.getByLabelText(
+      "toggle notification settings for weeklySummary"
+    ) as HTMLInputElement;
+    expect(switchInput.checked).toBe(true);
+  });
+
+  test("renders with initial checked state for 'unsubscribedOrganizationIds' (subscribed initially, so checked is true)", () => {
+    const settings = { ...baseNotificationSettings, unsubscribedOrganizationIds: [] };
+    renderSwitch({
+      surveyOrProjectOrOrganizationId: organizationId,
+      notificationSettings: settings,
+      notificationType: "unsubscribedOrganizationIds",
+    });
+    const switchInput = screen.getByLabelText(
+      "toggle notification settings for unsubscribedOrganizationIds"
+    ) as HTMLInputElement;
+    expect(switchInput.checked).toBe(true); // Not in unsubscribed list means subscribed
+  });
+
+  test("renders with initial checked state for 'unsubscribedOrganizationIds' (unsubscribed initially, so checked is false)", () => {
+    const settings = { ...baseNotificationSettings, unsubscribedOrganizationIds: [organizationId] };
+    renderSwitch({
+      surveyOrProjectOrOrganizationId: organizationId,
+      notificationSettings: settings,
+      notificationType: "unsubscribedOrganizationIds",
+    });
+    const switchInput = screen.getByLabelText(
+      "toggle notification settings for unsubscribedOrganizationIds"
+    ) as HTMLInputElement;
+    expect(switchInput.checked).toBe(false); // In unsubscribed list means unsubscribed
+  });
+
+  test("handles switch change for 'alert' type", async () => {
+    const initialSettings = { ...baseNotificationSettings, alert: { [surveyId]: false } };
+    renderSwitch({ notificationSettings: initialSettings, notificationType: "alert" });
+    const switchInput = screen.getByLabelText("toggle notification settings for alert");
+
+    await act(async () => {
+      await user.click(switchInput);
+    });
+
+    expect(updateNotificationSettingsAction).toHaveBeenCalledWith({
+      notificationSettings: { ...initialSettings, alert: { [surveyId]: true } },
+    });
+    expect(toast.success).toHaveBeenCalledWith(
+      "environments.settings.notifications.notification_settings_updated",
+      { id: "notification-switch" }
+    );
+    expect(switchInput).toBeEnabled(); // Check if not disabled after action
+  });
+
+  test("handles switch change for 'unsubscribedOrganizationIds' (subscribe)", async () => {
+    const initialSettings = { ...baseNotificationSettings, unsubscribedOrganizationIds: [organizationId] }; // initially unsubscribed
+    renderSwitch({
+      surveyOrProjectOrOrganizationId: organizationId,
+      notificationSettings: initialSettings,
+      notificationType: "unsubscribedOrganizationIds",
+    });
+    const switchInput = screen.getByLabelText("toggle notification settings for unsubscribedOrganizationIds");
+
+    await act(async () => {
+      await user.click(switchInput);
+    });
+
+    expect(updateNotificationSettingsAction).toHaveBeenCalledWith({
+      notificationSettings: { ...initialSettings, unsubscribedOrganizationIds: [] }, // should be removed from list
+    });
+    expect(toast.success).toHaveBeenCalledWith(
+      "environments.settings.notifications.notification_settings_updated",
+      { id: "notification-switch" }
+    );
+  });
+
+  test("handles switch change for 'unsubscribedOrganizationIds' (unsubscribe)", async () => {
+    const initialSettings = { ...baseNotificationSettings, unsubscribedOrganizationIds: [] }; // initially subscribed
+    renderSwitch({
+      surveyOrProjectOrOrganizationId: organizationId,
+      notificationSettings: initialSettings,
+      notificationType: "unsubscribedOrganizationIds",
+    });
+    const switchInput = screen.getByLabelText("toggle notification settings for unsubscribedOrganizationIds");
+
+    await act(async () => {
+      await user.click(switchInput);
+    });
+
+    expect(updateNotificationSettingsAction).toHaveBeenCalledWith({
+      notificationSettings: { ...initialSettings, unsubscribedOrganizationIds: [organizationId] }, // should be added to list
+    });
+    expect(toast.success).toHaveBeenCalledWith(
+      "environments.settings.notifications.notification_settings_updated",
+      { id: "notification-switch" }
+    );
+  });
+
+  test("useEffect: auto-disables 'alert' notification if conditions met", () => {
+    const settings = { ...baseNotificationSettings, alert: { [surveyId]: true } }; // Initially true
+    renderSwitch({
+      surveyOrProjectOrOrganizationId: surveyId,
+      notificationSettings: settings,
+      notificationType: "alert",
+      autoDisableNotificationType: "alert",
+      autoDisableNotificationElementId: surveyId,
+    });
+
+    expect(updateNotificationSettingsAction).toHaveBeenCalledWith({
+      notificationSettings: { ...settings, alert: { [surveyId]: false } },
+    });
+    expect(toast.success).toHaveBeenCalledWith(
+      "environments.settings.notifications.you_will_not_receive_any_more_emails_for_responses_on_this_survey",
+      { id: "notification-switch" }
+    );
+  });
+
+  test("useEffect: auto-disables 'unsubscribedOrganizationIds' (auto-unsubscribes) if conditions met", () => {
+    const settings = { ...baseNotificationSettings, unsubscribedOrganizationIds: [] }; // Initially subscribed
+    renderSwitch({
+      surveyOrProjectOrOrganizationId: organizationId,
+      notificationSettings: settings,
+      notificationType: "unsubscribedOrganizationIds",
+      autoDisableNotificationType: "someOtherType", // This prop is used to trigger the effect, not directly for type matching in this case
+      autoDisableNotificationElementId: organizationId,
+    });
+
+    expect(updateNotificationSettingsAction).toHaveBeenCalledWith({
+      notificationSettings: { ...settings, unsubscribedOrganizationIds: [organizationId] },
+    });
+    expect(toast.success).toHaveBeenCalledWith(
+      "environments.settings.notifications.you_will_not_be_auto_subscribed_to_this_organizations_surveys_anymore",
+      { id: "notification-switch" }
+    );
+  });
+
+  test("useEffect: does not auto-disable if 'autoDisableNotificationElementId' does not match", () => {
+    const settings = { ...baseNotificationSettings, alert: { [surveyId]: true } };
+    renderSwitch({
+      surveyOrProjectOrOrganizationId: surveyId,
+      notificationSettings: settings,
+      notificationType: "alert",
+      autoDisableNotificationType: "alert",
+      autoDisableNotificationElementId: "otherId", // Mismatch
+    });
+    expect(updateNotificationSettingsAction).not.toHaveBeenCalled();
+    expect(toast.success).not.toHaveBeenCalledWith(
+      "environments.settings.notifications.you_will_not_receive_any_more_emails_for_responses_on_this_survey"
+    );
+  });
+
+  test("useEffect: does not auto-disable if not checked initially for 'alert'", () => {
+    const settings = { ...baseNotificationSettings, alert: { [surveyId]: false } }; // Initially false
+    renderSwitch({
+      surveyOrProjectOrOrganizationId: surveyId,
+      notificationSettings: settings,
+      notificationType: "alert",
+      autoDisableNotificationType: "alert",
+      autoDisableNotificationElementId: surveyId,
+    });
+    expect(updateNotificationSettingsAction).not.toHaveBeenCalled();
+  });
+
+  test("useEffect: does not auto-disable if not checked initially for 'unsubscribedOrganizationIds' (already unsubscribed)", () => {
+    const settings = { ...baseNotificationSettings, unsubscribedOrganizationIds: [organizationId] }; // Initially unsubscribed
+    renderSwitch({
+      surveyOrProjectOrOrganizationId: organizationId,
+      notificationSettings: settings,
+      notificationType: "unsubscribedOrganizationIds",
+      autoDisableNotificationType: "someType",
+      autoDisableNotificationElementId: organizationId,
+    });
+    expect(updateNotificationSettingsAction).not.toHaveBeenCalled();
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(account)/notifications/loading.test.tsx

@@ -0,0 +1,50 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import Loading from "./loading";
+
+vi.mock("@/modules/ui/components/page-content-wrapper", () => ({
+  PageContentWrapper: ({ children }: { children: React.ReactNode }) => (
+    <div data-testid="page-content-wrapper">{children}</div>
+  ),
+}));
+
+vi.mock("@/modules/ui/components/page-header", () => ({
+  PageHeader: ({ pageTitle }: { pageTitle: string }) => <div data-testid="page-header">{pageTitle}</div>,
+}));
+
+describe("Loading Notifications Settings", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  test("renders loading state correctly", () => {
+    render(<Loading />);
+
+    expect(screen.getByTestId("page-content-wrapper")).toBeInTheDocument();
+    const pageHeader = screen.getByTestId("page-header");
+    expect(pageHeader).toBeInTheDocument();
+    expect(pageHeader).toHaveTextContent("common.account_settings");
+
+    // Check for Alerts LoadingCard
+    expect(screen.getByText("environments.settings.notifications.email_alerts_surveys")).toBeInTheDocument();
+    expect(
+      screen.getByText("environments.settings.notifications.set_up_an_alert_to_get_an_email_on_new_responses")
+    ).toBeInTheDocument();
+    const alertsCard = screen
+      .getByText("environments.settings.notifications.email_alerts_surveys")
+      .closest("div[class*='rounded-xl']"); // Find parent card
+    expect(alertsCard).toBeInTheDocument();
+
+    // Check for Weekly Summary LoadingCard
+    expect(
+      screen.getByText("environments.settings.notifications.weekly_summary_projects")
+    ).toBeInTheDocument();
+    expect(
+      screen.getByText("environments.settings.notifications.stay_up_to_date_with_a_Weekly_every_Monday")
+    ).toBeInTheDocument();
+    const weeklySummaryCard = screen
+      .getByText("environments.settings.notifications.weekly_summary_projects")
+      .closest("div[class*='rounded-xl']"); // Find parent card
+    expect(weeklySummaryCard).toBeInTheDocument();
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(account)/notifications/page.test.tsx

@@ -0,0 +1,258 @@
+import { getUser } from "@/lib/user/service";
+import { cleanup, render, screen } from "@testing-library/react";
+import { getServerSession } from "next-auth";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { prisma } from "@formbricks/database";
+import { TUser } from "@formbricks/types/user";
+import { EditAlerts } from "./components/EditAlerts";
+import { EditWeeklySummary } from "./components/EditWeeklySummary";
+import Page from "./page";
+import { Membership } from "./types";
+
+// Mock external dependencies
+vi.mock(
+  "@/app/(app)/environments/[environmentId]/settings/(account)/components/AccountSettingsNavbar",
+  () => ({
+    AccountSettingsNavbar: ({ activeId }) => <div>AccountSettingsNavbar activeId={activeId}</div>,
+  })
+);
+vi.mock("@/app/(app)/environments/[environmentId]/settings/components/SettingsCard", () => ({
+  SettingsCard: ({ title, description, children }) => (
+    <div>
+      <h1>{title}</h1>
+      <p>{description}</p>
+      {children}
+    </div>
+  ),
+}));
+vi.mock("@/lib/user/service", () => ({
+  getUser: vi.fn(),
+}));
+vi.mock("@/modules/auth/lib/authOptions", () => ({
+  authOptions: {},
+}));
+vi.mock("@/modules/ui/components/page-content-wrapper", () => ({
+  PageContentWrapper: ({ children }) => <div>{children}</div>,
+}));
+vi.mock("@/modules/ui/components/page-header", () => ({
+  PageHeader: ({ pageTitle, children }) => (
+    <div>
+      <h1>{pageTitle}</h1>
+      {children}
+    </div>
+  ),
+}));
+vi.mock("@/tolgee/server", () => ({
+  getTranslate: async () => (key: string) => key,
+}));
+vi.mock("next-auth", () => ({
+  getServerSession: vi.fn(),
+}));
+vi.mock("@formbricks/database", () => ({
+  prisma: {
+    membership: {
+      findMany: vi.fn(),
+    },
+  },
+}));
+vi.mock("./components/EditAlerts", () => ({
+  EditAlerts: vi.fn(() => <div>EditAlertsComponent</div>),
+}));
+vi.mock("./components/EditWeeklySummary", () => ({
+  EditWeeklySummary: vi.fn(() => <div>EditWeeklySummaryComponent</div>),
+}));
+vi.mock("./components/IntegrationsTip", () => ({
+  IntegrationsTip: () => <div>IntegrationsTipComponent</div>,
+}));
+
+const mockUser: Partial<TUser> = {
+  id: "user-1",
+  name: "Test User",
+  email: "test@example.com",
+  notificationSettings: {
+    alert: { "survey-old": true },
+    weeklySummary: { "project-old": true },
+    unsubscribedOrganizationIds: ["org-unsubscribed"],
+  },
+};
+
+const mockMemberships: Membership[] = [
+  {
+    organization: {
+      id: "org-1",
+      name: "Org 1",
+      projects: [
+        {
+          id: "project-1",
+          name: "Project 1",
+          environments: [
+            {
+              id: "env-prod-1",
+              surveys: [
+                { id: "survey-1", name: "Survey 1" },
+                { id: "survey-2", name: "Survey 2" },
+              ],
+            },
+          ],
+        },
+      ],
+    },
+  },
+];
+
+const mockSession = {
+  user: {
+    id: "user-1",
+  },
+} as any;
+
+const mockParams = { environmentId: "env-1" };
+const mockSearchParams = {
+  type: "alertTest",
+  elementId: "elementTestId",
+};
+
+describe("NotificationsPage", () => {
+  afterEach(() => {
+    cleanup();
+    vi.resetAllMocks();
+  });
+
+  beforeEach(() => {
+    vi.mocked(getServerSession).mockResolvedValue(mockSession);
+    vi.mocked(getUser).mockResolvedValue(mockUser as TUser);
+    vi.mocked(prisma.membership.findMany).mockResolvedValue(mockMemberships as any); // Prisma types can be complex
+  });
+
+  test("renders correctly with user and memberships, and processes notification settings", async () => {
+    const props = { params: mockParams, searchParams: mockSearchParams };
+    const PageComponent = await Page(props);
+    render(PageComponent);
+
+    expect(screen.getByText("common.account_settings")).toBeInTheDocument();
+    expect(screen.getByText("AccountSettingsNavbar activeId=notifications")).toBeInTheDocument();
+    expect(screen.getByText("environments.settings.notifications.email_alerts_surveys")).toBeInTheDocument();
+    expect(
+      screen.getByText("environments.settings.notifications.set_up_an_alert_to_get_an_email_on_new_responses")
+    ).toBeInTheDocument();
+    expect(screen.getByText("EditAlertsComponent")).toBeInTheDocument();
+    expect(screen.getByText("IntegrationsTipComponent")).toBeInTheDocument();
+    expect(
+      screen.getByText("environments.settings.notifications.weekly_summary_projects")
+    ).toBeInTheDocument();
+    expect(
+      screen.getByText("environments.settings.notifications.stay_up_to_date_with_a_Weekly_every_Monday")
+    ).toBeInTheDocument();
+    expect(screen.getByText("EditWeeklySummaryComponent")).toBeInTheDocument();
+
+    // The actual `user.notificationSettings` passed to EditAlerts will be a new object
+    // after `setCompleteNotificationSettings` processes it.
+    // We verify the structure and defaults.
+    const editAlertsCall = vi.mocked(EditAlerts).mock.calls[0][0];
+    expect(editAlertsCall.user.notificationSettings.alert["survey-1"]).toBe(false);
+    expect(editAlertsCall.user.notificationSettings.alert["survey-2"]).toBe(false);
+    // If "survey-old" was not part of any membership survey, it might be removed or kept depending on exact logic.
+    // The current logic only adds keys from memberships. So "survey-old" would be gone from .alert
+    // Let's adjust expectation based on `setCompleteNotificationSettings`
+    // It iterates memberships, then projects, then environments, then surveys.
+    // `newNotificationSettings.alert[survey.id] = notificationSettings[survey.id]?.responseFinished || (notificationSettings.alert && notificationSettings.alert[survey.id]) || false;`
+    // This means only survey IDs found in memberships will be in the new `alert` object.
+    // `newNotificationSettings.weeklySummary[project.id]` also only adds project IDs from memberships.
+
+    const finalExpectedSettings = {
+      alert: {
+        "survey-1": false,
+        "survey-2": false,
+      },
+      weeklySummary: {
+        "project-1": false,
+      },
+      unsubscribedOrganizationIds: ["org-unsubscribed"],
+    };
+
+    expect(editAlertsCall.user.notificationSettings).toEqual(finalExpectedSettings);
+    expect(editAlertsCall.memberships).toEqual(mockMemberships);
+    expect(editAlertsCall.environmentId).toBe(mockParams.environmentId);
+    expect(editAlertsCall.autoDisableNotificationType).toBe(mockSearchParams.type);
+    expect(editAlertsCall.autoDisableNotificationElementId).toBe(mockSearchParams.elementId);
+
+    const editWeeklySummaryCall = vi.mocked(EditWeeklySummary).mock.calls[0][0];
+    expect(editWeeklySummaryCall.user.notificationSettings).toEqual(finalExpectedSettings);
+    expect(editWeeklySummaryCall.memberships).toEqual(mockMemberships);
+    expect(editWeeklySummaryCall.environmentId).toBe(mockParams.environmentId);
+  });
+
+  test("throws error if session is not found", async () => {
+    vi.mocked(getServerSession).mockResolvedValue(null);
+    const props = { params: mockParams, searchParams: {} };
+    await expect(Page(props)).rejects.toThrow("common.session_not_found");
+  });
+
+  test("throws error if user is not found", async () => {
+    vi.mocked(getUser).mockResolvedValue(null);
+    const props = { params: mockParams, searchParams: {} };
+    await expect(Page(props)).rejects.toThrow("common.user_not_found");
+  });
+
+  test("renders with empty memberships and default notification settings", async () => {
+    vi.mocked(prisma.membership.findMany).mockResolvedValue([]);
+    const userWithNoSpecificSettings = {
+      ...mockUser,
+      notificationSettings: { unsubscribedOrganizationIds: [] }, // Start fresh
+    };
+    vi.mocked(getUser).mockResolvedValue(userWithNoSpecificSettings as unknown as TUser);
+
+    const props = { params: mockParams, searchParams: {} };
+    const PageComponent = await Page(props);
+    render(PageComponent);
+
+    expect(screen.getByText("EditAlertsComponent")).toBeInTheDocument();
+    expect(screen.getByText("EditWeeklySummaryComponent")).toBeInTheDocument();
+
+    const expectedEmptySettings = {
+      alert: {},
+      weeklySummary: {},
+      unsubscribedOrganizationIds: [],
+    };
+
+    const editAlertsCall = vi.mocked(EditAlerts).mock.calls[0][0];
+    expect(editAlertsCall.user.notificationSettings).toEqual(expectedEmptySettings);
+    expect(editAlertsCall.memberships).toEqual([]);
+
+    const editWeeklySummaryCall = vi.mocked(EditWeeklySummary).mock.calls[0][0];
+    expect(editWeeklySummaryCall.user.notificationSettings).toEqual(expectedEmptySettings);
+    expect(editWeeklySummaryCall.memberships).toEqual([]);
+  });
+
+  test("handles legacy notification settings correctly", async () => {
+    const userWithLegacySettings: Partial<TUser> = {
+      id: "user-legacy",
+      notificationSettings: {
+        "survey-1": { responseFinished: true }, // Legacy alert for survey-1
+        weeklySummary: { "project-1": true },
+        unsubscribedOrganizationIds: [],
+      } as any, // To allow legacy structure
+    };
+    vi.mocked(getUser).mockResolvedValue(userWithLegacySettings as TUser);
+    // Memberships define survey-1 and project-1
+    vi.mocked(prisma.membership.findMany).mockResolvedValue(mockMemberships as any);
+
+    const props = { params: mockParams, searchParams: {} };
+    const PageComponent = await Page(props);
+    render(PageComponent);
+
+    const expectedProcessedSettings = {
+      alert: {
+        "survey-1": true, // Should be true due to legacy setting
+        "survey-2": false, // Default for other surveys in membership
+      },
+      weeklySummary: {
+        "project-1": true, // From user's weeklySummary
+      },
+      unsubscribedOrganizationIds: [],
+    };
+
+    const editAlertsCall = vi.mocked(EditAlerts).mock.calls[0][0];
+    expect(editAlertsCall.user.notificationSettings).toEqual(expectedProcessedSettings);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(account)/profile/actions.ts

@@ -9,7 +9,7 @@ import { ZId } from "@formbricks/types/common";
 import { ZUserUpdateInput } from "@formbricks/types/user";
 
 export const updateUserAction = authenticatedActionClient
-  .schema(ZUserUpdateInput.partial())
+  .schema(ZUserUpdateInput.pick({ name: true, locale: true }))
   .action(async ({ parsedInput, ctx }) => {
     return await updateUser(ctx.user.id, parsedInput);
   });

apps/web/app/(app)/environments/[environmentId]/settings/(account)/profile/components/AccountSecurity.test.tsx

@@ -0,0 +1,70 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TUser } from "@formbricks/types/user";
+import { AccountSecurity } from "./AccountSecurity";
+
+vi.mock("@/modules/ee/two-factor-auth/components/enable-two-factor-modal", () => ({
+  EnableTwoFactorModal: ({ open }) =>
+    open ? <div data-testid="enable-2fa-modal">EnableTwoFactorModal</div> : null,
+}));
+
+vi.mock("@/modules/ee/two-factor-auth/components/disable-two-factor-modal", () => ({
+  DisableTwoFactorModal: ({ open }) =>
+    open ? <div data-testid="disable-2fa-modal">DisableTwoFactorModal</div> : null,
+}));
+
+const mockUser = {
+  id: "test-user-id",
+  name: "Test User",
+  email: "test@example.com",
+  notificationSettings: {
+    alert: {},
+    weeklySummary: {},
+    unsubscribedOrganizationIds: [],
+  },
+  twoFactorEnabled: false,
+  identityProvider: "email",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  role: "project_manager",
+  objective: "other",
+} as unknown as TUser;
+
+describe("AccountSecurity", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  beforeEach(() => {
+    vi.resetAllMocks();
+  });
+
+  test("renders correctly with 2FA disabled", () => {
+    render(<AccountSecurity user={{ ...mockUser, twoFactorEnabled: false }} />);
+    expect(screen.getByText("environments.settings.profile.two_factor_authentication")).toBeInTheDocument();
+    expect(
+      screen.getByText("environments.settings.profile.two_factor_authentication_description")
+    ).toBeInTheDocument();
+    expect(screen.getByRole("switch")).not.toBeChecked();
+  });
+
+  test("renders correctly with 2FA enabled", () => {
+    render(<AccountSecurity user={{ ...mockUser, twoFactorEnabled: true }} />);
+    expect(screen.getByRole("switch")).toBeChecked();
+  });
+
+  test("opens EnableTwoFactorModal when switch is turned on", async () => {
+    render(<AccountSecurity user={{ ...mockUser, twoFactorEnabled: false }} />);
+    const switchControl = screen.getByRole("switch");
+    await userEvent.click(switchControl);
+    expect(screen.getByTestId("enable-2fa-modal")).toBeInTheDocument();
+  });
+
+  test("opens DisableTwoFactorModal when switch is turned off", async () => {
+    render(<AccountSecurity user={{ ...mockUser, twoFactorEnabled: true }} />);
+    const switchControl = screen.getByRole("switch");
+    await userEvent.click(switchControl);
+    expect(screen.getByTestId("disable-2fa-modal")).toBeInTheDocument();
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(account)/profile/components/DeleteAccount.test.tsx

@@ -0,0 +1,97 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { Session } from "next-auth";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TOrganization } from "@formbricks/types/organizations";
+import { TUser } from "@formbricks/types/user";
+import { DeleteAccount } from "./DeleteAccount";
+
+vi.mock("@/modules/account/components/DeleteAccountModal", () => ({
+  DeleteAccountModal: ({ open }) =>
+    open ? <div data-testid="delete-account-modal">DeleteAccountModal</div> : null,
+}));
+
+const mockUser = {
+  id: "user1",
+  name: "Test User",
+  email: "test@example.com",
+  notificationSettings: { alert: {}, weeklySummary: {}, unsubscribedOrganizationIds: [] },
+  twoFactorEnabled: false,
+  identityProvider: "email",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  role: "project_manager",
+  objective: "other",
+} as unknown as TUser;
+
+const mockSession: Session = {
+  user: mockUser,
+  expires: new Date(Date.now() + 2 * 86400).toISOString(),
+};
+
+const mockOrganizations: TOrganization[] = [
+  {
+    id: "org1",
+    name: "Org 1",
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    billing: {
+      stripeCustomerId: "cus_123",
+    } as unknown as TOrganization["billing"],
+  } as unknown as TOrganization,
+];
+
+describe("DeleteAccount", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  beforeEach(() => {
+    vi.resetAllMocks();
+  });
+
+  test("renders correctly and opens modal on click", async () => {
+    render(
+      <DeleteAccount
+        session={mockSession}
+        IS_FORMBRICKS_CLOUD={true}
+        user={mockUser}
+        organizationsWithSingleOwner={[]}
+        isMultiOrgEnabled={true}
+      />
+    );
+
+    expect(screen.getByText("environments.settings.profile.warning_cannot_undo")).toBeInTheDocument();
+    const deleteButton = screen.getByText("environments.settings.profile.confirm_delete_my_account");
+    expect(deleteButton).toBeEnabled();
+    await userEvent.click(deleteButton);
+    expect(screen.getByTestId("delete-account-modal")).toBeInTheDocument();
+  });
+
+  test("renders null if session is not provided", () => {
+    const { container } = render(
+      <DeleteAccount
+        session={null}
+        IS_FORMBRICKS_CLOUD={true}
+        user={mockUser}
+        organizationsWithSingleOwner={[]}
+        isMultiOrgEnabled={true}
+      />
+    );
+    expect(container.firstChild).toBeNull();
+  });
+
+  test("enables delete button if multi-org enabled even if user is single owner", () => {
+    render(
+      <DeleteAccount
+        session={mockSession}
+        IS_FORMBRICKS_CLOUD={false}
+        user={mockUser}
+        organizationsWithSingleOwner={mockOrganizations}
+        isMultiOrgEnabled={true}
+      />
+    );
+    const deleteButton = screen.getByText("environments.settings.profile.confirm_delete_my_account");
+    expect(deleteButton).toBeEnabled();
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(account)/profile/components/EditProfileAvatarForm.test.tsx

@@ -0,0 +1,104 @@
+import * as profileActions from "@/app/(app)/environments/[environmentId]/settings/(account)/profile/actions";
+import * as fileUploadHooks from "@/app/lib/fileUpload";
+import { cleanup, render, screen, waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { Session } from "next-auth";
+import toast from "react-hot-toast";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { EditProfileAvatarForm } from "./EditProfileAvatarForm";
+
+vi.mock("@/modules/ui/components/avatars", () => ({
+  ProfileAvatar: ({ imageUrl }) => <div data-testid="profile-avatar">{imageUrl || "No Avatar"}</div>,
+}));
+
+vi.mock("next/navigation", () => ({
+  useRouter: () => ({
+    refresh: vi.fn(),
+  }),
+}));
+
+vi.mock("@/app/(app)/environments/[environmentId]/settings/(account)/profile/actions", () => ({
+  updateAvatarAction: vi.fn(),
+  removeAvatarAction: vi.fn(),
+}));
+
+vi.mock("@/app/lib/fileUpload", () => ({
+  handleFileUpload: vi.fn(),
+}));
+
+const mockSession: Session = {
+  user: { id: "user-id" },
+  expires: "session-expires-at",
+};
+const environmentId = "test-env-id";
+
+describe("EditProfileAvatarForm", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  beforeEach(() => {
+    vi.mocked(profileActions.updateAvatarAction).mockResolvedValue({});
+    vi.mocked(profileActions.removeAvatarAction).mockResolvedValue({});
+    vi.mocked(fileUploadHooks.handleFileUpload).mockResolvedValue({
+      url: "new-avatar.jpg",
+      error: undefined,
+    });
+  });
+
+  test("renders correctly without an existing image", () => {
+    render(<EditProfileAvatarForm session={mockSession} environmentId={environmentId} imageUrl={null} />);
+    expect(screen.getByTestId("profile-avatar")).toHaveTextContent("No Avatar");
+    expect(screen.getByText("environments.settings.profile.upload_image")).toBeInTheDocument();
+    expect(screen.queryByText("environments.settings.profile.remove_image")).not.toBeInTheDocument();
+  });
+
+  test("renders correctly with an existing image", () => {
+    render(
+      <EditProfileAvatarForm
+        session={mockSession}
+        environmentId={environmentId}
+        imageUrl="existing-avatar.jpg"
+      />
+    );
+    expect(screen.getByTestId("profile-avatar")).toHaveTextContent("existing-avatar.jpg");
+    expect(screen.getByText("environments.settings.profile.change_image")).toBeInTheDocument();
+    expect(screen.getByText("environments.settings.profile.remove_image")).toBeInTheDocument();
+  });
+
+  test("handles image removal successfully", async () => {
+    render(
+      <EditProfileAvatarForm
+        session={mockSession}
+        environmentId={environmentId}
+        imageUrl="existing-avatar.jpg"
+      />
+    );
+    const removeButton = screen.getByText("environments.settings.profile.remove_image");
+    await userEvent.click(removeButton);
+
+    await waitFor(() => {
+      expect(profileActions.removeAvatarAction).toHaveBeenCalledWith({ environmentId });
+    });
+  });
+
+  test("shows error if removeAvatarAction fails", async () => {
+    vi.mocked(profileActions.removeAvatarAction).mockRejectedValue(new Error("API error"));
+    render(
+      <EditProfileAvatarForm
+        session={mockSession}
+        environmentId={environmentId}
+        imageUrl="existing-avatar.jpg"
+      />
+    );
+    const removeButton = screen.getByText("environments.settings.profile.remove_image");
+    await userEvent.click(removeButton);
+
+    await waitFor(() => {
+      expect(vi.mocked(toast.error)).toHaveBeenCalledWith(
+        "environments.settings.profile.avatar_update_failed"
+      );
+    });
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(account)/profile/components/EditProfileDetailsForm.test.tsx

@@ -0,0 +1,117 @@
+import { cleanup, render, screen, waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import toast from "react-hot-toast";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TUser } from "@formbricks/types/user";
+import { updateUserAction } from "../actions";
+import { EditProfileDetailsForm } from "./EditProfileDetailsForm";
+
+const mockUser = {
+  id: "test-user-id",
+  name: "Old Name",
+  email: "test@example.com",
+  locale: "en-US",
+  notificationSettings: {
+    alert: {},
+    weeklySummary: {},
+    unsubscribedOrganizationIds: [],
+  },
+  twoFactorEnabled: false,
+  identityProvider: "email",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  role: "project_manager",
+  objective: "other",
+} as unknown as TUser;
+
+// Mock window.location.reload
+const originalLocation = window.location;
+beforeEach(() => {
+  vi.stubGlobal("location", {
+    ...originalLocation,
+    reload: vi.fn(),
+  });
+});
+
+vi.mock("@/app/(app)/environments/[environmentId]/settings/(account)/profile/actions", () => ({
+  updateUserAction: vi.fn(),
+}));
+
+afterEach(() => {
+  vi.unstubAllGlobals();
+});
+
+describe("EditProfileDetailsForm", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  test("renders with initial user data and updates successfully", async () => {
+    vi.mocked(updateUserAction).mockResolvedValue({ ...mockUser, name: "New Name" } as any);
+
+    render(<EditProfileDetailsForm user={mockUser} />);
+
+    const nameInput = screen.getByPlaceholderText("common.full_name");
+    expect(nameInput).toHaveValue(mockUser.name);
+    expect(screen.getByDisplayValue(mockUser.email)).toBeDisabled();
+    // Check initial language (English)
+    expect(screen.getByText("English (US)")).toBeInTheDocument();
+
+    await userEvent.clear(nameInput);
+    await userEvent.type(nameInput, "New Name");
+
+    // Change language
+    const languageDropdownTrigger = screen.getByRole("button", { name: /English/ });
+    await userEvent.click(languageDropdownTrigger);
+    const germanOption = await screen.findByText("German"); // Assuming 'German' is an option
+    await userEvent.click(germanOption);
+
+    const updateButton = screen.getByText("common.update");
+    expect(updateButton).toBeEnabled();
+    await userEvent.click(updateButton);
+
+    await waitFor(() => {
+      expect(updateUserAction).toHaveBeenCalledWith({ name: "New Name", locale: "de-DE" });
+    });
+    await waitFor(() => {
+      expect(toast.success).toHaveBeenCalledWith(
+        "environments.settings.profile.profile_updated_successfully"
+      );
+    });
+    await waitFor(() => {
+      expect(window.location.reload).toHaveBeenCalled();
+    });
+  });
+
+  test("shows error toast if update fails", async () => {
+    const errorMessage = "Update failed";
+    vi.mocked(updateUserAction).mockRejectedValue(new Error(errorMessage));
+
+    render(<EditProfileDetailsForm user={mockUser} />);
+
+    const nameInput = screen.getByPlaceholderText("common.full_name");
+    await userEvent.clear(nameInput);
+    await userEvent.type(nameInput, "Another Name");
+
+    const updateButton = screen.getByText("common.update");
+    await userEvent.click(updateButton);
+
+    await waitFor(() => {
+      expect(updateUserAction).toHaveBeenCalled();
+    });
+    await waitFor(() => {
+      expect(toast.error).toHaveBeenCalledWith(`common.error: ${errorMessage}`);
+    });
+  });
+
+  test("update button is disabled initially and enables on change", async () => {
+    render(<EditProfileDetailsForm user={mockUser} />);
+    const updateButton = screen.getByText("common.update");
+    expect(updateButton).toBeDisabled();
+
+    const nameInput = screen.getByPlaceholderText("common.full_name");
+    await userEvent.type(nameInput, " updated");
+    expect(updateButton).toBeEnabled();
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(account)/profile/loading.test.tsx

@@ -0,0 +1,63 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import Loading from "./loading";
+
+vi.mock(
+  "@/app/(app)/environments/[environmentId]/settings/(account)/components/AccountSettingsNavbar",
+  () => ({
+    AccountSettingsNavbar: ({ activeId, loading }) => (
+      <div data-testid="account-settings-navbar">
+        AccountSettingsNavbar - active: {activeId}, loading: {loading?.toString()}
+      </div>
+    ),
+  })
+);
+
+vi.mock("@/app/(app)/components/LoadingCard", () => ({
+  LoadingCard: ({ title, description }) => (
+    <div data-testid="loading-card">
+      <div>{title}</div>
+      <div>{description}</div>
+    </div>
+  ),
+}));
+
+vi.mock("@/modules/ui/components/page-header", () => ({
+  PageHeader: ({ pageTitle, children }) => (
+    <div>
+      <h1>{pageTitle}</h1>
+      {children}
+    </div>
+  ),
+}));
+
+vi.mock("@/modules/ui/components/page-content-wrapper", () => ({
+  PageContentWrapper: ({ children }) => <div>{children}</div>,
+}));
+
+describe("Loading", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  test("renders loading state correctly", () => {
+    render(<Loading />);
+
+    expect(screen.getByText("common.account_settings")).toBeInTheDocument();
+    expect(screen.getByTestId("account-settings-navbar")).toHaveTextContent(
+      "AccountSettingsNavbar - active: profile, loading: true"
+    );
+
+    const loadingCards = screen.getAllByTestId("loading-card");
+    expect(loadingCards).toHaveLength(3);
+
+    expect(loadingCards[0]).toHaveTextContent("environments.settings.profile.personal_information");
+    expect(loadingCards[0]).toHaveTextContent("environments.settings.profile.update_personal_info");
+
+    expect(loadingCards[1]).toHaveTextContent("common.avatar");
+    expect(loadingCards[1]).toHaveTextContent("environments.settings.profile.organization_identification");
+
+    expect(loadingCards[2]).toHaveTextContent("environments.settings.profile.delete_account");
+    expect(loadingCards[2]).toHaveTextContent("environments.settings.profile.confirm_delete_account");
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(account)/profile/page.test.tsx

@@ -0,0 +1,188 @@
+import { getOrganizationsWhereUserIsSingleOwner } from "@/lib/organization/service";
+import { getUser } from "@/lib/user/service";
+import { getIsMultiOrgEnabled, getIsTwoFactorAuthEnabled } from "@/modules/ee/license-check/lib/utils";
+import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
+import { TEnvironmentAuth } from "@/modules/environments/types/environment-auth";
+import { cleanup, render, screen, waitFor } from "@testing-library/react";
+import { Session } from "next-auth";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TOrganization } from "@formbricks/types/organizations";
+import { TUser } from "@formbricks/types/user";
+import Page from "./page";
+
+// Mock services and utils
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: true,
+}));
+vi.mock("@/lib/organization/service", () => ({
+  getOrganizationsWhereUserIsSingleOwner: vi.fn(),
+}));
+vi.mock("@/lib/user/service", () => ({
+  getUser: vi.fn(),
+}));
+vi.mock("@/modules/ee/license-check/lib/utils", () => ({
+  getIsMultiOrgEnabled: vi.fn(),
+  getIsTwoFactorAuthEnabled: vi.fn(),
+}));
+vi.mock("@/modules/environments/lib/utils", () => ({
+  getEnvironmentAuth: vi.fn(),
+}));
+
+const t = (key: any) => key;
+vi.mock("@/tolgee/server", () => ({
+  getTranslate: async () => t,
+}));
+
+// Mock child components
+vi.mock(
+  "@/app/(app)/environments/[environmentId]/settings/(account)/components/AccountSettingsNavbar",
+  () => ({
+    AccountSettingsNavbar: ({ environmentId, activeId }) => (
+      <div data-testid="account-settings-navbar">
+        AccountSettingsNavbar: {environmentId} {activeId}
+      </div>
+    ),
+  })
+);
+vi.mock(
+  "@/app/(app)/environments/[environmentId]/settings/(account)/profile/components/AccountSecurity",
+  () => ({
+    AccountSecurity: ({ user }) => <div data-testid="account-security">AccountSecurity: {user.id}</div>,
+  })
+);
+vi.mock("./components/DeleteAccount", () => ({
+  DeleteAccount: ({ user }) => <div data-testid="delete-account">DeleteAccount: {user.id}</div>,
+}));
+vi.mock("./components/EditProfileAvatarForm", () => ({
+  EditProfileAvatarForm: ({ _, environmentId }) => (
+    <div data-testid="edit-profile-avatar-form">EditProfileAvatarForm: {environmentId}</div>
+  ),
+}));
+vi.mock("./components/EditProfileDetailsForm", () => ({
+  EditProfileDetailsForm: ({ user }) => (
+    <div data-testid="edit-profile-details-form">EditProfileDetailsForm: {user.id}</div>
+  ),
+}));
+vi.mock("@/modules/ui/components/upgrade-prompt", () => ({
+  UpgradePrompt: ({ title }) => <div data-testid="upgrade-prompt">{title}</div>,
+}));
+
+const mockUser = {
+  id: "user-123",
+  name: "Test User",
+  email: "test@example.com",
+  imageUrl: "http://example.com/avatar.png",
+  twoFactorEnabled: false,
+  identityProvider: "email",
+  notificationSettings: { alert: {}, weeklySummary: {}, unsubscribedOrganizationIds: [] },
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  role: "project_manager",
+  objective: "other",
+} as unknown as TUser;
+
+const mockSession: Session = {
+  user: mockUser,
+  expires: "never",
+};
+
+const mockOrganizations: TOrganization[] = [];
+
+const params = { environmentId: "env-123" };
+
+describe("ProfilePage", () => {
+  beforeEach(() => {
+    vi.mocked(getOrganizationsWhereUserIsSingleOwner).mockResolvedValue(mockOrganizations);
+    vi.mocked(getUser).mockResolvedValue(mockUser);
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      session: mockSession,
+    } as unknown as TEnvironmentAuth);
+    vi.mocked(getIsMultiOrgEnabled).mockResolvedValue(true);
+    vi.mocked(getIsTwoFactorAuthEnabled).mockResolvedValue(true);
+  });
+
+  afterEach(() => {
+    vi.clearAllMocks();
+    cleanup();
+  });
+
+  test("renders profile page with all sections for email user with 2FA license", async () => {
+    render(await Page({ params: Promise.resolve(params) }));
+
+    await waitFor(() => {
+      expect(screen.getByText("common.account_settings")).toBeInTheDocument();
+      expect(screen.getByTestId("account-settings-navbar")).toHaveTextContent(
+        "AccountSettingsNavbar: env-123 profile"
+      );
+      expect(screen.getByTestId("edit-profile-details-form")).toBeInTheDocument();
+      expect(screen.getByTestId("edit-profile-avatar-form")).toBeInTheDocument();
+      expect(screen.getByTestId("account-security")).toBeInTheDocument(); // Shown because 2FA license is enabled
+      expect(screen.queryByTestId("upgrade-prompt")).not.toBeInTheDocument();
+      expect(screen.getByTestId("delete-account")).toBeInTheDocument();
+      // Use a regex to match the text content, allowing for variable whitespace
+      expect(screen.getByText(new RegExp(`common\\.profile\\s*:\\s*${mockUser.id}`))).toBeInTheDocument(); // SettingsId
+    });
+  });
+
+  test("renders UpgradePrompt when 2FA license is disabled and user 2FA is off", async () => {
+    vi.mocked(getIsTwoFactorAuthEnabled).mockResolvedValue(false); // License disabled
+    const userWith2FAOff = { ...mockUser, twoFactorEnabled: false };
+    vi.mocked(getUser).mockResolvedValue(userWith2FAOff);
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      session: { ...mockSession, user: userWith2FAOff },
+    } as unknown as TEnvironmentAuth);
+
+    render(await Page({ params: Promise.resolve(params) }));
+
+    await waitFor(() => {
+      expect(screen.getByTestId("upgrade-prompt")).toBeInTheDocument();
+      expect(screen.getByTestId("upgrade-prompt")).toHaveTextContent(
+        "environments.settings.profile.unlock_two_factor_authentication"
+      );
+      expect(screen.queryByTestId("account-security")).not.toBeInTheDocument();
+    });
+  });
+
+  test("renders AccountSecurity when 2FA license is disabled but user 2FA is on", async () => {
+    vi.mocked(getIsTwoFactorAuthEnabled).mockResolvedValue(false); // License disabled
+    const userWith2FAOn = { ...mockUser, twoFactorEnabled: true };
+    vi.mocked(getUser).mockResolvedValue(userWith2FAOn);
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      session: { ...mockSession, user: userWith2FAOn },
+    } as unknown as TEnvironmentAuth);
+
+    render(await Page({ params: Promise.resolve(params) }));
+
+    await waitFor(() => {
+      expect(screen.getByTestId("account-security")).toBeInTheDocument();
+      expect(screen.queryByTestId("upgrade-prompt")).not.toBeInTheDocument();
+    });
+  });
+
+  test("does not render security card if identityProvider is not email", async () => {
+    const nonEmailUser = { ...mockUser, identityProvider: "google" as "email" | "github" | "google" }; // type assertion
+    vi.mocked(getUser).mockResolvedValue(nonEmailUser);
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      session: { ...mockSession, user: nonEmailUser },
+    } as unknown as TEnvironmentAuth);
+
+    render(await Page({ params: Promise.resolve(params) }));
+
+    await waitFor(() => {
+      expect(screen.queryByTestId("account-security")).not.toBeInTheDocument();
+      expect(screen.queryByTestId("upgrade-prompt")).not.toBeInTheDocument();
+      expect(screen.queryByText("common.security")).not.toBeInTheDocument();
+    });
+  });
+
+  test("throws error if user is not found", async () => {
+    vi.mocked(getUser).mockResolvedValue(null);
+    // Need to catch the promise rejection for async component errors
+    try {
+      // We don't await the render directly, but the component execution
+      await Page({ params: Promise.resolve(params) });
+    } catch (e) {
+      expect(e.message).toBe("common.user_not_found");
+    }
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/api-keys/loading.test.tsx

@@ -0,0 +1,29 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import LoadingPage from "./loading";
+
+// Mock the IS_FORMBRICKS_CLOUD constant
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: true,
+}));
+
+// Mock the actual Loading component that is being imported
+vi.mock("@/modules/organization/settings/api-keys/loading", () => ({
+  default: ({ isFormbricksCloud }: { isFormbricksCloud: boolean }) => (
+    <div data-testid="mocked-loading-component">isFormbricksCloud: {String(isFormbricksCloud)}</div>
+  ),
+}));
+
+describe("LoadingPage for API Keys", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  test("renders the underlying Loading component with correct isFormbricksCloud prop", () => {
+    render(<LoadingPage />);
+    const mockedLoadingComponent = screen.getByTestId("mocked-loading-component");
+    expect(mockedLoadingComponent).toBeInTheDocument();
+    // Check if the prop is passed correctly based on the mocked constant value
+    expect(mockedLoadingComponent).toHaveTextContent("isFormbricksCloud: true");
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/api-keys/page.test.tsx

@@ -0,0 +1,21 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import Page from "./page";
+
+// Mock the APIKeysPage component
+vi.mock("@/modules/organization/settings/api-keys/page", () => ({
+  APIKeysPage: () => <div data-testid="mocked-api-keys-page">APIKeysPage Content</div>,
+}));
+
+describe("APIKeys Page", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  test("renders the APIKeysPage component", () => {
+    render(<Page />);
+    const apiKeysPageComponent = screen.getByTestId("mocked-api-keys-page");
+    expect(apiKeysPageComponent).toBeInTheDocument();
+    expect(apiKeysPageComponent).toHaveTextContent("APIKeysPage Content");
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/billing/loading.test.tsx

@@ -0,0 +1,74 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import Loading from "./loading";
+
+// Mock constants
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: true,
+}));
+
+// Mock server-side translation
+vi.mock("@/tolgee/server", () => ({
+  getTranslate: vi.fn(),
+}));
+
+// Mock child components
+vi.mock("@/modules/ui/components/page-content-wrapper", () => ({
+  PageContentWrapper: ({ children }: { children: React.ReactNode }) => (
+    <div data-testid="page-content-wrapper">{children}</div>
+  ),
+}));
+
+vi.mock("@/modules/ui/components/page-header", () => ({
+  PageHeader: ({ pageTitle, children }: { pageTitle: string; children: React.ReactNode }) => (
+    <div data-testid="page-header">
+      <h1>{pageTitle}</h1>
+      {children}
+    </div>
+  ),
+}));
+
+vi.mock(
+  "@/app/(app)/environments/[environmentId]/settings/(organization)/components/OrganizationSettingsNavbar",
+  () => ({
+    OrganizationSettingsNavbar: ({ activeId, loading }: { activeId: string; loading?: boolean }) => (
+      <div data-testid="org-settings-navbar">
+        Active: {activeId}, Loading: {String(loading)}
+      </div>
+    ),
+  })
+);
+
+describe("Billing Loading Page", () => {
+  beforeEach(async () => {
+    const mockTranslate = vi.fn((key) => key);
+    vi.mocked(await import("@/tolgee/server")).getTranslate.mockResolvedValue(mockTranslate);
+  });
+
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  test("renders PageContentWrapper, PageHeader, and OrganizationSettingsNavbar", async () => {
+    render(await Loading());
+
+    expect(screen.getByTestId("page-content-wrapper")).toBeInTheDocument();
+    const pageHeader = screen.getByTestId("page-header");
+    expect(pageHeader).toBeInTheDocument();
+    expect(pageHeader).toHaveTextContent("environments.settings.general.organization_settings");
+
+    const navbar = screen.getByTestId("org-settings-navbar");
+    expect(navbar).toBeInTheDocument();
+    expect(navbar).toHaveTextContent("Active: billing");
+    expect(navbar).toHaveTextContent("Loading: true");
+  });
+
+  test("renders placeholder divs", async () => {
+    render(await Loading());
+    // Check for the presence of divs with animate-pulse, assuming they are the placeholders
+    const placeholders = screen.getAllByRole("generic", { hidden: true }); // Using a generic role as divs don't have implicit roles
+    const animatedPlaceholders = placeholders.filter((el) => el.classList.contains("animate-pulse"));
+    expect(animatedPlaceholders.length).toBeGreaterThanOrEqual(2); // Expecting at least two placeholder divs
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/billing/page.test.tsx

@@ -0,0 +1,21 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import Page from "./page";
+
+// Mock the PricingPage component
+vi.mock("@/modules/ee/billing/page", () => ({
+  PricingPage: () => <div data-testid="mocked-pricing-page">PricingPage Content</div>,
+}));
+
+describe("Billing Page", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  test("renders the PricingPage component", () => {
+    render(<Page />);
+    const pricingPageComponent = screen.getByTestId("mocked-pricing-page");
+    expect(pricingPageComponent).toBeInTheDocument();
+    expect(pricingPageComponent).toHaveTextContent("PricingPage Content");
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/components/OrganizationSettingsNavbar.test.tsx

@@ -0,0 +1,134 @@
+import { getAccessFlags } from "@/lib/membership/utils";
+import { cleanup, render, screen } from "@testing-library/react";
+import { usePathname } from "next/navigation";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TOrganizationRole } from "@formbricks/types/memberships";
+import { OrganizationSettingsNavbar } from "./OrganizationSettingsNavbar";
+
+vi.mock("next/navigation", () => ({
+  usePathname: vi.fn(),
+}));
+
+vi.mock("@/lib/membership/utils", () => ({
+  getAccessFlags: vi.fn(),
+}));
+
+// Mock SecondaryNavigation to inspect its props
+let mockSecondaryNavigationProps: any;
+vi.mock("@/modules/ui/components/secondary-navigation", () => ({
+  SecondaryNavigation: (props: any) => {
+    mockSecondaryNavigationProps = props;
+    return <div data-testid="secondary-navigation">Mocked SecondaryNavigation</div>;
+  },
+}));
+
+describe("OrganizationSettingsNavbar", () => {
+  beforeEach(() => {
+    mockSecondaryNavigationProps = null; // Reset before each test
+  });
+
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  const defaultProps = {
+    environmentId: "env123",
+    isFormbricksCloud: true,
+    membershipRole: "owner" as TOrganizationRole,
+    activeId: "general",
+    loading: false,
+  };
+
+  test.each([
+    {
+      pathname: "/environments/env123/settings/general",
+      role: "owner",
+      isCloud: true,
+      expectedVisibility: { general: true, billing: true, teams: true, enterprise: false, "api-keys": true },
+    },
+    {
+      pathname: "/environments/env123/settings/teams",
+      role: "member",
+      isCloud: false,
+      expectedVisibility: {
+        general: true,
+        billing: false,
+        teams: true,
+        enterprise: false,
+        "api-keys": false,
+      },
+    }, // enterprise hidden if not cloud, api-keys hidden if not owner
+    {
+      pathname: "/environments/env123/settings/api-keys",
+      role: "admin",
+      isCloud: true,
+      expectedVisibility: { general: true, billing: true, teams: true, enterprise: false, "api-keys": false },
+    }, // api-keys hidden if not owner
+    {
+      pathname: "/environments/env123/settings/enterprise",
+      role: "owner",
+      isCloud: false,
+      expectedVisibility: { general: true, billing: false, teams: true, enterprise: true, "api-keys": true },
+    }, // enterprise shown if not cloud and not member
+  ])(
+    "renders correct navigation items based on props and path ($pathname, $role, $isCloud)",
+    ({ pathname, role, isCloud, expectedVisibility }) => {
+      vi.mocked(usePathname).mockReturnValue(pathname);
+      vi.mocked(getAccessFlags).mockReturnValue({
+        isOwner: role === "owner",
+        isMember: role === "member",
+      } as any);
+
+      render(
+        <OrganizationSettingsNavbar
+          {...defaultProps}
+          membershipRole={role as TOrganizationRole}
+          isFormbricksCloud={isCloud}
+        />
+      );
+
+      expect(screen.getByTestId("secondary-navigation")).toBeInTheDocument();
+      expect(mockSecondaryNavigationProps).not.toBeNull();
+
+      const visibleNavItems = mockSecondaryNavigationProps.navigation.filter((item: any) => !item.hidden);
+      const visibleIds = visibleNavItems.map((item: any) => item.id);
+
+      Object.entries(expectedVisibility).forEach(([id, shouldBeVisible]) => {
+        if (shouldBeVisible) {
+          expect(visibleIds).toContain(id);
+        } else {
+          expect(visibleIds).not.toContain(id);
+        }
+      });
+
+      // Check current status
+      mockSecondaryNavigationProps.navigation.forEach((item: any) => {
+        if (item.href === pathname) {
+          expect(item.current).toBe(true);
+        }
+      });
+    }
+  );
+
+  test("passes loading prop to SecondaryNavigation", () => {
+    vi.mocked(usePathname).mockReturnValue("/environments/env123/settings/general");
+    vi.mocked(getAccessFlags).mockReturnValue({
+      isOwner: true,
+      isMember: false,
+    } as any);
+    render(<OrganizationSettingsNavbar {...defaultProps} loading={true} />);
+    expect(mockSecondaryNavigationProps.loading).toBe(true);
+  });
+
+  test("hides billing when loading is true", () => {
+    vi.mocked(usePathname).mockReturnValue("/environments/env123/settings/general");
+    vi.mocked(getAccessFlags).mockReturnValue({
+      isOwner: true,
+      isMember: false,
+    } as any);
+    render(<OrganizationSettingsNavbar {...defaultProps} isFormbricksCloud={true} loading={true} />);
+    const billingItem = mockSecondaryNavigationProps.navigation.find((item: any) => item.id === "billing");
+    expect(billingItem.hidden).toBe(true);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/enterprise/loading.test.tsx

@@ -0,0 +1,68 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import Loading from "./loading";
+
+// Mock constants
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: false, // Enterprise page is typically for self-hosted
+}));
+
+// Mock server-side translation
+vi.mock("@/tolgee/server", () => ({
+  getTranslate: async () => (key: string) => key,
+}));
+
+// Mock child components
+vi.mock("@/modules/ui/components/page-content-wrapper", () => ({
+  PageContentWrapper: ({ children }: { children: React.ReactNode }) => (
+    <div data-testid="page-content-wrapper">{children}</div>
+  ),
+}));
+
+vi.mock("@/modules/ui/components/page-header", () => ({
+  PageHeader: ({ pageTitle, children }: { pageTitle: string; children: React.ReactNode }) => (
+    <div data-testid="page-header">
+      <h1>{pageTitle}</h1>
+      {children}
+    </div>
+  ),
+}));
+
+vi.mock(
+  "@/app/(app)/environments/[environmentId]/settings/(organization)/components/OrganizationSettingsNavbar",
+  () => ({
+    OrganizationSettingsNavbar: ({ activeId, loading }: { activeId: string; loading?: boolean }) => (
+      <div data-testid="org-settings-navbar">
+        Active: {activeId}, Loading: {String(loading)}
+      </div>
+    ),
+  })
+);
+
+describe("Enterprise Loading Page", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  test("renders PageContentWrapper, PageHeader, and OrganizationSettingsNavbar", async () => {
+    render(await Loading());
+
+    expect(screen.getByTestId("page-content-wrapper")).toBeInTheDocument();
+    const pageHeader = screen.getByTestId("page-header");
+    expect(pageHeader).toBeInTheDocument();
+    expect(pageHeader).toHaveTextContent("environments.settings.general.organization_settings");
+
+    const navbar = screen.getByTestId("org-settings-navbar");
+    expect(navbar).toBeInTheDocument();
+    expect(navbar).toHaveTextContent("Active: enterprise");
+    expect(navbar).toHaveTextContent("Loading: true");
+  });
+
+  test("renders placeholder divs", async () => {
+    render(await Loading());
+    const placeholders = screen.getAllByRole("generic", { hidden: true });
+    const animatedPlaceholders = placeholders.filter((el) => el.classList.contains("animate-pulse"));
+    expect(animatedPlaceholders.length).toBeGreaterThanOrEqual(2);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/enterprise/page.test.tsx

@@ -0,0 +1,193 @@
+import { getMembershipByUserIdOrganizationId } from "@/lib/membership/service";
+import { getAccessFlags } from "@/lib/membership/utils";
+import { getOrganizationByEnvironmentId } from "@/lib/organization/service";
+import { getUser } from "@/lib/user/service";
+import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
+import { cleanup, render, screen } from "@testing-library/react";
+import { getServerSession } from "next-auth";
+import { redirect } from "next/navigation";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TMembership } from "@formbricks/types/memberships";
+import { TOrganization, TOrganizationBilling } from "@formbricks/types/organizations";
+import { TUser } from "@formbricks/types/user";
+import EnterpriseSettingsPage from "./page";
+
+vi.mock("@formbricks/database", () => ({
+  prisma: {
+    membership: {
+      findMany: vi.fn(),
+    },
+    environment: {
+      findUnique: vi.fn(),
+    },
+    project: {
+      findFirst: vi.fn(),
+    },
+  },
+}));
+
+vi.mock("next-auth", () => ({
+  getServerSession: vi.fn(),
+}));
+
+vi.mock("next/navigation", () => ({
+  redirect: vi.fn(),
+  usePathname: vi.fn(),
+  notFound: vi.fn(),
+}));
+
+vi.mock("@/lib/organization/service", () => ({
+  getOrganizationByEnvironmentId: vi.fn(),
+}));
+
+vi.mock("@/lib/user/service", () => ({
+  getUser: vi.fn(),
+}));
+
+vi.mock("@/lib/membership/service", () => ({
+  getMembershipByUserIdOrganizationId: vi.fn(),
+}));
+
+vi.mock("@/lib/membership/utils", () => ({
+  getAccessFlags: vi.fn(),
+}));
+
+vi.mock("@/modules/environments/lib/utils", () => ({
+  getEnvironmentAuth: vi.fn(),
+}));
+
+vi.mock("@/modules/ui/components/page-content-wrapper", () => ({
+  PageContentWrapper: ({ children }: { children: React.ReactNode }) => (
+    <div data-testid="page-content-wrapper">{children}</div>
+  ),
+}));
+
+vi.mock("@/modules/ui/components/page-header", () => ({
+  PageHeader: ({ children }: { children: React.ReactNode }) => (
+    <div data-testid="page-header">{children}</div>
+  ),
+}));
+
+vi.mock("@/modules/ui/components/settings-card", () => ({
+  SettingsCard: ({ title, description, children }: any) => (
+    <div data-testid={`settings-card-${title?.split(".")[0]}`}>
+      <h2>{title}</h2>
+      <p>{description}</p>
+      {children}
+    </div>
+  ),
+}));
+
+vi.mock("@/tolgee/server", () => ({
+  getTranslate: async () => (key: string) => key,
+}));
+
+let mockIsFormbricksCloud = false;
+vi.mock("@/lib/constants", async () => ({
+  get IS_FORMBRICKS_CLOUD() {
+    return mockIsFormbricksCloud;
+  },
+  IS_PRODUCTION: false,
+  FB_LOGO_URL: "https://example.com/mock-logo.png",
+  ENCRYPTION_KEY: "mock-encryption-key",
+  ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "mock-github-secret",
+  GOOGLE_CLIENT_ID: "mock-google-client-id",
+  GOOGLE_CLIENT_SECRET: "mock-google-client-secret",
+  AZUREAD_CLIENT_ID: "mock-azuread-client-id",
+  AZUREAD_CLIENT_SECRET: "mock-azure-client-secret",
+  AZUREAD_TENANT_ID: "mock-azuread-tenant-id",
+  OIDC_CLIENT_ID: "mock-oidc-client-id",
+  OIDC_CLIENT_SECRET: "mock-oidc-client-secret",
+  OIDC_ISSUER: "mock-oidc-issuer",
+  OIDC_DISPLAY_NAME: "mock-oidc-display-name",
+  OIDC_SIGNING_ALGORITHM: "mock-oidc-signing-algorithm",
+  SAML_DATABASE_URL: "mock-saml-database-url",
+  WEBAPP_URL: "mock-webapp-url",
+  SMTP_HOST: "mock-smtp-host",
+  SMTP_PORT: "mock-smtp-port",
+  E2E_TESTING: "mock-e2e-testing",
+}));
+
+const mockEnvironmentId = "c6x2k3vq00000e5twdfh8x9xg";
+const mockOrganizationId = "test-org-id";
+const mockUserId = "test-user-id";
+
+const mockSession = {
+  user: {
+    id: mockUserId,
+  },
+};
+
+const mockUser = {
+  id: mockUserId,
+  name: "Test User",
+  email: "test@example.com",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  emailVerified: new Date(),
+  imageUrl: "",
+  twoFactorEnabled: false,
+  identityProvider: "email",
+  notificationSettings: { alert: {}, weeklySummary: {} },
+  role: "project_manager",
+  objective: "other",
+} as unknown as TUser;
+
+const mockOrganization = {
+  id: mockOrganizationId,
+  name: "Test Organization",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  billing: {
+    stripeCustomerId: null,
+    plan: "free",
+    limits: { monthly: { responses: null, miu: null }, projects: null },
+    features: {
+      isUsageBasedSubscriptionEnabled: false,
+      isSubscriptionUpdateDisabled: false,
+    },
+  } as unknown as TOrganizationBilling,
+} as unknown as TOrganization;
+
+const mockMembership: TMembership = {
+  organizationId: mockOrganizationId,
+  userId: mockUserId,
+  accepted: true,
+  role: "owner",
+};
+
+describe("EnterpriseSettingsPage", () => {
+  beforeEach(() => {
+    vi.resetAllMocks();
+    mockIsFormbricksCloud = false;
+    vi.mocked(getEnvironmentAuth).mockResolvedValue({
+      environmentId: mockEnvironmentId,
+      organizationId: mockOrganizationId,
+      userId: mockUserId,
+    } as any);
+    vi.mocked(getServerSession).mockResolvedValue(mockSession as any);
+    vi.mocked(getUser).mockResolvedValue(mockUser);
+    vi.mocked(getOrganizationByEnvironmentId).mockResolvedValue(mockOrganization);
+    vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValue(mockMembership);
+    vi.mocked(getAccessFlags).mockReturnValue({ isOwner: true, isAdmin: true } as any); // Ensure isAdmin is also covered if relevant
+  });
+
+  afterEach(() => {
+    cleanup();
+  });
+
+  test("renders correctly for an owner when not on Formbricks Cloud", async () => {
+    const Page = await EnterpriseSettingsPage({ params: { environmentId: mockEnvironmentId } });
+    render(Page);
+
+    expect(screen.getByTestId("page-content-wrapper")).toBeInTheDocument();
+    expect(screen.getByTestId("page-header")).toBeInTheDocument();
+
+    expect(screen.getByText("environments.settings.enterprise.sso")).toBeInTheDocument();
+    expect(screen.getByText("environments.settings.billing.remove_branding")).toBeInTheDocument();
+
+    expect(redirect).not.toHaveBeenCalled();
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/general/components/DeleteOrganization.test.tsx

@@ -0,0 +1,192 @@
+import { deleteOrganizationAction } from "@/app/(app)/environments/[environmentId]/settings/(organization)/general/actions";
+import { FORMBRICKS_ENVIRONMENT_ID_LS } from "@/lib/localStorage";
+import { cleanup, render, screen, waitFor, within } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { useRouter } from "next/navigation";
+import toast from "react-hot-toast";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TOrganization, TOrganizationBilling } from "@formbricks/types/organizations";
+import { DeleteOrganization } from "./DeleteOrganization";
+
+vi.mock("next/navigation", () => ({
+  useRouter: vi.fn(),
+}));
+
+vi.mock("@/tolgee/server", () => ({
+  getTranslate: async () => (key: string) => key,
+}));
+
+vi.mock("@/app/(app)/environments/[environmentId]/settings/(organization)/general/actions", () => ({
+  deleteOrganizationAction: vi.fn(),
+}));
+
+const mockT = (key: string, params?: any) => {
+  if (params && typeof params === "object") {
+    let translation = key;
+    for (const p in params) {
+      translation = translation.replace(`{{${p}}}`, params[p]);
+    }
+    return translation;
+  }
+  return key;
+};
+
+const organizationMock = {
+  id: "org_123",
+  name: "Test Organization",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  billing: {
+    stripeCustomerId: null,
+    plan: "free",
+  } as unknown as TOrganizationBilling,
+} as unknown as TOrganization;
+
+const mockRouterPush = vi.fn();
+
+const renderComponent = (props: Partial<Parameters<typeof DeleteOrganization>[0]> = {}) => {
+  const defaultProps = {
+    organization: organizationMock,
+    isDeleteDisabled: false,
+    isUserOwner: true,
+    ...props,
+  };
+  return render(<DeleteOrganization {...defaultProps} />);
+};
+
+describe("DeleteOrganization", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.mocked(useRouter).mockReturnValue({ push: mockRouterPush } as any);
+    localStorage.clear();
+  });
+
+  afterEach(() => {
+    cleanup();
+  });
+
+  test("renders delete button and info text when delete is not disabled", () => {
+    renderComponent();
+    expect(screen.getByText("environments.settings.general.once_its_gone_its_gone")).toBeInTheDocument();
+    const deleteButton = screen.getByRole("button", { name: "common.delete" });
+    expect(deleteButton).toBeInTheDocument();
+    expect(deleteButton).not.toBeDisabled();
+  });
+
+  test("renders warning and no delete button when delete is disabled and user is owner", () => {
+    renderComponent({ isDeleteDisabled: true, isUserOwner: true });
+    expect(
+      screen.getByText("environments.settings.general.cannot_delete_only_organization")
+    ).toBeInTheDocument();
+    expect(screen.queryByRole("button", { name: "common.delete" })).not.toBeInTheDocument();
+  });
+
+  test("renders warning and no delete button when delete is disabled and user is not owner", () => {
+    renderComponent({ isDeleteDisabled: true, isUserOwner: false });
+    expect(
+      screen.getByText("environments.settings.general.only_org_owner_can_perform_action")
+    ).toBeInTheDocument();
+    expect(screen.queryByRole("button", { name: "common.delete" })).not.toBeInTheDocument();
+  });
+
+  test("opens delete dialog on button click", async () => {
+    renderComponent();
+    const deleteButton = screen.getByRole("button", { name: "common.delete" });
+    await userEvent.click(deleteButton);
+    expect(screen.getByText("environments.settings.general.delete_organization_warning")).toBeInTheDocument();
+    expect(
+      screen.getByText(
+        mockT("environments.settings.general.delete_organization_warning_3", {
+          organizationName: organizationMock.name,
+        })
+      )
+    ).toBeInTheDocument();
+  });
+
+  test("delete button in modal is disabled until correct organization name is typed", async () => {
+    renderComponent();
+    const deleteButton = screen.getByRole("button", { name: "common.delete" });
+    await userEvent.click(deleteButton);
+
+    const dialog = screen.getByRole("dialog");
+    const modalDeleteButton = within(dialog).getByRole("button", { name: "common.delete" });
+    expect(modalDeleteButton).toBeDisabled();
+
+    const inputField = screen.getByPlaceholderText(organizationMock.name);
+    await userEvent.type(inputField, organizationMock.name);
+    expect(modalDeleteButton).not.toBeDisabled();
+
+    await userEvent.clear(inputField);
+    await userEvent.type(inputField, "Wrong Name");
+    expect(modalDeleteButton).toBeDisabled();
+  });
+
+  test("calls deleteOrganizationAction on confirm, shows success, clears localStorage, and navigates", async () => {
+    vi.mocked(deleteOrganizationAction).mockResolvedValue({} as any);
+    localStorage.setItem(FORMBRICKS_ENVIRONMENT_ID_LS, "some-env-id");
+    renderComponent();
+
+    const deleteButton = screen.getByRole("button", { name: "common.delete" });
+    await userEvent.click(deleteButton);
+
+    const inputField = screen.getByPlaceholderText(organizationMock.name);
+    await userEvent.type(inputField, organizationMock.name);
+
+    const dialog = screen.getByRole("dialog");
+    const modalDeleteButton = within(dialog).getByRole("button", { name: "common.delete" });
+    await userEvent.click(modalDeleteButton);
+
+    await waitFor(() => {
+      expect(deleteOrganizationAction).toHaveBeenCalledWith({ organizationId: organizationMock.id });
+      expect(toast.success).toHaveBeenCalledWith(
+        "environments.settings.general.organization_deleted_successfully"
+      );
+      expect(localStorage.getItem(FORMBRICKS_ENVIRONMENT_ID_LS)).toBeNull();
+      expect(mockRouterPush).toHaveBeenCalledWith("/");
+      expect(
+        screen.queryByText("environments.settings.general.delete_organization_warning")
+      ).not.toBeInTheDocument(); // Modal should close
+    });
+  });
+
+  test("shows error toast on deleteOrganizationAction failure", async () => {
+    vi.mocked(deleteOrganizationAction).mockRejectedValue(new Error("Deletion failed"));
+    renderComponent();
+
+    const deleteButton = screen.getByRole("button", { name: "common.delete" });
+    await userEvent.click(deleteButton);
+
+    const inputField = screen.getByPlaceholderText(organizationMock.name);
+    await userEvent.type(inputField, organizationMock.name);
+
+    const dialog = screen.getByRole("dialog");
+    const modalDeleteButton = within(dialog).getByRole("button", { name: "common.delete" });
+    await userEvent.click(modalDeleteButton);
+
+    await waitFor(() => {
+      expect(deleteOrganizationAction).toHaveBeenCalledWith({ organizationId: organizationMock.id });
+      expect(toast.error).toHaveBeenCalledWith(
+        "environments.settings.general.error_deleting_organization_please_try_again"
+      );
+      expect(
+        screen.queryByText("environments.settings.general.delete_organization_warning")
+      ).not.toBeInTheDocument(); // Modal should close
+    });
+  });
+
+  test("closes modal on cancel click", async () => {
+    renderComponent();
+    const deleteButton = screen.getByRole("button", { name: "common.delete" });
+    await userEvent.click(deleteButton);
+
+    expect(screen.getByText("environments.settings.general.delete_organization_warning")).toBeInTheDocument();
+    const cancelButton = screen.getByRole("button", { name: "common.cancel" });
+    await userEvent.click(cancelButton);
+
+    await waitFor(() => {
+      expect(
+        screen.queryByText("environments.settings.general.delete_organization_warning")
+      ).not.toBeInTheDocument();
+    });
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/general/components/EditOrganizationNameForm.test.tsx

@@ -0,0 +1,149 @@
+import { updateOrganizationNameAction } from "@/app/(app)/environments/[environmentId]/settings/(organization)/general/actions";
+import { cleanup, render, screen, waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import toast from "react-hot-toast";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TOrganization } from "@formbricks/types/organizations";
+import { EditOrganizationNameForm } from "./EditOrganizationNameForm";
+
+vi.mock("@/app/(app)/environments/[environmentId]/settings/(organization)/general/actions", () => ({
+  updateOrganizationNameAction: vi.fn(),
+}));
+
+vi.mock("@/tolgee/server", () => ({
+  getTranslate: async () => (key: string) => key,
+}));
+
+const organizationMock = {
+  id: "org_123",
+  name: "Old Organization Name",
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  billing: {
+    stripeCustomerId: null,
+    plan: "free",
+  } as unknown as TOrganization["billing"],
+} as unknown as TOrganization;
+
+const renderForm = (membershipRole: "owner" | "member") => {
+  return render(
+    <EditOrganizationNameForm
+      environmentId="env_123"
+      organization={organizationMock}
+      membershipRole={membershipRole}
+    />
+  );
+};
+
+describe("EditOrganizationNameForm", () => {
+  afterEach(() => {
+    cleanup();
+    vi.clearAllMocks();
+  });
+
+  beforeEach(() => {
+    vi.mocked(updateOrganizationNameAction).mockReset();
+  });
+
+  test("renders with initial organization name and allows owner to update", async () => {
+    renderForm("owner");
+
+    const nameInput = screen.getByPlaceholderText(
+      "environments.settings.general.organization_name_placeholder"
+    );
+    expect(nameInput).toHaveValue(organizationMock.name);
+    expect(nameInput).not.toBeDisabled();
+
+    const updateButton = screen.getByText("common.update");
+    expect(updateButton).toBeDisabled(); // Initially disabled as form is not dirty
+
+    await userEvent.clear(nameInput);
+    await userEvent.type(nameInput, "New Organization Name");
+    expect(updateButton).not.toBeDisabled(); // Enabled after change
+
+    vi.mocked(updateOrganizationNameAction).mockResolvedValueOnce({
+      data: { ...organizationMock, name: "New Organization Name" },
+    });
+
+    await userEvent.click(updateButton);
+
+    await waitFor(() => {
+      expect(updateOrganizationNameAction).toHaveBeenCalledWith({
+        organizationId: organizationMock.id,
+        data: { name: "New Organization Name" },
+      });
+      expect(
+        screen.getByPlaceholderText("environments.settings.general.organization_name_placeholder")
+      ).toHaveValue("New Organization Name");
+      expect(toast.success).toHaveBeenCalledWith(
+        "environments.settings.general.organization_name_updated_successfully"
+      );
+    });
+    expect(updateButton).toBeDisabled(); // Disabled after successful submit and reset
+  });
+
+  test("shows error toast on update failure", async () => {
+    renderForm("owner");
+
+    const nameInput = screen.getByPlaceholderText(
+      "environments.settings.general.organization_name_placeholder"
+    );
+    await userEvent.clear(nameInput);
+    await userEvent.type(nameInput, "Another Name");
+
+    const updateButton = screen.getByText("common.update");
+
+    vi.mocked(updateOrganizationNameAction).mockResolvedValueOnce({
+      data: null as any,
+    });
+
+    await userEvent.click(updateButton);
+
+    await waitFor(() => {
+      expect(updateOrganizationNameAction).toHaveBeenCalled();
+      expect(toast.error).toHaveBeenCalledWith("");
+    });
+    expect(nameInput).toHaveValue("Another Name"); // Name should not reset on error
+  });
+
+  test("shows generic error toast on exception during update", async () => {
+    renderForm("owner");
+
+    const nameInput = screen.getByPlaceholderText(
+      "environments.settings.general.organization_name_placeholder"
+    );
+    await userEvent.clear(nameInput);
+    await userEvent.type(nameInput, "Exception Name");
+
+    const updateButton = screen.getByText("common.update");
+
+    vi.mocked(updateOrganizationNameAction).mockRejectedValueOnce(new Error("Network error"));
+
+    await userEvent.click(updateButton);
+
+    await waitFor(() => {
+      expect(updateOrganizationNameAction).toHaveBeenCalled();
+      expect(toast.error).toHaveBeenCalledWith("Error: Network error");
+    });
+  });
+
+  test("disables input and button for non-owner roles and shows warning", async () => {
+    const roles: "member"[] = ["member"];
+    for (const role of roles) {
+      renderForm(role);
+
+      const nameInput = screen.getByPlaceholderText(
+        "environments.settings.general.organization_name_placeholder"
+      );
+      expect(nameInput).toBeDisabled();
+
+      const updateButton = screen.getByText("common.update");
+      expect(updateButton).toBeDisabled();
+
+      expect(
+        screen.getByText("environments.settings.general.only_org_owner_can_perform_action")
+      ).toBeInTheDocument();
+      cleanup();
+    }
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/general/loading.test.tsx

@@ -0,0 +1,67 @@
+import { OrganizationSettingsNavbar } from "@/app/(app)/environments/[environmentId]/settings/(organization)/components/OrganizationSettingsNavbar";
+import { IS_FORMBRICKS_CLOUD } from "@/lib/constants";
+import { getTranslate } from "@/tolgee/server";
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import Loading from "./loading";
+
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: false,
+}));
+
+vi.mock("@/tolgee/server", () => ({
+  getTranslate: vi.fn(),
+}));
+
+vi.mock(
+  "@/app/(app)/environments/[environmentId]/settings/(organization)/components/OrganizationSettingsNavbar",
+  () => ({
+    OrganizationSettingsNavbar: vi.fn(() => <div>OrganizationSettingsNavbar</div>),
+  })
+);
+
+vi.mock("@/app/(app)/components/LoadingCard", () => ({
+  LoadingCard: vi.fn(({ title, description }) => (
+    <div>
+      <div>{title}</div>
+      <div>{description}</div>
+    </div>
+  )),
+}));
+
+describe("Loading", () => {
+  const mockTranslate = vi.fn((key) => key);
+
+  afterEach(() => {
+    cleanup();
+  });
+
+  beforeEach(() => {
+    vi.resetAllMocks();
+    vi.mocked(getTranslate).mockResolvedValue(mockTranslate);
+  });
+
+  test("renders loading state correctly", async () => {
+    const LoadingComponent = await Loading();
+    render(LoadingComponent);
+
+    expect(screen.getByText("environments.settings.general.organization_settings")).toBeInTheDocument();
+    expect(OrganizationSettingsNavbar).toHaveBeenCalledWith(
+      {
+        isFormbricksCloud: IS_FORMBRICKS_CLOUD,
+        activeId: "general",
+        loading: true,
+      },
+      undefined
+    );
+
+    expect(screen.getByText("environments.settings.general.organization_name")).toBeInTheDocument();
+    expect(
+      screen.getByText("environments.settings.general.organization_name_description")
+    ).toBeInTheDocument();
+    expect(screen.getByText("environments.settings.general.delete_organization")).toBeInTheDocument();
+    expect(
+      screen.getByText("environments.settings.general.delete_organization_description")
+    ).toBeInTheDocument();
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/general/page.test.tsx

@@ -1,10 +1,17 @@
+import { OrganizationSettingsNavbar } from "@/app/(app)/environments/[environmentId]/settings/(organization)/components/OrganizationSettingsNavbar";
+import { FB_LOGO_URL, IS_FORMBRICKS_CLOUD } from "@/lib/constants";
 import { getUser } from "@/lib/user/service";
 import { getIsMultiOrgEnabled, getWhiteLabelPermission } from "@/modules/ee/license-check/lib/utils";
+import { EmailCustomizationSettings } from "@/modules/ee/whitelabel/email-customization/components/email-customization-settings";
 import { getEnvironmentAuth } from "@/modules/environments/lib/utils";
 import { TEnvironmentAuth } from "@/modules/environments/types/environment-auth";
+import { SettingsId } from "@/modules/ui/components/settings-id";
 import { getTranslate } from "@/tolgee/server";
-import { beforeEach, describe, expect, test, vi } from "vitest";
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
 import { TUser } from "@formbricks/types/user";
+import { DeleteOrganization } from "./components/DeleteOrganization";
+import { EditOrganizationNameForm } from "./components/EditOrganizationNameForm";
 import Page from "./page";
 
 vi.mock("@/lib/constants", () => ({
@@ -52,7 +59,34 @@ vi.mock("@/modules/ee/license-check/lib/utils", () => ({
   getWhiteLabelPermission: vi.fn(),
 }));
 
+vi.mock(
+  "@/app/(app)/environments/[environmentId]/settings/(organization)/components/OrganizationSettingsNavbar",
+  () => ({
+    OrganizationSettingsNavbar: vi.fn(() => <div>OrganizationSettingsNavbar</div>),
+  })
+);
+
+vi.mock("./components/EditOrganizationNameForm", () => ({
+  EditOrganizationNameForm: vi.fn(() => <div>EditOrganizationNameForm</div>),
+}));
+
+vi.mock("@/modules/ee/whitelabel/email-customization/components/email-customization-settings", () => ({
+  EmailCustomizationSettings: vi.fn(() => <div>EmailCustomizationSettings</div>),
+}));
+
+vi.mock("./components/DeleteOrganization", () => ({
+  DeleteOrganization: vi.fn(() => <div>DeleteOrganization</div>),
+}));
+
+vi.mock("@/modules/ui/components/settings-id", () => ({
+  SettingsId: vi.fn(() => <div>SettingsId</div>),
+}));
+
 describe("Page", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
   let mockEnvironmentAuth = {
     session: { user: { id: "test-user-id" } },
     currentUserMembership: { role: "owner" },
@@ -63,8 +97,10 @@ describe("Page", () => {
 
   const mockUser = { id: "test-user-id" } as TUser;
   const mockTranslate = vi.fn((key) => key);
+  const mockParams = { environmentId: "env-123" };
 
   beforeEach(() => {
+    vi.resetAllMocks();
     vi.mocked(getTranslate).mockResolvedValue(mockTranslate);
     vi.mocked(getUser).mockResolvedValue(mockUser);
     vi.mocked(getEnvironmentAuth).mockResolvedValue(mockEnvironmentAuth);
@@ -72,28 +108,163 @@ describe("Page", () => {
     vi.mocked(getWhiteLabelPermission).mockResolvedValue(true);
   });
 
-  test("renders the page with organization settings", async () => {
+  test("renders the page with organization settings for owner", async () => {
     const props = {
-      params: Promise.resolve({ environmentId: "env-123" }),
+      params: Promise.resolve(mockParams),
     };
 
-    const result = await Page(props);
+    const PageComponent = await Page(props);
+    render(PageComponent);
 
-    expect(result).toBeTruthy();
+    expect(screen.getByText("environments.settings.general.organization_settings")).toBeInTheDocument();
+    expect(OrganizationSettingsNavbar).toHaveBeenCalledWith(
+      {
+        environmentId: mockParams.environmentId,
+        isFormbricksCloud: IS_FORMBRICKS_CLOUD,
+        membershipRole: "owner",
+        activeId: "general",
+      },
+      undefined
+    );
+    expect(screen.getByText("environments.settings.general.organization_name")).toBeInTheDocument();
+    expect(EditOrganizationNameForm).toHaveBeenCalledWith(
+      {
+        organization: mockEnvironmentAuth.organization,
+        environmentId: mockParams.environmentId,
+        membershipRole: "owner",
+      },
+      undefined
+    );
+    expect(EmailCustomizationSettings).toHaveBeenCalledWith(
+      {
+        organization: mockEnvironmentAuth.organization,
+        hasWhiteLabelPermission: true,
+        environmentId: mockParams.environmentId,
+        isReadOnly: false,
+        isFormbricksCloud: IS_FORMBRICKS_CLOUD,
+        fbLogoUrl: FB_LOGO_URL,
+        user: mockUser,
+      },
+      undefined
+    );
+    expect(screen.getByText("environments.settings.general.delete_organization")).toBeInTheDocument();
+    expect(DeleteOrganization).toHaveBeenCalledWith(
+      {
+        organization: mockEnvironmentAuth.organization,
+        isDeleteDisabled: false,
+        isUserOwner: true,
+      },
+      undefined
+    );
+    expect(SettingsId).toHaveBeenCalledWith(
+      {
+        title: "common.organization_id",
+        id: mockEnvironmentAuth.organization.id,
+      },
+      undefined
+    );
   });
 
-  test("renders if session user id empty", async () => {
-    mockEnvironmentAuth.session.user.id = "";
-
-    vi.mocked(getEnvironmentAuth).mockResolvedValue(mockEnvironmentAuth);
+  test("renders correctly when user is manager", async () => {
+    const managerAuth = {
+      ...mockEnvironmentAuth,
+      currentUserMembership: { role: "manager" },
+      isOwner: false,
+      isManager: true,
+    } as unknown as TEnvironmentAuth;
+    vi.mocked(getEnvironmentAuth).mockResolvedValue(managerAuth);
 
     const props = {
-      params: Promise.resolve({ environmentId: "env-123" }),
+      params: Promise.resolve(mockParams),
+    };
+    const PageComponent = await Page(props);
+    render(PageComponent);
+
+    expect(EmailCustomizationSettings).toHaveBeenCalledWith(
+      expect.objectContaining({
+        isReadOnly: false, // owner or manager can edit
+      }),
+      undefined
+    );
+    expect(DeleteOrganization).toHaveBeenCalledWith(
+      expect.objectContaining({
+        isDeleteDisabled: true, // only owner can delete
+        isUserOwner: false,
+      }),
+      undefined
+    );
+  });
+
+  test("renders correctly when multi-org is disabled", async () => {
+    vi.mocked(getIsMultiOrgEnabled).mockResolvedValue(false);
+    const props = {
+      params: Promise.resolve(mockParams),
+    };
+    const PageComponent = await Page(props);
+    render(PageComponent);
+
+    expect(screen.queryByText("environments.settings.general.delete_organization")).not.toBeInTheDocument();
+    expect(DeleteOrganization).not.toHaveBeenCalled();
+    // isDeleteDisabled should be true because multiOrg is disabled, even for owner
+    expect(EmailCustomizationSettings).toHaveBeenCalledWith(
+      expect.objectContaining({
+        isReadOnly: false,
+      }),
+      undefined
+    );
+  });
+
+  test("renders correctly when user is not owner or manager (e.g., admin)", async () => {
+    const adminAuth = {
+      ...mockEnvironmentAuth,
+      currentUserMembership: { role: "admin" },
+      isOwner: false,
+      isManager: false,
+    } as unknown as TEnvironmentAuth;
+    vi.mocked(getEnvironmentAuth).mockResolvedValue(adminAuth);
+
+    const props = {
+      params: Promise.resolve(mockParams),
+    };
+    const PageComponent = await Page(props);
+    render(PageComponent);
+
+    expect(EmailCustomizationSettings).toHaveBeenCalledWith(
+      expect.objectContaining({
+        isReadOnly: true,
+      }),
+      undefined
+    );
+    expect(DeleteOrganization).toHaveBeenCalledWith(
+      expect.objectContaining({
+        isDeleteDisabled: true,
+        isUserOwner: false,
+      }),
+      undefined
+    );
+  });
+
+  test("renders if session user id empty, user is null", async () => {
+    const noUserSessionAuth = {
+      ...mockEnvironmentAuth,
+      session: { ...mockEnvironmentAuth.session, user: { ...mockEnvironmentAuth.session.user, id: "" } },
+    };
+    vi.mocked(getEnvironmentAuth).mockResolvedValue(noUserSessionAuth);
+    vi.mocked(getUser).mockResolvedValue(null);
+
+    const props = {
+      params: Promise.resolve(mockParams),
     };
 
-    const result = await Page(props);
-
-    expect(result).toBeTruthy();
+    const PageComponent = await Page(props);
+    render(PageComponent);
+    expect(screen.getByText("environments.settings.general.organization_settings")).toBeInTheDocument();
+    expect(EmailCustomizationSettings).toHaveBeenCalledWith(
+      expect.objectContaining({
+        user: null,
+      }),
+      undefined
+    );
   });
 
   test("handles getEnvironmentAuth error", async () => {

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/layout.test.tsx

@@ -0,0 +1,98 @@
+import { getOrganizationByEnvironmentId } from "@/lib/organization/service";
+import { getProjectByEnvironmentId } from "@/lib/project/service";
+import { cleanup, render, screen } from "@testing-library/react";
+import { Session, getServerSession } from "next-auth";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { TOrganization } from "@formbricks/types/organizations";
+import { TProject } from "@formbricks/types/project";
+import OrganizationSettingsLayout from "./layout";
+
+// Mock dependencies
+vi.mock("@/lib/organization/service");
+vi.mock("@/lib/project/service");
+vi.mock("next-auth", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("next-auth")>();
+  return {
+    ...actual,
+    getServerSession: vi.fn(),
+  };
+});
+vi.mock("@/modules/auth/lib/authOptions", () => ({
+  authOptions: {}, // Mock authOptions if it's directly used or causes issues
+}));
+
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: false,
+  POSTHOG_API_KEY: "mock-posthog-api-key",
+  POSTHOG_HOST: "mock-posthog-host",
+  IS_POSTHOG_CONFIGURED: true,
+  ENCRYPTION_KEY: "mock-encryption-key",
+  ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "test-githubID",
+  GOOGLE_CLIENT_ID: "test-google-client-id",
+  GOOGLE_CLIENT_SECRET: "test-google-client-secret",
+  AZUREAD_CLIENT_ID: "test-azuread-client-id",
+  AZUREAD_CLIENT_SECRET: "test-azure",
+  AZUREAD_TENANT_ID: "test-azuread-tenant-id",
+  OIDC_DISPLAY_NAME: "test-oidc-display-name",
+  OIDC_CLIENT_ID: "test-oidc-client-id",
+  OIDC_ISSUER: "test-oidc-issuer",
+  OIDC_CLIENT_SECRET: "test-oidc-client-secret",
+  OIDC_SIGNING_ALGORITHM: "test-oidc-signing-algorithm",
+  WEBAPP_URL: "test-webapp-url",
+  IS_PRODUCTION: false,
+  SENTRY_DSN: "mock-sentry-dsn",
+}));
+
+const mockGetOrganizationByEnvironmentId = vi.mocked(getOrganizationByEnvironmentId);
+const mockGetProjectByEnvironmentId = vi.mocked(getProjectByEnvironmentId);
+const mockGetServerSession = vi.mocked(getServerSession);
+
+const mockOrganization = { id: "org_test_id" } as unknown as TOrganization;
+const mockProject = { id: "project_test_id" } as unknown as TProject;
+const mockSession = { user: { id: "user_test_id" } } as unknown as Session;
+
+const t = (key: string) => key;
+vi.mock("@/tolgee/server", () => ({
+  getTranslate: async () => t,
+}));
+
+const mockProps = {
+  params: { environmentId: "env_test_id" },
+  children: <div>Child Content for Organization Settings</div>,
+};
+
+describe("OrganizationSettingsLayout", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  beforeEach(() => {
+    vi.resetAllMocks();
+
+    mockGetOrganizationByEnvironmentId.mockResolvedValue(mockOrganization);
+    mockGetProjectByEnvironmentId.mockResolvedValue(mockProject);
+    mockGetServerSession.mockResolvedValue(mockSession);
+  });
+
+  test("should render children when all data is fetched successfully", async () => {
+    render(await OrganizationSettingsLayout(mockProps));
+    expect(screen.getByText("Child Content for Organization Settings")).toBeInTheDocument();
+  });
+
+  test("should throw error if organization is not found", async () => {
+    mockGetOrganizationByEnvironmentId.mockResolvedValue(null);
+    await expect(OrganizationSettingsLayout(mockProps)).rejects.toThrowError("common.organization_not_found");
+  });
+
+  test("should throw error if project is not found", async () => {
+    mockGetProjectByEnvironmentId.mockResolvedValue(null);
+    await expect(OrganizationSettingsLayout(mockProps)).rejects.toThrowError("common.project_not_found");
+  });
+
+  test("should throw error if session is not found", async () => {
+    mockGetServerSession.mockResolvedValue(null);
+    await expect(OrganizationSettingsLayout(mockProps)).rejects.toThrowError("common.session_not_found");
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/teams/page.test.tsx

@@ -0,0 +1,38 @@
+import { TeamsPage } from "@/modules/organization/settings/teams/page";
+import { describe, expect, test, vi } from "vitest";
+import Page from "./page";
+
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: false,
+  POSTHOG_API_KEY: "mock-posthog-api-key",
+  POSTHOG_HOST: "mock-posthog-host",
+  IS_POSTHOG_CONFIGURED: true,
+  ENCRYPTION_KEY: "mock-encryption-key",
+  ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "test-githubID",
+  GOOGLE_CLIENT_ID: "test-google-client-id",
+  GOOGLE_CLIENT_SECRET: "test-google-client-secret",
+  AZUREAD_CLIENT_ID: "test-azuread-client-id",
+  AZUREAD_CLIENT_SECRET: "test-azure",
+  AZUREAD_TENANT_ID: "test-azuread-tenant-id",
+  OIDC_DISPLAY_NAME: "test-oidc-display-name",
+  OIDC_CLIENT_ID: "test-oidc-client-id",
+  OIDC_ISSUER: "test-oidc-issuer",
+  OIDC_CLIENT_SECRET: "test-oidc-client-secret",
+  OIDC_SIGNING_ALGORITHM: "test-oidc-signing-algorithm",
+  WEBAPP_URL: "test-webapp-url",
+  IS_PRODUCTION: false,
+  SENTRY_DSN: "mock-sentry-dsn",
+  FB_LOGO_URL: "mock-fb-logo-url",
+  SMTP_HOST: "mock-smtp-host",
+  SMTP_PORT: 587,
+  SMTP_USER: "mock-smtp-user",
+  SMTP_PASSWORD: "mock-smtp-password",
+}));
+
+describe("TeamsPage re-export", () => {
+  test("should re-export TeamsPage component", () => {
+    expect(Page).toBe(TeamsPage);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/components/SettingsCard.test.tsx

@@ -0,0 +1,72 @@
+import { SettingsCard } from "@/app/(app)/environments/[environmentId]/settings/components/SettingsCard";
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+
+vi.mock("@/modules/ui/components/badge", () => ({
+  Badge: ({ text }) => <div data-testid="mock-badge">{text}</div>,
+}));
+
+vi.mock("@tolgee/react", () => ({
+  useTranslate: () => ({
+    t: (key) => key, // Mock t function to return the key
+  }),
+}));
+
+describe("SettingsCard", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  const defaultProps = {
+    title: "Test Title",
+    description: "Test Description",
+    children: <div data-testid="child-content">Child Content</div>,
+  };
+
+  test("renders title, description, and children", () => {
+    render(<SettingsCard {...defaultProps} />);
+    expect(screen.getByText(defaultProps.title)).toBeInTheDocument();
+    expect(screen.getByText(defaultProps.description)).toBeInTheDocument();
+    expect(screen.getByTestId("child-content")).toBeInTheDocument();
+  });
+
+  test("renders Beta badge when beta prop is true", () => {
+    render(<SettingsCard {...defaultProps} beta />);
+    const badgeElement = screen.getByTestId("mock-badge");
+    expect(badgeElement).toBeInTheDocument();
+    expect(badgeElement).toHaveTextContent("Beta");
+  });
+
+  test("renders Soon badge when soon prop is true", () => {
+    render(<SettingsCard {...defaultProps} soon />);
+    const badgeElement = screen.getByTestId("mock-badge");
+    expect(badgeElement).toBeInTheDocument();
+    expect(badgeElement).toHaveTextContent("environments.settings.enterprise.coming_soon");
+  });
+
+  test("does not render badges when beta and soon props are false", () => {
+    render(<SettingsCard {...defaultProps} />);
+    expect(screen.queryByTestId("mock-badge")).not.toBeInTheDocument();
+  });
+
+  test("applies default padding when noPadding prop is false", () => {
+    render(<SettingsCard {...defaultProps} />);
+    const childrenContainer = screen.getByTestId("child-content").parentElement;
+    expect(childrenContainer).toHaveClass("px-4 pt-4");
+  });
+
+  test("applies custom className to the root element", () => {
+    const customClass = "my-custom-class";
+    render(<SettingsCard {...defaultProps} className={customClass} />);
+    const cardElement = screen.getByText(defaultProps.title).closest("div.relative");
+    expect(cardElement).toHaveClass(customClass);
+  });
+
+  test("renders with default classes", () => {
+    render(<SettingsCard {...defaultProps} />);
+    const cardElement = screen.getByText(defaultProps.title).closest("div.relative");
+    expect(cardElement).toHaveClass(
+      "relative my-4 w-full max-w-4xl rounded-xl border border-slate-200 bg-white py-4 text-left shadow-sm"
+    );
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/components/SettingsTitle.test.tsx

@@ -0,0 +1,25 @@
+import { SettingsTitle } from "@/app/(app)/environments/[environmentId]/settings/components/SettingsTitle";
+import { cleanup, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, test } from "vitest";
+
+describe("SettingsTitle", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  test("renders the title correctly", () => {
+    const titleText = "My Awesome Settings";
+    render(<SettingsTitle title={titleText} />);
+    const headingElement = screen.getByRole("heading", { name: titleText, level: 2 });
+    expect(headingElement).toBeInTheDocument();
+    expect(headingElement).toHaveTextContent(titleText);
+    expect(headingElement).toHaveClass("my-4 text-2xl font-medium leading-6 text-slate-800");
+  });
+
+  test("renders with an empty title", () => {
+    render(<SettingsTitle title="" />);
+    const headingElement = screen.getByRole("heading", { level: 2 });
+    expect(headingElement).toBeInTheDocument();
+    expect(headingElement).toHaveTextContent("");
+  });
+});

apps/web/app/(app)/environments/[environmentId]/settings/page.test.tsx

@@ -0,0 +1,15 @@
+import { redirect } from "next/navigation";
+import { describe, expect, test, vi } from "vitest";
+import Page from "./page";
+
+vi.mock("next/navigation", () => ({
+  redirect: vi.fn(),
+}));
+
+describe("Settings Page", () => {
+  test("should redirect to profile settings page", async () => {
+    const params = { environmentId: "testEnvId" };
+    await Page({ params });
+    expect(redirect).toHaveBeenCalledWith(`/environments/${params.environmentId}/settings/profile`);
+  });
+});

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/components/EmptyInAppSurveys.test.tsx

@@ -0,0 +1,37 @@
+import { cleanup, render, screen } from "@testing-library/react";
+import { Unplug } from "lucide-react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { TEnvironment } from "@formbricks/types/environment";
+import { EmptyAppSurveys } from "./EmptyInAppSurveys";
+
+vi.mock("lucide-react", async () => {
+  const actual = await vi.importActual("lucide-react");
+  return {
+    ...actual,
+    Unplug: vi.fn(() => <div data-testid="unplug-icon" />),
+  };
+});
+
+const mockEnvironment = {
+  id: "test-env-id",
+} as unknown as TEnvironment;
+
+describe("EmptyAppSurveys", () => {
+  afterEach(() => {
+    cleanup();
+  });
+
+  test("renders correctly with translated text and icon", () => {
+    render(<EmptyAppSurveys environment={mockEnvironment} />);
+
+    expect(screen.getByTestId("unplug-icon")).toBeInTheDocument();
+    expect(Unplug).toHaveBeenCalled();
+
+    expect(screen.getByText("environments.surveys.summary.youre_not_plugged_in_yet")).toBeInTheDocument();
+    expect(
+      screen.getByText(
+        "environments.surveys.summary.connect_your_website_or_app_with_formbricks_to_get_started"
+      )
+    ).toBeInTheDocument();
+  });
+});

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/components/SurveyAnalysisNavigation.test.tsx

@@ -0,0 +1,243 @@
+import { useResponseFilter } from "@/app/(app)/environments/[environmentId]/components/ResponseFilterContext";
+import {
+  getResponseCountAction,
+  revalidateSurveyIdPath,
+} from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/actions";
+import { SurveyAnalysisNavigation } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/components/SurveyAnalysisNavigation";
+import { getFormattedFilters } from "@/app/lib/surveys/surveys";
+import { useIntervalWhenFocused } from "@/lib/utils/hooks/useIntervalWhenFocused";
+import { SecondaryNavigation } from "@/modules/ui/components/secondary-navigation";
+import { act, cleanup, render, waitFor } from "@testing-library/react";
+import { useParams, usePathname, useSearchParams } from "next/navigation";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import { TLanguage } from "@formbricks/types/project";
+import {
+  TSurvey,
+  TSurveyLanguage,
+  TSurveyQuestion,
+  TSurveyQuestionTypeEnum,
+} from "@formbricks/types/surveys/types";
+
+vi.mock("@/lib/constants", () => ({
+  IS_FORMBRICKS_CLOUD: false,
+  POSTHOG_API_KEY: "mock-posthog-api-key",
+  POSTHOG_HOST: "mock-posthog-host",
+  IS_POSTHOG_CONFIGURED: true,
+  ENCRYPTION_KEY: "mock-encryption-key",
+  ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
+  GITHUB_ID: "mock-github-id",
+  GITHUB_SECRET: "test-githubID",
+  GOOGLE_CLIENT_ID: "test-google-client-id",
+  GOOGLE_CLIENT_SECRET: "test-google-client-secret",
+  AZUREAD_CLIENT_ID: "test-azuread-client-id",
+  AZUREAD_CLIENT_SECRET: "test-azure",
+  AZUREAD_TENANT_ID: "test-azuread-tenant-id",
+  OIDC_DISPLAY_NAME: "test-oidc-display-name",
+  OIDC_CLIENT_ID: "test-oidc-client-id",
+  OIDC_ISSUER: "test-oidc-issuer",
+  OIDC_CLIENT_SECRET: "test-oidc-client-secret",
+  OIDC_SIGNING_ALGORITHM: "test-oidc-signing-algorithm",
+  WEBAPP_URL: "test-webapp-url",
+  IS_PRODUCTION: false,
+  SENTRY_DSN: "mock-sentry-dsn",
+  FB_LOGO_URL: "mock-fb-logo-url",
+  SMTP_HOST: "mock-smtp-host",
+  SMTP_PORT: 587,
+  SMTP_USER: "mock-smtp-user",
+  SMTP_PASSWORD: "mock-smtp-password",
+}));
+
+vi.mock("@/app/(app)/environments/[environmentId]/components/ResponseFilterContext");
+vi.mock("@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/actions");
+vi.mock("@/app/lib/surveys/surveys");
+vi.mock("@/app/share/[sharingKey]/actions");
+vi.mock("@/lib/utils/hooks/useIntervalWhenFocused");
+vi.mock("@/modules/ui/components/secondary-navigation", () => ({
+  SecondaryNavigation: vi.fn(() => <div data-testid="secondary-navigation" />),
+}));
+vi.mock("next/navigation", () => ({
+  usePathname: vi.fn(),
+  useParams: vi.fn(),
+  useSearchParams: vi.fn(),
+}));
+
+const mockUsePathname = vi.mocked(usePathname);
+const mockUseParams = vi.mocked(useParams);
+const mockUseSearchParams = vi.mocked(useSearchParams);
+const mockUseResponseFilter = vi.mocked(useResponseFilter);
+const mockGetResponseCountAction = vi.mocked(getResponseCountAction);
+const mockRevalidateSurveyIdPath = vi.mocked(revalidateSurveyIdPath);
+const mockGetFormattedFilters = vi.mocked(getFormattedFilters);
+const mockUseIntervalWhenFocused = vi.mocked(useIntervalWhenFocused);
+const MockSecondaryNavigation = vi.mocked(SecondaryNavigation);
+
+const mockSurveyLanguages: TSurveyLanguage[] = [
+  { language: { code: "en-US" } as unknown as TLanguage, default: true, enabled: true },
+];
+
+const mockSurvey = {
+  id: "surveyId123",
+  name: "Test Survey",
+  type: "app",
+  environmentId: "envId123",
+  status: "inProgress",
+  questions: [
+    {
+      id: "question1",
+      type: TSurveyQuestionTypeEnum.OpenText,
+      headline: { default: "Question 1" },
+      required: false,
+      logic: [],
+      isDraft: false,
+      imageUrl: "",
+      subheader: { default: "" },
+    } as unknown as TSurveyQuestion,
+  ],
+  hiddenFields: { enabled: false, fieldIds: [] },
+  displayOption: "displayOnce",
+  autoClose: null,
+  triggers: [],
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  languages: mockSurveyLanguages,
+  variables: [],
+  singleUse: null,
+  styling: null,
+  surveyClosedMessage: null,
+  welcomeCard: { enabled: false, headline: { default: "" } } as unknown as TSurvey["welcomeCard"],
+  segment: null,
+  resultShareKey: null,
+  closeOnDate: null,
+  delay: 0,
+  autoComplete: null,
+  recontactDays: null,
+  runOnDate: null,
+  displayPercentage: null,
+  createdBy: null,
+} as unknown as TSurvey;
+
+const defaultProps = {
+  environmentId: "testEnvId",
+  survey: mockSurvey,
+  initialTotalResponseCount: 10,
+  activeId: "summary",
+};
+
+describe("SurveyAnalysisNavigation", () => {
+  afterEach(() => {
+    cleanup();
+    vi.resetAllMocks();
+  });
+
+  test("calls revalidateSurveyIdPath on navigation item click", async () => {
+    mockUsePathname.mockReturnValue(
+      `/environments/${defaultProps.environmentId}/surveys/${mockSurvey.id}/summary`
+    );
+    mockUseParams.mockReturnValue({ environmentId: defaultProps.environmentId, surveyId: mockSurvey.id });
+    mockUseSearchParams.mockReturnValue({ get: vi.fn().mockReturnValue(null) } as any);
+    mockUseResponseFilter.mockReturnValue({ selectedFilter: "all", dateRange: {} } as any);
+    mockGetFormattedFilters.mockReturnValue([] as any);
+    mockGetResponseCountAction.mockResolvedValue({ data: 5 });
+
+    render(<SurveyAnalysisNavigation {...defaultProps} />);
+    await waitFor(() => expect(MockSecondaryNavigation).toHaveBeenCalled());
+
+    const lastCallArgs = MockSecondaryNavigation.mock.calls[MockSecondaryNavigation.mock.calls.length - 1][0];
+
+    if (!lastCallArgs.navigation || lastCallArgs.navigation.length < 2) {
+      throw new Error("Navigation items not found");
+    }
+
+    act(() => {
+      (lastCallArgs.navigation[0] as any).onClick();
+    });
+    expect(mockRevalidateSurveyIdPath).toHaveBeenCalledWith(
+      defaultProps.environmentId,
+      defaultProps.survey.id
+    );
+    vi.mocked(mockRevalidateSurveyIdPath).mockClear();
+
+    act(() => {
+      (lastCallArgs.navigation[1] as any).onClick();
+    });
+    expect(mockRevalidateSurveyIdPath).toHaveBeenCalledWith(
+      defaultProps.environmentId,
+      defaultProps.survey.id
+    );
+  });
+
+  test("passes correct runWhen flag to useIntervalWhenFocused based on share embed modal", () => {
+    mockUsePathname.mockReturnValue(
+      `/environments/${defaultProps.environmentId}/surveys/${mockSurvey.id}/summary`
+    );
+    mockUseParams.mockReturnValue({ environmentId: defaultProps.environmentId, surveyId: mockSurvey.id });
+    mockUseResponseFilter.mockReturnValue({ selectedFilter: "all", dateRange: {} } as any);
+    mockGetFormattedFilters.mockReturnValue([] as any);
+    mockGetResponseCountAction.mockResolvedValue({ data: 5 });
+
+    mockUseSearchParams.mockReturnValue({ get: vi.fn().mockReturnValue("true") } as any);
+    render(<SurveyAnalysisNavigation {...defaultProps} />);
+    expect(mockUseIntervalWhenFocused).toHaveBeenCalledWith(expect.any(Function), 10000, false, false);
+    cleanup();
+
+    mockUseSearchParams.mockReturnValue({ get: vi.fn().mockReturnValue(null) } as any);
+    render(<SurveyAnalysisNavigation {...defaultProps} />);
+    expect(mockUseIntervalWhenFocused).toHaveBeenCalledWith(expect.any(Function), 10000, true, false);
+  });
+
+  test("displays correct response count string in label for various scenarios", async () => {
+    mockUsePathname.mockReturnValue(
+      `/environments/${defaultProps.environmentId}/surveys/${mockSurvey.id}/responses`
+    );
+    mockUseParams.mockReturnValue({ environmentId: defaultProps.environmentId, surveyId: mockSurvey.id });
+    mockUseSearchParams.mockReturnValue({ get: vi.fn().mockReturnValue(null) } as any);
+    mockUseResponseFilter.mockReturnValue({ selectedFilter: "all", dateRange: {} } as any);
+    mockGetFormattedFilters.mockReturnValue([] as any);
+
+    // Scenario 1: total = 10, filtered = null (initial state)
+    render(<SurveyAnalysisNavigation {...defaultProps} initialTotalResponseCount={10} />);
+    expect(MockSecondaryNavigation.mock.calls[0][0].navigation[1].label).toBe("common.responses (10)");
+    cleanup();
+    vi.resetAllMocks(); // Reset mocks for next case
+
+    // Scenario 2: total = 15, filtered = 15
+    mockUsePathname.mockReturnValue(
+      `/environments/${defaultProps.environmentId}/surveys/${mockSurvey.id}/responses`
+    );
+    mockUseParams.mockReturnValue({ environmentId: defaultProps.environmentId, surveyId: mockSurvey.id });
+    mockUseSearchParams.mockReturnValue({ get: vi.fn().mockReturnValue(null) } as any);
+    mockUseResponseFilter.mockReturnValue({ selectedFilter: "all", dateRange: {} } as any);
+    mockGetFormattedFilters.mockReturnValue([] as any);
+    mockGetResponseCountAction.mockImplementation(async (args) => {
+      if (args && "filterCriteria" in args) return { data: 15, error: null, success: true };
+      return { data: 15, error: null, success: true };
+    });
+    render(<SurveyAnalysisNavigation {...defaultProps} initialTotalResponseCount={15} />);
+    await waitFor(() => {
+      const lastCallArgs =
+        MockSecondaryNavigation.mock.calls[MockSecondaryNavigation.mock.calls.length - 1][0];
+      expect(lastCallArgs.navigation[1].label).toBe("common.responses (15)");
+    });
+    cleanup();
+    vi.resetAllMocks();
+
+    // Scenario 3: total = 10, filtered = 15 (filtered > total)
+    mockUsePathname.mockReturnValue(
+      `/environments/${defaultProps.environmentId}/surveys/${mockSurvey.id}/responses`
+    );
+    mockUseParams.mockReturnValue({ environmentId: defaultProps.environmentId, surveyId: mockSurvey.id });
+    mockUseSearchParams.mockReturnValue({ get: vi.fn().mockReturnValue(null) } as any);
+    mockUseResponseFilter.mockReturnValue({ selectedFilter: "all", dateRange: {} } as any);
+    mockGetFormattedFilters.mockReturnValue([] as any);
+    mockGetResponseCountAction.mockImplementation(async (args) => {
+      if (args && "filterCriteria" in args) return { data: 15, error: null, success: true };
+      return { data: 10, error: null, success: true };
+    });
+    render(<SurveyAnalysisNavigation {...defaultProps} initialTotalResponseCount={10} />);
+    await waitFor(() => {
+      const lastCallArgs =
+        MockSecondaryNavigation.mock.calls[MockSecondaryNavigation.mock.calls.length - 1][0];
+      expect(lastCallArgs.navigation[1].label).toBe("common.responses (15)");
+    });
+  });
+});