wmj
33a821e61d
Implements the researched IA fix: mobile nav UX consensus caps primary destinations at 4-5 (uxpin.com, fintech/banking 2026 UX research), and this app had grown to 22 tabs in one horizontally-scrolling row — exactly the anti-pattern that research flags for choice paralysis and slower task completion. New structure — 5 bottom-nav hubs, grouped by what the user is actually trying to do, not build order: - Home: Coverage (unchanged, still the landing screen) - Estate: Assets, Faraid, Insurance, Wassiyah, Hibah, Family Waqf, Nominate, Claims (H2) - Giving: Zakat, Sadaqah, Khairat - Family: Tree, Trigger, Mutawalli, Manage (was 'Family', renamed to avoid colliding with the hub's own label), Neighbourhood - Daily: Prayer Times, Qibla, Quran, Locate Each hub reveals its own sub-nav one tap in, instead of every tab competing for space in a single row. Settings moved out of the tab strip entirely into a header gear icon, matching the banking-app pattern of keeping settings out of primary thumb-reach real estate. The bottom nav is now fixed (thumb-zone), sub-nav keeps the old sticky-top position. Cross-component navigation (nav.js requestedTab, used by the Family Tree's 'give sadaqah in memory' link) now resolves a tab label to its owning (hub, sub-tab) pair instead of a flat index — verified live. This touches every E2E suite: a single click on a tab's old selector no longer reaches it (hub, then sub-tab). Added a shared gotoTab(page, label) helper to e2e-auth-helper.cjs encapsulating the two-step navigation, and migrated all ~22 affected test files off direct nav-button selectors — mechanical substitution followed by manual fixes for local clickTab wrappers, template-literal selectors, and active-state assertions that needed to target the new .hub-tab/.subnav structure specifically. Full regression after migration: every suite passes (one isolated Family Tree flake confirmed clean on rerun, unrelated to navigation).
59 lines
2.9 KiB
JavaScript
59 lines
2.9 KiB
JavaScript
// Shared sign-in prelude for the pre-auth-gate E2E suites. Each suite creates
|
|
// its own fresh family per run (unique name) so accumulated data from a
|
|
// previous run's assets/hibah/etc. can never bleed into another run's
|
|
// percentage/coverage assertions — same isolation the old per-context
|
|
// localStorage gave for free, now done explicitly since data is shared and
|
|
// persistent in Supabase instead of wiped with the browser context.
|
|
const OWNER_EMAIL = 'nurfalah.e2etest.owner@gmail.com';
|
|
const OWNER_PASSWORD = 'TestPassword123!';
|
|
|
|
async function signInFreshFamily(page, BASE, familyLabel) {
|
|
await page.goto(BASE, { waitUntil: 'networkidle' });
|
|
await page.locator('.field:has-text("Email") input').fill(OWNER_EMAIL);
|
|
await page.locator('.field:has-text("Password") input').fill(OWNER_PASSWORD);
|
|
await page.locator('button.btn-primary', { hasText: 'Sign in' }).click();
|
|
await page.waitForTimeout(1500);
|
|
|
|
const familyName = `${familyLabel || 'E2E'} ${Date.now()}-${Math.floor(Math.random() * 1e6)}`;
|
|
await page.locator('.field:has-text("Family name") input').fill(familyName);
|
|
await page.locator('button.btn-primary', { hasText: 'Create family' }).click();
|
|
await page.waitForTimeout(1200);
|
|
|
|
return familyName;
|
|
}
|
|
|
|
// Hub map mirroring App.svelte's HUBS config — the nav went from a single
|
|
// flat 22-item strip to 5 bottom-nav hubs, each revealing its own sub-nav.
|
|
// Reaching any given tab is now a two-step click (hub, then sub-tab)
|
|
// instead of one, so every test goes through this helper rather than
|
|
// hardcoding the old single-click selector.
|
|
const HUB_OF_TAB = {
|
|
'Coverage': 'Home',
|
|
'Assets': 'Estate', 'Faraid': 'Estate', 'Insurance': 'Estate', 'Wassiyah': 'Estate',
|
|
'Hibah': 'Estate', 'Family Waqf': 'Estate', 'Nominate': 'Estate', 'Claims (H2)': 'Estate',
|
|
'Zakat': 'Giving', 'Sadaqah': 'Giving', 'Khairat': 'Giving',
|
|
'Tree': 'Family', 'Trigger': 'Family', 'Mutawalli': 'Family', 'Manage': 'Family', 'Neighbourhood': 'Family',
|
|
'Prayer Times': 'Daily', 'Qibla': 'Daily', 'Quran': 'Daily', 'Locate': 'Daily'
|
|
};
|
|
|
|
/** Navigates to a tab by its old flat label — clicks the owning hub first (if not already active), then the sub-tab. 'Settings' is a special case (a header icon, not a hub). */
|
|
async function gotoTab(page, label) {
|
|
if (label === 'Settings') {
|
|
await page.locator('button[aria-label="Settings"]').click();
|
|
return;
|
|
}
|
|
const hub = HUB_OF_TAB[label];
|
|
if (!hub) throw new Error(`gotoTab: unknown tab label "${label}"`);
|
|
const hubBtn = page.locator(`.hub-tab[aria-label="${hub}"]`);
|
|
const alreadyActive = await hubBtn.evaluate(el => el.classList.contains('active')).catch(() => false);
|
|
if (!alreadyActive) {
|
|
await hubBtn.click();
|
|
await page.waitForTimeout(200);
|
|
}
|
|
if (hub !== 'Home') {
|
|
await page.locator(`.subnav .tab[aria-label="${label}"]`).click();
|
|
}
|
|
}
|
|
|
|
module.exports = { signInFreshFamily, OWNER_EMAIL, OWNER_PASSWORD, gotoTab };
|