The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
rename tests
Steven Teyf47d3bbb84fb
diff --git a/apps/web/app/(ee)/api/e2e/trigger-merge-account/route.ts b/apps/web/app/(ee)/api/e2e/trigger-merge-accounts/route.tssimilarity index 98%rename from apps/web/app/(ee)/api/e2e/trigger-merge-account/route.tsrename to apps/web/app/(ee)/api/e2e/trigger-merge-accounts/route.tsindex b72d729aa6..8b6a7a2465 100644--- a/apps/web/app/(ee)/api/e2e/trigger-merge-account/route.ts+++ b/apps/web/app/(ee)/api/e2e/trigger-merge-accounts/route.ts@@ -13,7 +13,7 @@ const bodySchema = z.object({targetEmail: z.email(),});-// POST /api/e2e/trigger-merge-account+// POST /api/e2e/trigger-merge-accountsexport const POST = withWorkspace(async ({ req, workspace }) => {assertE2EWorkspace(workspace);diff --git a/apps/web/tests/partners/applications/approve-reject-partner-application.test.ts b/apps/web/tests/partner-applications/approve-reject-partner-application.test.tssimilarity index 94%rename from apps/web/tests/partners/applications/approve-reject-partner-application.test.tsrename to apps/web/tests/partner-applications/approve-reject-partner-application.test.tsindex cabfd33347..21e47d4cf6 100644--- a/apps/web/tests/partners/applications/approve-reject-partner-application.test.ts+++ b/apps/web/tests/partner-applications/approve-reject-partner-application.test.ts@@ -1,9 +1,9 @@import { generateRandomName } from "@/lib/names";import { Partner } from "@prisma/client";import { describe, expect, test } from "vitest";-import { randomPartnerEmail } from "../../utils/helpers";-import { IntegrationHarness } from "../../utils/integration";-import { E2E_PARTNER_GROUP } from "../../utils/resource";+import { randomPartnerEmail } from "../utils/helpers";+import { IntegrationHarness } from "../utils/integration";+import { E2E_PARTNER_GROUP } from "../utils/resource";describe.sequential("POST /partners/applications/reject and /approve",diff --git a/apps/web/tests/partners/applications/list-partner-applications.test.ts b/apps/web/tests/partner-applications/list-partner-applications.test.tssimilarity index 94%rename from apps/web/tests/partners/applications/list-partner-applications.test.tsrename to apps/web/tests/partner-applications/list-partner-applications.test.tsindex 63c9524674..aefd43338c 100644--- a/apps/web/tests/partners/applications/list-partner-applications.test.ts+++ b/apps/web/tests/partner-applications/list-partner-applications.test.ts@@ -1,8 +1,8 @@import { PartnerApplicationProps } from "@/lib/types";import { PartnerApplicationSchema } from "@/lib/zod/schemas/program-application";import { describe, expect, test } from "vitest";-import { IntegrationHarness } from "../../utils/integration";-import { E2E_PARTNER_GROUP, E2E_PARTNERS } from "../../utils/resource";+import { IntegrationHarness } from "../utils/integration";+import { E2E_PARTNER_GROUP, E2E_PARTNERS } from "../utils/resource";describe.sequential("GET /partners/applications", async () => {const h = new IntegrationHarness();diff --git a/apps/web/tests/workflows/merge-partner-accounts-workflow.test.ts b/apps/web/tests/workflows/merge-partner-accounts-workflow.test.tsnew file mode 100644index 0000000000..cc4ffa0e2c--- /dev/null+++ b/apps/web/tests/workflows/merge-partner-accounts-workflow.test.ts@@ -0,0 +1,153 @@+import {+ VITEST_POLL_INTERVAL_MS,+ VITEST_TEST_TIMEOUT_MS,+} from "@/lib/constants/misc";+import { EnrolledPartnerProps } from "@/lib/types";+import { describe, expect, test } from "vitest";+import { randomPartnerEmail } from "../utils/helpers";+import { IntegrationHarness } from "../utils/integration";+import { E2E_PARTNER_GROUP } from "../utils/resource";+import { verifyMergeCompleted } from "./utils/verify-merge-completed";++describe.sequential("Workflow - MergePartnerAccounts", async () => {+ const h = new IntegrationHarness();+ const { http } = await h.init();++ // Creates a partner enrolled (approved) in the Acme program with a default link.+ async function createEnrolledPartner(label: string) {+ const { status, data: partner } = await http.post<EnrolledPartnerProps>({+ path: "/partners",+ body: {+ name: `E2E Merge ${label}`,+ email: randomPartnerEmail(),+ groupId: E2E_PARTNER_GROUP.id,+ },+ });++ expect(status).toEqual(201);+ expect(partner.links).not.toBeNull();+ expect(partner.links!.length).toBeGreaterThan(0);++ return partner;+ }++ test(+ "Overlap merge transfers child data and deletes source",+ { timeout: VITEST_TEST_TIMEOUT_MS },+ async () => {+ const source = await createEnrolledPartner("source");+ const target = await createEnrolledPartner("target");+ const sourceLinkId = source.links![0].id;++ const { status: triggerStatus, data: triggerRes } = await http.post<{+ workflowRunId?: string;+ }>({+ path: "/e2e/trigger-merge-accounts",+ body: { sourceEmail: source.email, targetEmail: target.email },+ });++ expect(triggerStatus).toEqual(200);+ expect(triggerRes).not.toBeNull();++ const merged = await verifyMergeCompleted({+ http,+ sourcePartnerId: source.id,+ targetPartnerId: target.id,+ expectedLinkId: sourceLinkId,+ });++ expect(merged.links!.map((link) => link.id)).toContain(sourceLinkId);+ },+ );++ test(+ "Overlap merge upgrades target status from pending to approved",+ { timeout: VITEST_TEST_TIMEOUT_MS },+ async () => {+ const source = await createEnrolledPartner("upgrade-source");+ const target = await createEnrolledPartner("upgrade-target");++ const { status: pendingStatus } = await http.post({+ path: "/e2e/partners/pending-program-application",+ body: { partnerId: target.id },+ });+ expect(pendingStatus).toEqual(200);++ const { status: triggerStatus } = await http.post({+ path: "/e2e/trigger-merge-accounts",+ body: { sourceEmail: source.email, targetEmail: target.email },+ });+ expect(triggerStatus).toEqual(200);++ const startTime = Date.now();+ let lastTargetStatus: string | undefined;++ while (Date.now() - startTime < VITEST_TEST_TIMEOUT_MS) {+ const [sourceRes, targetRes] = await Promise.all([+ http.get({ path: `/partners/${source.id}` }),+ http.get<EnrolledPartnerProps>({ path: `/partners/${target.id}` }),+ ]);++ lastTargetStatus =+ targetRes.status === 200 ? targetRes.data.status : undefined;++ if (sourceRes.status === 404 && lastTargetStatus === "approved") {+ expect(lastTargetStatus).toBe("approved");+ return;+ }++ await new Promise((resolve) =>+ setTimeout(resolve, VITEST_POLL_INTERVAL_MS),+ );+ }++ throw new Error(+ `Target status was not upgraded to approved within ${VITEST_TEST_TIMEOUT_MS / 1000}s. ` ++ `Last seen status: ${lastTargetStatus}`,+ );+ },+ );++ test(+ "Repeat merge is rejected once the source is already merged",+ { timeout: VITEST_TEST_TIMEOUT_MS },+ async () => {+ const source = await createEnrolledPartner("repeat-source");+ const target = await createEnrolledPartner("repeat-target");+ const sourceLinkId = source.links![0].id;++ const { status: firstTrigger } = await http.post({+ path: "/e2e/trigger-merge-accounts",+ body: { sourceEmail: source.email, targetEmail: target.email },+ });+ expect(firstTrigger).toEqual(200);++ await verifyMergeCompleted({+ http,+ sourcePartnerId: source.id,+ targetPartnerId: target.id,+ expectedLinkId: sourceLinkId,+ });++ const { data: afterFirst } = await http.get<EnrolledPartnerProps>({+ path: `/partners/${target.id}`,+ });+ const linkCountAfterFirst = afterFirst.links!.length;++ // The source partner no longer exists, so triggering again is rejected by+ // the guard (both partners must be enrolled in the Acme program) - the+ // merge can't be double-processed.+ const { status: secondTrigger } = await http.post({+ path: "/e2e/trigger-merge-accounts",+ body: { sourceEmail: source.email, targetEmail: target.email },+ });+ expect(secondTrigger).toEqual(400);++ const { data: afterSecond } = await http.get<EnrolledPartnerProps>({+ path: `/partners/${target.id}`,+ });++ expect(afterSecond.links!.length).toBe(linkCountAfterFirst);+ },+ );+});