From 8070b51bdbdb120d14ea2c3df9b7108ab7ab19bf Mon Sep 17 00:00:00 2001 From: Claude Date: Fri, 16 Oct 2026 14:53:11 +0000 Subject: [PATCH 1/2] fix(onboarding): send every plan choice to personal onboarding instead of the removed team pages Choosing "With my team" on /onboarding/getting-started pushed /onboarding/teams/details, which Cal.diy removed, so new signups hit a 404. Co-Authored-By: Claude Opus 5.5 (1M context) Claude-Session: https://claude.ai/code/session_013jArPgym5pEewcZ8kSiN1i --- .../getting-started/onboarding-view.test.tsx | 57 +++++++++++++++++++ .../getting-started/onboarding-view.tsx | 10 +--- 2 files changed, 60 insertions(+), 7 deletions(-) create mode 100644 apps/web/modules/onboarding/getting-started/onboarding-view.test.tsx diff --git a/apps/web/modules/onboarding/getting-started/onboarding-view.test.tsx b/apps/web/modules/onboarding/getting-started/onboarding-view.test.tsx new file mode 100644 index 000000000000..e5f6ed1d67a2 --- /dev/null +++ b/apps/web/modules/onboarding/getting-started/onboarding-view.test.tsx @@ -0,0 +1,57 @@ +import { fireEvent, render, screen } from "@testing-library/react"; +import type { ReactNode } from "react"; +import { beforeEach, describe, expect, it, vi } from "vitest"; +import type { PlanType } from "../store/onboarding-store"; +import { OnboardingView } from "./onboarding-view"; + +const mocks = vi.hoisted(() => ({ + push: vi.fn(), + selectedPlan: null as PlanType | null, +})); + +vi.mock("next/navigation", () => ({ + useRouter: () => ({ push: mocks.push, replace: vi.fn() }), +})); + +vi.mock("posthog-js", () => ({ default: { capture: vi.fn() } })); + +vi.mock("@calcom/lib/hooks/useLocale", () => ({ + useLocale: () => ({ t: (key: string) => key, i18n: { language: "en" } }), +})); + +vi.mock("../components/OnboardingLayout", () => ({ + OnboardingLayout: ({ children }: { children: ReactNode }) =>
{children}
, +})); + +vi.mock("../components/onboarding-continuation-prompt", () => ({ + OnboardingContinuationPrompt: () => null, +})); + +vi.mock("../components/plan-icon", () => ({ PlanIcon: () => null })); + +vi.mock("../store/onboarding-store", () => ({ + useOnboardingStore: () => ({ + selectedPlan: mocks.selectedPlan, + setSelectedPlan: vi.fn(), + resetOnboardingPreservingPlan: vi.fn(), + }), +})); + +describe("OnboardingView", () => { + beforeEach(() => { + mocks.push.mockReset(); + }); + + it.each(["personal", "team", "organization", null])( + "continues to personal onboarding when the selected plan is %s", + (plan) => { + mocks.selectedPlan = plan; + render(); + + fireEvent.click(screen.getByTestId("onboarding-continue-btn")); + + expect(mocks.push).toHaveBeenCalledWith("/onboarding/personal/settings"); + expect(mocks.push).toHaveBeenCalledTimes(1); + } + ); +}); diff --git a/apps/web/modules/onboarding/getting-started/onboarding-view.tsx b/apps/web/modules/onboarding/getting-started/onboarding-view.tsx index 8d8b0ea8871e..16e2ed3f73e4 100644 --- a/apps/web/modules/onboarding/getting-started/onboarding-view.tsx +++ b/apps/web/modules/onboarding/getting-started/onboarding-view.tsx @@ -74,14 +74,10 @@ export const OnboardingView = ({ userEmail }: OnboardingViewProps) => { plan_type: selectedPlan, }); } + // Cal.diy removed the team and organization onboarding pages, so personal is the only + // onboarding flow that exists. A persisted "team" or "organization" choice used to 404. startTransition(() => { - if (selectedPlan === "organization") { - router.push("/onboarding/organization/details"); - } else if (selectedPlan === "team") { - router.push("/onboarding/teams/details"); - } else if (selectedPlan === "personal") { - router.push("/onboarding/personal/settings"); - } + router.push("/onboarding/personal/settings"); }); }; From 79f3c00325e57e1a0549d4102455393de4224163 Mon Sep 17 00:00:00 2001 From: Claude Date: Fri, 16 Oct 2026 15:02:10 +0000 Subject: [PATCH 2/2] test(onboarding): mock usePathname and format the onboarding view test Co-Authored-By: Claude Opus 5.5 (1M context) Claude-Session: https://claude.ai/code/session_013jArPgym5pEewcZ8kSiN1i --- .../getting-started/onboarding-view.test.tsx | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/apps/web/modules/onboarding/getting-started/onboarding-view.test.tsx b/apps/web/modules/onboarding/getting-started/onboarding-view.test.tsx index e5f6ed1d67a2..28fd4975df93 100644 --- a/apps/web/modules/onboarding/getting-started/onboarding-view.test.tsx +++ b/apps/web/modules/onboarding/getting-started/onboarding-view.test.tsx @@ -11,6 +11,7 @@ const mocks = vi.hoisted(() => ({ vi.mock("next/navigation", () => ({ useRouter: () => ({ push: mocks.push, replace: vi.fn() }), + usePathname: () => "/onboarding/getting-started", })); vi.mock("posthog-js", () => ({ default: { capture: vi.fn() } })); @@ -42,16 +43,18 @@ describe("OnboardingView", () => { mocks.push.mockReset(); }); - it.each(["personal", "team", "organization", null])( - "continues to personal onboarding when the selected plan is %s", - (plan) => { - mocks.selectedPlan = plan; - render(); + it.each([ + "personal", + "team", + "organization", + null, + ])("continues to personal onboarding when the selected plan is %s", (plan) => { + mocks.selectedPlan = plan; + render(); - fireEvent.click(screen.getByTestId("onboarding-continue-btn")); + fireEvent.click(screen.getByTestId("onboarding-continue-btn")); - expect(mocks.push).toHaveBeenCalledWith("/onboarding/personal/settings"); - expect(mocks.push).toHaveBeenCalledTimes(1); - } - ); + expect(mocks.push).toHaveBeenCalledWith("/onboarding/personal/settings"); + expect(mocks.push).toHaveBeenCalledTimes(1); + }); });