mirror of
https://github.com/solidtime-io/solidtime.git
synced 2026-08-08 00:02:15 +01:00
add banners for invitation accept
This commit is contained in:
Gregor Vostrak
committed by
Constantin Graf
Constantin Graf
parent
a30d192ea2
commit
f9be92894e
156
e2e/invitation-accept.spec.ts
Normal file
156
e2e/invitation-accept.spec.ts
Normal file
@@ -0,0 +1,156 @@
|
||||
import { expect, test } from '../playwright/fixtures';
|
||||
import { PLAYWRIGHT_BASE_URL, TEST_USER_PASSWORD } from '../playwright/config';
|
||||
import { getInvitationAcceptUrl } from './utils/mailpit';
|
||||
import { registerUser } from './utils/members';
|
||||
|
||||
// Invitation acceptance flows touch mail delivery + redirects.
|
||||
test.describe.configure({ timeout: 45000 });
|
||||
|
||||
test.describe('invitation accept banners', () => {
|
||||
test('shows success banner on dashboard when a logged-in registered user accepts an invitation', async ({
|
||||
page,
|
||||
browser,
|
||||
}) => {
|
||||
const memberId = Math.floor(Math.random() * 100000);
|
||||
const memberEmail = `success+${memberId}@invite-banner.test`;
|
||||
|
||||
// Invitee already has an account and is logged in.
|
||||
const invitee = await registerUser(browser, 'Banner Success', memberEmail);
|
||||
|
||||
// Owner sends the invitation.
|
||||
await page.goto(PLAYWRIGHT_BASE_URL + '/members');
|
||||
await page.getByRole('button', { name: 'Invite Member' }).click();
|
||||
await expect(page.getByPlaceholder('Member Email')).toBeVisible();
|
||||
await page.getByLabel('Email').fill(memberEmail);
|
||||
await page.getByRole('button', { name: 'Employee' }).click();
|
||||
await Promise.all([
|
||||
page.waitForResponse(
|
||||
(response) =>
|
||||
response.url().includes('/invitations') &&
|
||||
response.request().method() === 'POST' &&
|
||||
response.status() === 204
|
||||
),
|
||||
page.getByRole('button', { name: 'Invite Member', exact: true }).click(),
|
||||
]);
|
||||
|
||||
// Invitee clicks the email link.
|
||||
const acceptUrl = await getInvitationAcceptUrl(invitee.page.request, memberEmail);
|
||||
await invitee.page.goto(acceptUrl);
|
||||
await invitee.page.waitForURL(/\/dashboard$/);
|
||||
|
||||
const banner = invitee.page.getByTestId('banner');
|
||||
await expect(banner).toBeVisible();
|
||||
await expect(banner).toContainText(
|
||||
/Great! You have accepted the invitation to join the .* organization\./
|
||||
);
|
||||
|
||||
await invitee.close();
|
||||
});
|
||||
|
||||
test('shows info banner on login screen when a registered-but-logged-out invitee clicks the accept link', async ({
|
||||
page,
|
||||
browser,
|
||||
}) => {
|
||||
const memberId = Math.floor(Math.random() * 100000);
|
||||
const memberEmail = `loggedout+${memberId}@invite-banner.test`;
|
||||
|
||||
// Invitee has an account, but the context that clicks the link has no session.
|
||||
const invitee = await registerUser(browser, 'Banner Loggedout', memberEmail);
|
||||
await invitee.close();
|
||||
|
||||
// Owner sends the invitation.
|
||||
await page.goto(PLAYWRIGHT_BASE_URL + '/members');
|
||||
await page.getByRole('button', { name: 'Invite Member' }).click();
|
||||
await expect(page.getByPlaceholder('Member Email')).toBeVisible();
|
||||
await page.getByLabel('Email').fill(memberEmail);
|
||||
await page.getByRole('button', { name: 'Employee' }).click();
|
||||
await Promise.all([
|
||||
page.waitForResponse(
|
||||
(response) =>
|
||||
response.url().includes('/invitations') &&
|
||||
response.request().method() === 'POST' &&
|
||||
response.status() === 204
|
||||
),
|
||||
page.getByRole('button', { name: 'Invite Member', exact: true }).click(),
|
||||
]);
|
||||
|
||||
// Open the accept link in a fresh browser context (no session).
|
||||
const context = await browser.newContext();
|
||||
const inviteePage = await context.newPage();
|
||||
const acceptUrl = await getInvitationAcceptUrl(inviteePage.request, memberEmail);
|
||||
await inviteePage.goto(acceptUrl);
|
||||
await inviteePage.waitForURL(/\/login$/);
|
||||
|
||||
const banner = inviteePage.getByTestId('banner');
|
||||
await expect(banner).toBeVisible();
|
||||
await expect(banner).toContainText(/Please log in to finish joining the .* organization\./);
|
||||
|
||||
// Logging in lands the invitee on the dashboard — they were already added silently
|
||||
// by the accept controller, so the inviter's members list shows them.
|
||||
await inviteePage.getByLabel('Email').fill(memberEmail);
|
||||
await inviteePage.getByLabel('Password', { exact: true }).fill(TEST_USER_PASSWORD);
|
||||
await inviteePage.getByRole('button', { name: 'Log in' }).click();
|
||||
await inviteePage.waitForURL(/\/dashboard/);
|
||||
|
||||
await page.goto(PLAYWRIGHT_BASE_URL + '/members');
|
||||
const memberRow = page.getByRole('row').filter({ hasText: 'Banner Loggedout' });
|
||||
await expect(memberRow).toBeVisible();
|
||||
await expect(memberRow.getByText('Employee', { exact: true })).toBeVisible();
|
||||
|
||||
await context.close();
|
||||
});
|
||||
|
||||
test('shows info banner on register screen when an unregistered email accepts an invitation, then auto-joins on registration', async ({
|
||||
page,
|
||||
browser,
|
||||
}) => {
|
||||
const memberId = Math.floor(Math.random() * 100000);
|
||||
const memberEmail = `info+${memberId}@invite-banner.test`;
|
||||
|
||||
// Owner invites an email that has no account yet.
|
||||
await page.goto(PLAYWRIGHT_BASE_URL + '/members');
|
||||
await page.getByRole('button', { name: 'Invite Member' }).click();
|
||||
await expect(page.getByPlaceholder('Member Email')).toBeVisible();
|
||||
await page.getByLabel('Email').fill(memberEmail);
|
||||
await page.getByRole('button', { name: 'Employee' }).click();
|
||||
await Promise.all([
|
||||
page.waitForResponse(
|
||||
(response) =>
|
||||
response.url().includes('/invitations') &&
|
||||
response.request().method() === 'POST' &&
|
||||
response.status() === 204
|
||||
),
|
||||
page.getByRole('button', { name: 'Invite Member', exact: true }).click(),
|
||||
]);
|
||||
|
||||
// Open the accept link in a fresh browser context (no session).
|
||||
const context = await browser.newContext();
|
||||
const inviteePage = await context.newPage();
|
||||
const acceptUrl = await getInvitationAcceptUrl(inviteePage.request, memberEmail);
|
||||
await inviteePage.goto(acceptUrl);
|
||||
await inviteePage.waitForURL(/\/register$/);
|
||||
|
||||
const banner = inviteePage.getByTestId('banner');
|
||||
await expect(banner).toBeVisible();
|
||||
await expect(banner).toContainText(
|
||||
/Please create an account to finish joining the .* organization\./
|
||||
);
|
||||
|
||||
// Complete registration — the invitee should auto-join the inviter's org
|
||||
// (no fresh personal organization is created on top).
|
||||
await inviteePage.getByLabel('Name').fill('Banner Info');
|
||||
await inviteePage.getByLabel('Email').fill(memberEmail);
|
||||
await inviteePage.getByLabel('Password', { exact: true }).fill(TEST_USER_PASSWORD);
|
||||
await inviteePage.getByLabel('Confirm Password').fill(TEST_USER_PASSWORD);
|
||||
await inviteePage.getByLabel('I agree to the Terms of').click();
|
||||
await inviteePage.getByRole('button', { name: 'Register' }).click();
|
||||
await inviteePage.waitForURL(/\/dashboard/);
|
||||
|
||||
await page.goto(PLAYWRIGHT_BASE_URL + '/members');
|
||||
const memberRow = page.getByRole('row').filter({ hasText: 'Banner Info' });
|
||||
await expect(memberRow).toBeVisible();
|
||||
await expect(memberRow.getByText('Employee', { exact: true })).toBeVisible();
|
||||
|
||||
await context.close();
|
||||
});
|
||||
});
|
||||
@@ -46,7 +46,9 @@ export async function getInvitationAcceptUrl(
|
||||
expect(searchResult.messages.length).toBeGreaterThan(0);
|
||||
|
||||
const message = await getMessage(request, searchResult.messages[0].ID);
|
||||
const acceptUrlMatch = message.HTML.match(/href="([^"]*team-invitations[^"]*)"/);
|
||||
const acceptUrlMatch = message.HTML.match(
|
||||
/href="([^"]*(?:organization-invitations|team-invitations)[^"]*)"/
|
||||
);
|
||||
expect(acceptUrlMatch).toBeTruthy();
|
||||
|
||||
return acceptUrlMatch![1].replace(/&/g, '&');
|
||||
|
||||
Reference in New Issue
Block a user