diff --git a/e2e/journeys/j1-registration-login.spec.ts b/e2e/journeys/j1-registration-login.spec.ts index a811cc8..53cd7e0 100644 --- a/e2e/journeys/j1-registration-login.spec.ts +++ b/e2e/journeys/j1-registration-login.spec.ts @@ -4,7 +4,7 @@ import { mockAuthRoutes } from '../fixtures'; const uniqueEmail = () => `betty+e2e-${Date.now()}@cartsnitch.test`; test.describe('J1: Registration and Login', () => { - test('can register a new account and see check your email screen', async ({ page }) => { + test('shows success message after registration', async ({ page }) => { await mockAuthRoutes(page, false); await page.goto('/register'); await page.fill('[placeholder="Full Name"]', 'Betty Tester'); @@ -12,7 +12,8 @@ test.describe('J1: Registration and Login', () => { await page.fill('[placeholder="Password (min. 8 characters)"]', 'TestPass123!'); await page.click('button[type="submit"]'); - await expect(page.getByRole('heading', { name: /check your email/i })).toBeVisible(); + // Registration now shows "Account created! Please sign in." message + await expect(page.locator('.bg-red-50')).toContainText('Account created! Please sign in.'); }); test('shows validation error when registration fields are empty', async ({ page }) => { @@ -30,8 +31,16 @@ test.describe('J1: Registration and Login', () => { await expect(page.getByRole('heading', { name: /cartsnitch/i })).toBeVisible(); }); - test('can sign in with credentials and land on dashboard', async ({ page }) => { + test('can sign in with valid credentials', async ({ page }) => { await mockAuthRoutes(page, true); + const email = uniqueEmail(); + await page.goto('/register'); + await page.fill('[placeholder="Full Name"]', 'Login Betty'); + await page.fill('[placeholder="Email"]', email); + await page.fill('[placeholder="Password (min. 8 characters)"]', 'TestPass123!'); + await page.click('button[type="submit"]'); + await expect(page.locator('.bg-red-50')).toContainText('Account created! Please sign in.'); + await page.goto('/login'); await page.fill('[placeholder="Email"]', 'test@cartsnitch.test'); await page.fill('[placeholder="Password"]', 'TestPass123!'); diff --git a/package-lock.json b/package-lock.json index f15c280..c0a67c2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8164,9 +8164,9 @@ } }, "node_modules/postcss": { - "version": "8.5.8", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.8.tgz", - "integrity": "sha512-OW/rX8O/jXnm82Ey1k44pObPtdblfiuWnrd8X7GJ7emImCOstunGbXUpp7HdBrFQX6rJzn3sPT397Wp5aCwCHg==", + "version": "8.5.13", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.13.tgz", + "integrity": "sha512-qif0+jGGZoLWdHey3UFHHWP0H7Gbmsk8T5VEqyYFbWqPr1XqvLGBbk/sl8V5exGmcYJklJOhOQq1pV9IcsiFag==", "devOptional": true, "funding": [ { diff --git a/src/pages/Login.tsx b/src/pages/Login.tsx index 3d288fa..02e2637 100644 --- a/src/pages/Login.tsx +++ b/src/pages/Login.tsx @@ -1,14 +1,12 @@ import { useState } from 'react' import { Link } from 'react-router-dom' import { authClient } from '../lib/auth-client.ts' -import { useAuthStore } from '../stores/auth.ts' export function Login() { const [email, setEmail] = useState('') const [password, setPassword] = useState('') const [error, setError] = useState('') const [loading, setLoading] = useState(false) - const setAuthenticated = useAuthStore((s) => s.setAuthenticated) async function handleSubmit(e: React.FormEvent) { e.preventDefault() @@ -40,12 +38,7 @@ export function Login() { setError('Sign in failed. Please try again.') } } catch { - if (import.meta.env.VITE_MOCK_AUTH === 'true') { - setAuthenticated(true) - window.location.href = '/' - } else { - setError('Invalid email or password. Please try again.') - } + setError('Invalid email or password. Please try again.') } finally { setLoading(false) } diff --git a/src/pages/Register.tsx b/src/pages/Register.tsx index a36e7c5..2c298ac 100644 --- a/src/pages/Register.tsx +++ b/src/pages/Register.tsx @@ -8,9 +8,6 @@ export function Register() { const [password, setPassword] = useState('') const [error, setError] = useState('') const [loading, setLoading] = useState(false) - const [registrationComplete, setRegistrationComplete] = useState(false) - const [resendLoading, setResendLoading] = useState(false) - const [resendMessage, setResendMessage] = useState('') async function handleSubmit(e: React.FormEvent) { e.preventDefault() @@ -38,7 +35,7 @@ export function Register() { throw new Error(authError.message ?? 'Registration failed') } - setRegistrationComplete(true) + setError('Account created! Please sign in.') } catch { setError('Registration failed. Please try again.') } finally { @@ -46,49 +43,6 @@ export function Register() { } } - async function handleResendVerification() { - setResendLoading(true) - setResendMessage('') - try { - const { error } = await authClient.sendVerificationEmail({ email }) - if (error) { - setResendMessage('Failed to resend. Please try again.') - } else { - setResendMessage('Verification email sent!') - } - } finally { - setResendLoading(false) - } - } - - if (registrationComplete) { - return ( -
- We sent a verification link to {email}. Click it to activate your account. -
- - {resendMessage && ( -{resendMessage}
- )} -- Already have an account?{' '} - - Sign in - -
-