Skip to content

Commit 5c7c5d0

Browse files
claudfuenclaudfuen
authored
Merge pull request #1099 from trycompai/claudio/iterate-onboarding
[dev] [claudfuen] claudio/iterate-onboarding
2 parents 2cab2e4 + cb31f22 commit 5c7c5d0

3 files changed

Lines changed: 154 additions & 22 deletions

File tree

‎apps/app/e2e/tests/middleware-onboarding.spec.ts‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
import { expect, test } from '@playwright/test';
2+
import { authenticateTestUser, clearAuth } from '../utils/auth-helpers';
3+
import { generateTestData } from '../utils/helpers';
4+
5+
test.describe('Middleware Onboarding Behavior', () => {
6+
test.beforeEach(async ({ page }) => {
7+
await clearAuth(page);
8+
});
9+
10+
test('user with null onboardingCompleted is NOT redirected to onboarding', async ({ page }) => {
11+
const testData = generateTestData();
12+
13+
// Create user with org (onboardingCompleted will be null by default)
14+
await authenticateTestUser(page, {
15+
email: testData.email,
16+
name: testData.userName,
17+
skipOrg: false, // Creates org with null onboardingCompleted
18+
});
19+
20+
// Try to access organization page
21+
await page.goto('/');
22+
23+
// Should NOT be redirected to onboarding
24+
await page.waitForTimeout(2000); // Give time for any redirects
25+
expect(page.url()).not.toContain('/onboarding');
26+
27+
// Should be on an authenticated page (org page, frameworks, etc)
28+
const isOnOrgPage =
29+
page.url().includes('/org_') ||
30+
page.url().includes('/frameworks') ||
31+
page.url().includes('/setup');
32+
expect(isOnOrgPage).toBeTruthy();
33+
});
34+
35+
test('user without org is redirected to setup', async ({ page }) => {
36+
const testData = generateTestData();
37+
38+
// Create user without org
39+
await authenticateTestUser(page, {
40+
email: testData.email,
41+
name: testData.userName,
42+
skipOrg: true,
43+
});
44+
45+
// Navigate to root
46+
await page.goto('/');
47+
48+
// Should be redirected to setup
49+
await page.waitForURL(/\/setup\/[a-zA-Z0-9]+/, { timeout: 10000 });
50+
expect(page.url()).toContain('/setup/');
51+
});
52+
53+
test('unauthenticated user is redirected to auth', async ({ page }) => {
54+
// Try to access protected route without auth
55+
await page.goto('/org_123/frameworks');
56+
57+
// Should be redirected to auth
58+
await page.waitForURL(/\/auth/, { timeout: 5000 });
59+
expect(page.url()).toContain('/auth');
60+
});
61+
});

‎apps/app/e2e/tests/onboarding.spec.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,8 @@ test.describe('Onboarding Flow', () => {
269269
await secondNextButton.click();
270270

271271
// Next button should be disabled when website is empty
272-
await expect(page.locator('button:has-text("Next")')).toBeDisabled();
272+
const nextButton = page.locator('button:has-text("Next")');
273+
await expect(nextButton).toBeDisabled();
273274

274275
// Fill website with simple text (will become valid with .com added)
275276
await fillFormField(page, 'input[name="website"]', 'testwebsite');

‎apps/app/e2e/tests/split-onboarding.spec.ts‎

Lines changed: 91 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,55 @@
11
import { expect, test } from '@playwright/test';
2+
import { authenticateTestUser, clearAuth } from '../utils/auth-helpers';
23
import { generateTestData } from '../utils/helpers';
34

45
test.describe('Split Onboarding Flow', () => {
6+
test.beforeEach(async ({ page }) => {
7+
// Clear any existing auth state
8+
await clearAuth(page);
9+
});
10+
511
test('new user completes split onboarding: 3 steps → payment → 9 steps → product access', async ({
612
page,
713
}) => {
814
const testData = generateTestData();
915
const website = `example${Date.now()}.com`;
1016

11-
// Start at setup
17+
// Authenticate user first
18+
await authenticateTestUser(page, {
19+
email: testData.email,
20+
name: testData.userName,
21+
skipOrg: true, // Don't create org, user will go through setup
22+
});
23+
24+
// Navigate to setup
1225
await page.goto('/setup');
1326

27+
// Should redirect to /setup/[setupId]
28+
await page.waitForURL(/\/setup\/[a-zA-Z0-9]+/, { timeout: 10000 });
29+
30+
// Wait for content to load
31+
await page.waitForLoadState('networkidle', { timeout: 10000 }).catch(() => {});
32+
1433
// Step 1: Select framework
15-
await expect(page.getByText('Which compliance frameworks do you need?')).toBeVisible();
16-
await page.getByRole('checkbox', { name: 'SOC 2' }).click();
34+
await expect(page.locator('text=/compliance frameworks/i').first()).toBeVisible({
35+
timeout: 10000,
36+
});
37+
38+
// Check if framework is already selected, if not select one
39+
const checkedFrameworks = await page.locator('input[type="checkbox"]:checked').count();
40+
if (checkedFrameworks === 0) {
41+
await page.locator('label:has-text("SOC 2")').click();
42+
}
1743
await page.getByRole('button', { name: 'Next' }).click();
1844

1945
// Step 2: Organization name
20-
await expect(page.getByText("What's your organization's name?")).toBeVisible();
21-
await page.getByPlaceholder("Enter your organization's name").fill(testData.organizationName);
46+
await page.waitForSelector('input[name="organizationName"]', { timeout: 10000 });
47+
await page.locator('input[name="organizationName"]').fill(testData.organizationName);
2248
await page.getByRole('button', { name: 'Next' }).click();
2349

2450
// Step 3: Website
25-
await expect(page.getByText("What's your organization's domain?")).toBeVisible();
26-
await page.getByPlaceholder('example.com').fill(website);
51+
await page.waitForSelector('input[name="website"]', { timeout: 10000 });
52+
await page.locator('input[name="website"]').fill(website);
2753
await page.getByRole('button', { name: 'Next' }).click();
2854

2955
// Should redirect to upgrade page
@@ -92,13 +118,32 @@ test.describe('Split Onboarding Flow', () => {
92118
const testData = generateTestData();
93119
const website = `example${Date.now()}.com`;
94120

121+
// Authenticate user first
122+
await authenticateTestUser(page, {
123+
email: testData.email,
124+
name: testData.userName,
125+
skipOrg: true,
126+
});
127+
95128
// First create org through minimal flow
96129
await page.goto('/setup');
97-
await page.getByRole('checkbox', { name: 'SOC 2' }).click();
130+
await page.waitForURL(/\/setup\/[a-zA-Z0-9]+/, { timeout: 10000 });
131+
132+
// Select framework
133+
const checkedFrameworks = await page.locator('input[type="checkbox"]:checked').count();
134+
if (checkedFrameworks === 0) {
135+
await page.locator('label:has-text("SOC 2")').click();
136+
}
98137
await page.getByRole('button', { name: 'Next' }).click();
99-
await page.getByPlaceholder("Enter your organization's name").fill(testData.organizationName);
138+
139+
// Fill organization name
140+
await page.waitForSelector('input[name="organizationName"]', { timeout: 10000 });
141+
await page.locator('input[name="organizationName"]').fill(testData.organizationName);
100142
await page.getByRole('button', { name: 'Next' }).click();
101-
await page.getByPlaceholder('example.com').fill(website);
143+
144+
// Fill website
145+
await page.waitForSelector('input[name="website"]', { timeout: 10000 });
146+
await page.locator('input[name="website"]').fill(website);
102147
await page.getByRole('button', { name: 'Next' }).click();
103148

104149
const orgIdMatch = page.url().match(/org_[a-zA-Z0-9]+/);
@@ -129,12 +174,31 @@ test.describe('Split Onboarding Flow', () => {
129174
const firstOrg = generateTestData();
130175
const firstWebsite = `example${Date.now()}.com`;
131176

177+
// Authenticate user first
178+
await authenticateTestUser(page, {
179+
email: firstOrg.email,
180+
name: firstOrg.userName,
181+
skipOrg: true,
182+
});
183+
132184
await page.goto('/setup');
133-
await page.getByRole('checkbox', { name: 'SOC 2' }).click();
185+
await page.waitForURL(/\/setup\/[a-zA-Z0-9]+/, { timeout: 10000 });
186+
187+
// Select framework
188+
const checkedFrameworks = await page.locator('input[type="checkbox"]:checked').count();
189+
if (checkedFrameworks === 0) {
190+
await page.locator('label:has-text("SOC 2")').click();
191+
}
134192
await page.getByRole('button', { name: 'Next' }).click();
135-
await page.getByPlaceholder("Enter your organization's name").fill(firstOrg.organizationName);
193+
194+
// Fill organization name
195+
await page.waitForSelector('input[name="organizationName"]', { timeout: 10000 });
196+
await page.locator('input[name="organizationName"]').fill(firstOrg.organizationName);
136197
await page.getByRole('button', { name: 'Next' }).click();
137-
await page.getByPlaceholder('example.com').fill(firstWebsite);
198+
199+
// Fill website
200+
await page.waitForSelector('input[name="website"]', { timeout: 10000 });
201+
await page.locator('input[name="website"]').fill(firstWebsite);
138202
await page.getByRole('button', { name: 'Next' }).click();
139203

140204
const firstOrgIdMatch = page.url().match(/org_[a-zA-Z0-9]+/);
@@ -144,22 +208,28 @@ test.describe('Split Onboarding Flow', () => {
144208
// Now create additional org using dropdown
145209
await page.goto(`/upgrade/${firstOrgId}`);
146210

147-
// Open org switcher
148-
await page.getByRole('button', { name: firstOrg.organizationName }).click();
149-
await page.getByText('Create Organization').click();
211+
// Try navigating directly to setup with intent
212+
await page.goto('/setup?intent=create-additional');
150213

151-
// Should be at setup with intent
152-
await expect(page).toHaveURL('/setup?intent=create-additional');
214+
// Should redirect to /setup/[setupId] with intent preserved
215+
await page.waitForURL(/\/setup\/[a-zA-Z0-9]+\?intent=create-additional/, { timeout: 10000 });
153216

154217
// Complete setup for second org
155218
const secondOrg = generateTestData();
156219
const secondWebsite = `example${Date.now() + 1}.com`;
157220

158-
await page.getByRole('checkbox', { name: 'ISO 27001' }).click();
221+
// Select a different framework
222+
await page.locator('label:has-text("ISO 27001")').click();
159223
await page.getByRole('button', { name: 'Next' }).click();
160-
await page.getByPlaceholder("Enter your organization's name").fill(secondOrg.organizationName);
224+
225+
// Fill organization name
226+
await page.waitForSelector('input[name="organizationName"]', { timeout: 10000 });
227+
await page.locator('input[name="organizationName"]').fill(secondOrg.organizationName);
161228
await page.getByRole('button', { name: 'Next' }).click();
162-
await page.getByPlaceholder('example.com').fill(secondWebsite);
229+
230+
// Fill website
231+
await page.waitForSelector('input[name="website"]', { timeout: 10000 });
232+
await page.locator('input[name="website"]').fill(secondWebsite);
163233
await page.getByRole('button', { name: 'Next' }).click();
164234

165235
// Should redirect to upgrade for the new org

0 commit comments

Comments
 (0)