/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
196 lines
8.3 KiB
TypeScript
Executable File
196 lines
8.3 KiB
TypeScript
Executable File
import { test, expect, Page } from '@playwright/test';
|
|
|
|
const PASSWORD = 'supersecret123';
|
|
|
|
function uniqueEmail(): string {
|
|
return `playwright-${Date.now()}-${Math.floor(Math.random() * 10000)}@example.com`;
|
|
}
|
|
|
|
// Registering closes the auth modal and returns the customer to the page behind
|
|
// it — the storefront, for a direct visit to /register — rather than navigating
|
|
// to /account. So the header, not the URL, is what proves the session exists.
|
|
//
|
|
// The wait is generous because this is a bcrypt round-trip rather than a render,
|
|
// and the suite's workers all register at once.
|
|
async function register(page: Page, email: string) {
|
|
await page.goto('/register');
|
|
await page.getByRole('textbox', { name: 'Email' }).fill(email);
|
|
await page.getByLabel('Password').fill(PASSWORD);
|
|
await page.getByRole('button', { name: 'Create account' }).click();
|
|
await expect(page.getByRole('button', { name: 'My Account' })).toBeVisible({ timeout: 20000 });
|
|
}
|
|
|
|
// Log out lives inside the account view, which is a modal over the storefront.
|
|
async function openAccount(page: Page) {
|
|
await page.goto('/account');
|
|
await expect(page.getByRole('dialog', { name: 'My Account' })).toBeVisible();
|
|
}
|
|
|
|
test.describe('Customer accounts', () => {
|
|
test('marketing consent checkbox is unchecked by default', async ({ page }) => {
|
|
await page.goto('/register');
|
|
await expect(page.getByRole('checkbox')).not.toBeChecked();
|
|
});
|
|
|
|
test('the consent label is the exact wording the server records', async ({ page }) => {
|
|
await page.goto('/register');
|
|
|
|
// The stored consent text is kept verbatim so the record says what the
|
|
// customer actually saw. Three different wordings were in circulation
|
|
// before the sign-in form was shared between the routes and the cart
|
|
// prompt, and none of them matched what was stored.
|
|
const consent =
|
|
'I want to receive occasional emails about new one-of-a-kind items from Redefined Designs. I can unsubscribe at any time.';
|
|
await expect(page.getByRole('dialog', { name: 'Create an account' })).toContainText(consent);
|
|
});
|
|
|
|
test('registering signs the customer in and returns them where they were', async ({ page }) => {
|
|
const email = uniqueEmail();
|
|
await register(page, email);
|
|
|
|
// Back on the storefront, signed in — not moved to the account page.
|
|
await expect(page).toHaveURL(/\/$/);
|
|
await openAccount(page);
|
|
await expect(page.getByText(email)).toBeVisible();
|
|
});
|
|
|
|
test('rejects login with the wrong password', async ({ page }) => {
|
|
const email = uniqueEmail();
|
|
await register(page, email);
|
|
await openAccount(page);
|
|
await page.getByRole('button', { name: 'Log out' }).click();
|
|
|
|
await page.goto('/login');
|
|
await page.getByRole('textbox', { name: 'Email' }).fill(email);
|
|
await page.getByLabel('Password').fill('wrong-password');
|
|
// Scoped to the modal: the storefront rendered behind it has a "Log in"
|
|
// button of its own, which is what opened this one.
|
|
await page.getByRole('dialog', { name: 'Log in' }).getByRole('button', { name: 'Log in' }).click();
|
|
|
|
await expect(page.getByText('invalid email or password')).toBeVisible();
|
|
});
|
|
|
|
test('logging out returns to the home page and resets the header', async ({ page }) => {
|
|
await register(page, uniqueEmail());
|
|
await openAccount(page);
|
|
|
|
await page.getByRole('button', { name: 'Log out' }).click();
|
|
|
|
// A server round-trip followed by re-rendering the storefront behind the
|
|
// modal, so the 5s default is too tight when workers run concurrently.
|
|
await expect(page).toHaveURL(/\/$/, { timeout: 20000 });
|
|
await expect(page.getByRole('button', { name: 'Log in' })).toBeVisible();
|
|
await expect(page.getByRole('button', { name: 'Sign up' })).toBeVisible();
|
|
await expect(page.getByRole('button', { name: 'My Account' })).toBeHidden();
|
|
});
|
|
|
|
test('the logged-out header survives a reload', async ({ page }) => {
|
|
await register(page, uniqueEmail());
|
|
await openAccount(page);
|
|
|
|
await page.getByRole('button', { name: 'Log out' }).click();
|
|
await expect(page.getByRole('button', { name: 'Log in' })).toBeVisible();
|
|
|
|
// Proves the server session was actually destroyed, rather than the header
|
|
// merely being repainted from stale client state.
|
|
await page.reload();
|
|
await expect(page.getByRole('button', { name: 'Log in' })).toBeVisible();
|
|
await expect(page.getByRole('button', { name: 'My Account' })).toBeHidden();
|
|
});
|
|
|
|
test('logging out does not leave the account page on the back stack', async ({ page }) => {
|
|
await register(page, uniqueEmail());
|
|
await openAccount(page);
|
|
|
|
await page.getByRole('button', { name: 'Log out' }).click();
|
|
await expect(page).toHaveURL(/\/$/, { timeout: 20000 });
|
|
|
|
await page.goBack();
|
|
await expect(page).not.toHaveURL(/\/account/);
|
|
});
|
|
|
|
test('a failed logout says so instead of appearing to succeed', async ({ page }) => {
|
|
await register(page, uniqueEmail());
|
|
await openAccount(page);
|
|
|
|
await page.route('**/api/customers/logout', (route) =>
|
|
route.fulfill({ status: 500, contentType: 'application/json', body: '{"error":"internal error"}' })
|
|
);
|
|
|
|
await page.getByRole('button', { name: 'Log out' }).click();
|
|
|
|
// The session cookie is still valid, so pretending to be logged out would
|
|
// silently log the customer back in on their next reload.
|
|
await expect(page.getByText(/couldn't log out/i)).toBeVisible();
|
|
await expect(page).toHaveURL(/\/account/);
|
|
});
|
|
});
|
|
|
|
test.describe('Auth routes are not dead ends', () => {
|
|
test('opening Log in from the header closes back to where browsing left off', async ({ page }) => {
|
|
await page.goto('/?max_price=50000');
|
|
await page.getByRole('button', { name: 'Log in' }).click();
|
|
|
|
const modal = page.getByRole('dialog', { name: 'Log in' });
|
|
await expect(modal).toBeVisible();
|
|
await expect(page).toHaveURL(/\/login/);
|
|
|
|
await modal.getByRole('button', { name: 'Close' }).click();
|
|
|
|
await expect(modal).toBeHidden();
|
|
await expect(page).toHaveURL(/max_price=50000/);
|
|
});
|
|
|
|
test('a direct visit opens over the storefront rather than a blank page', async ({ page }) => {
|
|
await page.goto('/login');
|
|
|
|
await expect(page.getByRole('dialog', { name: 'Log in' })).toBeVisible();
|
|
await expect(page.getByRole('heading', { name: 'Redefined Designs' })).toBeVisible();
|
|
});
|
|
|
|
test('switching between sign in and sign up keeps one history entry', async ({ page }) => {
|
|
await page.goto('/?max_price=50000');
|
|
await page.getByRole('button', { name: 'Log in' }).click();
|
|
|
|
await page.getByRole('tab', { name: 'Create Account' }).click();
|
|
await expect(page).toHaveURL(/\/register/);
|
|
await page.getByRole('tab', { name: 'Log In' }).click();
|
|
await expect(page).toHaveURL(/\/login/);
|
|
|
|
// Back returns to browsing rather than walking through each tab visited.
|
|
await page.goBack();
|
|
await expect(page).toHaveURL(/max_price=50000/);
|
|
await expect(page.getByRole('dialog', { name: 'Log in' })).toBeHidden();
|
|
});
|
|
|
|
test('signing in from the header returns to the page behind, signed in', async ({ page }) => {
|
|
const email = uniqueEmail();
|
|
await register(page, email);
|
|
await page.goto('/account');
|
|
await page.getByRole('button', { name: 'Log out' }).click();
|
|
await expect(page.getByRole('button', { name: 'Log in' })).toBeVisible();
|
|
|
|
await page.goto('/?max_price=50000');
|
|
await page.getByRole('button', { name: 'Log in' }).click();
|
|
const modal = page.getByRole('dialog', { name: 'Log in' });
|
|
await modal.getByRole('textbox', { name: 'Email' }).fill(email);
|
|
await modal.getByLabel('Password').fill(PASSWORD);
|
|
await modal.getByRole('button', { name: 'Log in' }).click();
|
|
|
|
await expect(page.getByRole('button', { name: 'My Account' })).toBeVisible({ timeout: 20000 });
|
|
await expect(page).toHaveURL(/max_price=50000/);
|
|
});
|
|
|
|
test('reaching password recovery from the login form keeps a way back', async ({ page }) => {
|
|
await page.goto('/login');
|
|
await page.getByRole('button', { name: 'Forgot password?' }).click();
|
|
|
|
const modal = page.getByRole('dialog', { name: 'Reset your password' });
|
|
await expect(modal).toBeVisible();
|
|
await expect(page).toHaveURL(/\/forgot-password/);
|
|
|
|
await modal.getByRole('button', { name: 'Sign in' }).click();
|
|
await expect(page.getByRole('dialog', { name: 'Log in' })).toBeVisible();
|
|
});
|
|
});
|