Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

fix tests

Steven Teyc0464cd0bbc9
diff --git a/apps/web/playwright/api/campaigns/send-campaign-workflow-helpers.ts b/apps/web/playwright/api/campaigns/send-campaign-workflow-helpers.ts
index 93736d86d1..74f7132e66 100644
--- a/apps/web/playwright/api/campaigns/send-campaign-workflow-helpers.ts
+++ b/apps/web/playwright/api/campaigns/send-campaign-workflow-helpers.ts
@@ -7,6 +7,7 @@ import { subHours } from "date-fns";
import { randomName, randomPartnerEmail } from "../../utils";
import { PLAYWRIGHT_API_BASE } from "../constants";
import type { ApiClient } from "../fixtures";
+import { deletePartnerData } from "../partners/helpers";
import {
campaignContent,
createCampaign,
@@ -279,13 +280,30 @@ export async function expectCampaignEmailCount({
partnerId?: string;
count: number;
}) {
- const emails = await campaignEmails(campaignId, partnerId);
- expect(
- emails,
- count > 0
- ? "expected a campaign NotificationEmail (SMTP/MailHog or Resend must be configured)"
- : "did not expect a campaign NotificationEmail",
- ).toHaveLength(count);
+ if (count === 0) {
+ const emails = await campaignEmails(campaignId, partnerId);
+ expect(
+ emails,
+ "did not expect a campaign NotificationEmail",
+ ).toHaveLength(0);
+ return emails;
+ }
+
+ // Event-triggered sends run in waitUntil after /api/track/lead returns.
+ let emails: Awaited<ReturnType<typeof campaignEmails>> = [];
+ await expect
+ .poll(
+ async () => {
+ emails = await campaignEmails(campaignId, partnerId);
+ return emails.length;
+ },
+ {
+ message:
+ "expected a campaign NotificationEmail (SMTP/MailHog or Resend must be configured)",
+ },
+ )
+ .toBe(count);
+
return emails;
}
@@ -314,18 +332,6 @@ export async function deleteTestPartner(partnerId: string | undefined) {
select: { userId: true },
});
- await prisma.notificationEmail.deleteMany({
- where: { partnerId },
- });
-
- await prisma.commission.deleteMany({
- where: { partnerId },
- });
-
- await prisma.customer.deleteMany({
- where: { partnerId },
- });
-
await prisma.programPartnerTag.deleteMany({
where: { partnerId },
});
@@ -340,13 +346,7 @@ export async function deleteTestPartner(partnerId: string | undefined) {
});
}
- await prisma.link.deleteMany({
- where: { partnerId },
- });
-
- await prisma.programEnrollment.deleteMany({
- where: { partnerId },
- });
+ await deletePartnerData(partnerId);
// Prisma partner.delete hits a PlanetScale relation quirk; raw SQL matches
// bulkDeletePartners cleanup used by e2e cron. Use Prisma so cleanup hits
diff --git a/apps/web/playwright/api/partners/helpers.ts b/apps/web/playwright/api/partners/helpers.ts
index 472aa73c3f..5734d9f504 100644
--- a/apps/web/playwright/api/partners/helpers.ts
+++ b/apps/web/playwright/api/partners/helpers.ts
@@ -15,38 +15,69 @@ export async function createPartner(
});
}
-export async function deletePartner(partnerId: string | undefined) {
- if (!partnerId) return;
-
- await prisma.commission.deleteMany({
- where: {
- partnerId,
- },
- });
+function isRelationConstraintError(error: unknown) {
+ return (
+ typeof error === "object" &&
+ error !== null &&
+ "code" in error &&
+ (error.code === "P2014" || error.code === "P2003")
+ );
+}
- await prisma.payout.deleteMany({
- where: {
- partnerId,
- },
+// Commissions/payouts/customers require ProgramEnrollment. Lead tracking also
+// queues create-partner-commission via QStash, so rows can appear after the
+// first deleteMany — retry until enrollment delete succeeds.
+export async function deletePartnerData(partnerId: string) {
+ await prisma.notificationEmail.deleteMany({
+ where: { partnerId },
});
await prisma.discountCode.deleteMany({
- where: {
- partnerId,
- },
+ where: { partnerId },
});
- await prisma.link.deleteMany({
- where: {
- partnerId,
- },
- });
+ const deadline = Date.now() + 15_000;
- await prisma.programEnrollment.deleteMany({
- where: {
- partnerId,
- },
- });
+ while (true) {
+ try {
+ await prisma.commission.deleteMany({
+ where: { partnerId },
+ });
+
+ await prisma.payout.deleteMany({
+ where: { partnerId },
+ });
+
+ await prisma.submittedLead.deleteMany({
+ where: { partnerId },
+ });
+
+ await prisma.customer.deleteMany({
+ where: { partnerId },
+ });
+
+ await prisma.link.deleteMany({
+ where: { partnerId },
+ });
+
+ await prisma.programEnrollment.deleteMany({
+ where: { partnerId },
+ });
+ return;
+ } catch (error) {
+ if (!isRelationConstraintError(error) || Date.now() >= deadline) {
+ throw error;
+ }
+
+ await new Promise((resolve) => setTimeout(resolve, 250));
+ }
+ }
+}
+
+export async function deletePartner(partnerId: string | undefined) {
+ if (!partnerId) return;
+
+ await deletePartnerData(partnerId);
// Prisma partner.delete hits a PlanetScale relation quirk; raw SQL matches
// bulkDeletePartners cleanup used by e2e cron.