diff --git a/apps/e2e/tests/invitations/invitations.po.ts b/apps/e2e/tests/invitations/invitations.po.ts index cc73257ea..5981882fb 100644 --- a/apps/e2e/tests/invitations/invitations.po.ts +++ b/apps/e2e/tests/invitations/invitations.po.ts @@ -1,4 +1,4 @@ -import { expect, Page } from '@playwright/test'; +import { Page } from '@playwright/test'; import { AuthPageObject } from '../authentication/auth.po'; import { TeamAccountsPageObject } from '../team-accounts/team-accounts.po'; @@ -30,6 +30,8 @@ export class InvitationsPageObject { continue; } + console.log(`Inviting ${invite.email} with role ${invite.role}...`) + const nth = index + 1; await this.page.fill(`[data-test="invite-member-form-item"]:nth-child(${nth}) [data-test="invite-email-input"]`, invite.email); @@ -91,10 +93,12 @@ export class InvitationsPageObject { } async acceptInvitation() { + console.log('Accepting invitation...'); + await this.page.locator('[data-test="join-team-form"] button[type="submit"]').click(); await this.page.waitForResponse(response => { return response.url().includes('/join') && response.request().method() === 'POST'; - }) + }); } } \ No newline at end of file diff --git a/apps/e2e/tests/invitations/invitations.spec.ts b/apps/e2e/tests/invitations/invitations.spec.ts index d842f8e08..5a899e975 100644 --- a/apps/e2e/tests/invitations/invitations.spec.ts +++ b/apps/e2e/tests/invitations/invitations.spec.ts @@ -37,7 +37,7 @@ test.describe('Invitations', () => { await invitations.auth.signOut(); await invitations.auth.visitConfirmEmailLink(invites[0]!.email, { - deleteAfter: true + deleteAfter: false }); await invitations.auth.signUp({ diff --git a/apps/e2e/tests/utils/mailbox.ts b/apps/e2e/tests/utils/mailbox.ts index b7a250902..cd91aecb7 100644 --- a/apps/e2e/tests/utils/mailbox.ts +++ b/apps/e2e/tests/utils/mailbox.ts @@ -12,7 +12,7 @@ export class Mailbox { }) { const mailbox = email.split('@')[0]; - console.log(`Visiting mailbox ${mailbox} ...`) + console.log(`Visiting mailbox ${email} ...`) if (!mailbox) { throw new Error('Invalid email'); @@ -33,7 +33,7 @@ export class Mailbox { throw new Error('No link found in email'); } - console.log(`Visiting ${linkHref} ...`); + console.log(`Visiting ${linkHref} from mailbox ${email}...`); return this.page.goto(linkHref); } @@ -41,7 +41,7 @@ export class Mailbox { async getInviteEmail( mailbox: string, params = { - deleteAfter: true + deleteAfter: false, } ) { const url = `http://localhost:54324/api/v1/mailbox/${mailbox}`; diff --git a/apps/web/supabase/seed.sql b/apps/web/supabase/seed.sql index b2cb07042..cb431d5a6 100644 --- a/apps/web/supabase/seed.sql +++ b/apps/web/supabase/seed.sql @@ -10,29 +10,7 @@ execute function "supabase_functions"."http_request"( 'POST', '{"Content-Type":"application/json", "X-Supabase-Event-Signature":"WEBHOOKSECRET"}', '{}', - '1000' -); - --- this webhook will be triggered after every insert on the accounts_memberships table -create trigger "accounts_memberships_insert" after insert -on "public"."accounts_memberships" for each row -execute function "supabase_functions"."http_request"( - 'http://host.docker.internal:3000/api/db/webhook', - 'POST', - '{"Content-Type":"application/json", "X-Supabase-Event-Signature":"WEBHOOKSECRET"}', - '{}', - '1000' -); - --- this webhook will be triggered after every delete on the accounts_memberships table -create trigger "accounts_memberships_delete" after delete -on "public"."accounts_memberships" for each row -execute function "supabase_functions"."http_request"( - 'http://host.docker.internal:3000/api/db/webhook', - 'POST', - '{"Content-Type":"application/json", "X-Supabase-Event-Signature":"WEBHOOKSECRET"}', - '{}', - '1000' + '5000' ); -- this webhook will be triggered after a delete on the subscriptions table @@ -44,7 +22,7 @@ execute function "supabase_functions"."http_request"( 'POST', '{"Content-Type":"application/json", "X-Supabase-Event-Signature":"WEBHOOKSECRET"}', '{}', - '1000' + '5000' ); -- this webhook will be triggered after every insert on the invitations table @@ -56,5 +34,5 @@ execute function "supabase_functions"."http_request"( 'POST', '{"Content-Type":"application/json", "X-Supabase-Event-Signature":"WEBHOOKSECRET"}', '{}', - '1000' + '5000' ); \ No newline at end of file