bermudalamb
5ebb366074
/login, /register and /forgot-password rendered bare cards with no site header. They linked to each other and nowhere else, so a customer who clicked Log in from the storefront and changed their mind had no way back except the browser's back button. All four auth routes are now modals over the page the customer was already on, reusing the backdrop-location arrangement from #51: a direct visit or a link from an email opens over the storefront, so closing always lands somewhere real. They remain real routes, because /reset-password links to /login and customers may have bookmarks. Signing in or registering now returns the customer to the page behind, signed in, rather than moving them to /account. Someone who signs in while browsing wants to carry on browsing, and this is already how the cart and favorites prompts behave when they resume an interrupted action. The larger half of this is removing the duplication. Signing in existed twice — as these routes and again inside the prompt shown when a signed-out visitor adds to the cart or favorites something — and the two had already drifted. There were three different wordings of the marketing consent in circulation: the register page's, a shorter one in the prompt, and the string the server actually stores. The server keeps that text verbatim so the consent record says what the customer saw, which none of the three did. Both callers now render one shared AuthForm whose checkbox is the exact string the server records, and a test asserts that wording so it cannot drift again silently. Steps within the auth flow replace rather than push, so switching between tabs or stepping to password recovery leaves the whole detour as a single history entry and closing returns to where it started instead of walking back through every tab that was looked at. The privacy policy link opens in a new tab: following it in place would discard a part-filled signup form, and /privacy still has no way back of its own until #52. Test changes follow from the destination change rather than being incidental. Nineteen assertions across seven specs waited for /account after signing in; they now assert the header shows a signed-in customer, which is the condition actually being waited for. Modal submits are scoped to their dialog, because the storefront behind now offers a Log in button of its own and an unscoped locator matched both. Assertions that follow a server round-trip were given a realistic timeout — the 5s default is too tight for a bcrypt hash plus re-rendering the storefront behind the modal. Verified with 83 end-to-end tests, all passing, and type checking clean. No backend changes. Closes #50
95 lines
4.1 KiB
TypeScript
95 lines
4.1 KiB
TypeScript
import { test, expect } from '@playwright/test';
|
|
|
|
const suffix = () => `r${Date.now().toString(36)}${Math.random().toString(36).slice(2, 7)}`;
|
|
|
|
// Reserves an item by registering a customer and adding it to their cart, which
|
|
// is the only way an item legitimately reaches 'reserved'.
|
|
async function reserveItem(page: import('@playwright/test').Page, itemName: string) {
|
|
const email = `reserve-${suffix()}@example.com`;
|
|
|
|
const created = await page.request.post('/api/admin/items', {
|
|
multipart: { name: itemName, description: '', price: '75', category_id: '', tags: '[]' }
|
|
});
|
|
expect(created.ok()).toBeTruthy();
|
|
const itemId = (await created.json()).id as number;
|
|
|
|
await page.goto('/register');
|
|
await page.getByRole('textbox', { name: 'Email' }).fill(email);
|
|
await page.getByLabel('Password').fill('supersecret123');
|
|
await page.getByRole('button', { name: 'Create account' }).click();
|
|
await expect(page.getByRole('button', { name: 'My Account' })).toBeVisible({ timeout: 20000 });
|
|
|
|
const added = await page.request.post(`/api/cart/items/${itemId}`);
|
|
expect(added.status()).toBe(201);
|
|
|
|
return { email, itemId };
|
|
}
|
|
|
|
test.describe('Admin reserved items', () => {
|
|
test('shows a reserved count that opens the held items', async ({ page }) => {
|
|
const itemName = `Held ${suffix()}`;
|
|
const { email } = await reserveItem(page, itemName);
|
|
|
|
await page.goto('/admin');
|
|
await page.getByRole('tab', { name: 'Customers' }).click();
|
|
|
|
const row = page.getByRole('row').filter({ hasText: email });
|
|
await expect(row).toBeVisible();
|
|
await row.getByRole('button', { name: /item/ }).click();
|
|
|
|
const dialog = page.getByRole('dialog', { name: /Items reserved by/ });
|
|
await expect(dialog.getByText(itemName)).toBeVisible();
|
|
});
|
|
|
|
test('releasing an item returns it to the storefront as available', async ({ page }) => {
|
|
const itemName = `Freed ${suffix()}`;
|
|
const { email, itemId } = await reserveItem(page, itemName);
|
|
|
|
await page.goto('/admin');
|
|
await page.getByRole('tab', { name: 'Customers' }).click();
|
|
const row = page.getByRole('row').filter({ hasText: email });
|
|
await row.getByRole('button', { name: /item/ }).click();
|
|
|
|
const dialog = page.getByRole('dialog', { name: /Items reserved by/ });
|
|
await dialog.getByRole('button', { name: 'Release' }).click();
|
|
await expect(page.getByText(`Released "${itemName}"`)).toBeVisible();
|
|
|
|
// The point of releasing is that the item becomes purchasable again.
|
|
const item = await (await page.request.get(`/api/items/${itemId}`)).json();
|
|
expect(item.status).toBe('available');
|
|
});
|
|
|
|
test('the count drops once the item is released', async ({ page }) => {
|
|
const itemName = `Recount ${suffix()}`;
|
|
const { email } = await reserveItem(page, itemName);
|
|
|
|
await page.goto('/admin');
|
|
await page.getByRole('tab', { name: 'Customers' }).click();
|
|
const row = page.getByRole('row').filter({ hasText: email });
|
|
await row.getByRole('button', { name: /item/ }).click();
|
|
|
|
const dialog = page.getByRole('dialog', { name: /Items reserved by/ });
|
|
await dialog.getByRole('button', { name: 'Release' }).click();
|
|
await expect(dialog.getByText("This customer isn't holding any items")).toBeVisible();
|
|
|
|
// The row behind the dialog must agree with the dialog it opened.
|
|
await dialog.getByRole('button', { name: 'Close' }).click();
|
|
await expect(row.getByRole('button', { name: /item/ })).toHaveCount(0);
|
|
});
|
|
|
|
test('a customer holding nothing shows no link to click', async ({ page }) => {
|
|
const email = `idle-${suffix()}@example.com`;
|
|
await page.goto('/register');
|
|
await page.getByRole('textbox', { name: 'Email' }).fill(email);
|
|
await page.getByLabel('Password').fill('supersecret123');
|
|
await page.getByRole('button', { name: 'Create account' }).click();
|
|
await expect(page.getByRole('button', { name: 'My Account' })).toBeVisible({ timeout: 20000 });
|
|
|
|
await page.goto('/admin');
|
|
await page.getByRole('tab', { name: 'Customers' }).click();
|
|
const row = page.getByRole('row').filter({ hasText: email });
|
|
await expect(row).toBeVisible();
|
|
await expect(row.getByRole('button', { name: /item/ })).toHaveCount(0);
|
|
});
|
|
});
|