Adds browser tests for the page without JavaScript

The tests cover every page without JavaScript, the menu by keyboard and pointer,
the fade-in at load and on scroll, and image requests per width. They found that
the closed menu's shoot links could take focus, which is fixed here.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-10-31 23:50:17 +01:00
co-authored by Claude Opus 5.5
parent 01fcfeefea
commit 2754890370
13 changed files with 1229 additions and 23 deletions
+211
View File
@@ -0,0 +1,211 @@
// @vitest-environment jsdom
import { afterAll, beforeAll, describe, expect, it } from 'vitest';
import siteContent from '../src/content/siteContent.ts';
import { emailAddress } from '../src/lib/emailAddress.ts';
import type { RoutePath } from '../src/navigation.ts';
import sitePages from '../src/sitePages.ts';
import { startServer } from './support/server.ts';
// BR-PRE-04, BR-NAV-02, V-D11: wat er in de rauwe HTML van elke pagina staat
// over de CSS zonder JavaScript, de preloads en de noscript-tweelingen. Alleen
// `fetch` van de preview-server; DOMParser is hier de enige parser (hij voert
// niets uit en leest noscript-inhoud als markup).
let server: Awaited<ReturnType<typeof startServer>>;
beforeAll(async () => {
server = await startServer();
});
afterAll(() => server.close());
async function fetchDocument(path: string) {
const response = await fetch(server.origin + path);
expect(response.status).toBe(200);
const html = await response.text();
return {
html,
document: new DOMParser().parseFromString(html, 'text/html'),
};
}
// Zelfde vormen als in rawHtml.e2e.ts
function addressForms(address: string) {
const [user, domain] = address.split('@');
return [address, `${user}%40${domain}`, `${user}&#64;${domain}`].map(
(form) => form.toLowerCase(),
);
}
const preloads = (document: Document) => [
...document.querySelectorAll<HTMLLinkElement>(
'link[rel="preload"][as="image"]',
),
];
const isLogo = (link: Element) => /\/logo-/.test(link.getAttribute('href')!);
const photoPreloads = (document: Document) =>
preloads(document).filter((link) => !isLogo(link));
const priorityPages: RoutePath[] = [
'/',
'/over-mij',
'/soorten-fotoshoots',
'/soorten-fotoshoots/newborn',
'/soorten-fotoshoots/zwangerschap',
'/soorten-fotoshoots/gezin',
'/soorten-fotoshoots/loveshoot',
'/soorten-fotoshoots/portret',
];
const paths = [...(Object.keys(sitePages) as RoutePath[]), '/404.html'];
describe.each(paths)('display-HTML van %s', (path) => {
it('heeft één noscript met één stijl in de head, zonder adres of verwijzing', async () => {
const { html, document } = await fetchDocument(path);
const noscripts = document.head.querySelectorAll('noscript');
expect(noscripts).toHaveLength(1);
const styles = noscripts[0].querySelectorAll('style');
expect(styles).toHaveLength(1);
const css = styles[0].textContent ?? '';
expect(css.length).toBeGreaterThan(0);
expect(css).not.toContain('</');
expect(css).not.toContain('url(');
expect(css).not.toContain('@import');
const address = emailAddress(siteContent.email);
expect(address).toBeTruthy();
for (const form of addressForms(address!)) {
expect(html.toLowerCase()).not.toContain(form);
}
expect(html).not.toContain('data-reveal="hidden"');
});
it('noemt elke foto in hoogstens één preload', async () => {
const { document } = await fetchDocument(path);
const hrefs = preloads(document).map((link) =>
link.getAttribute('href'),
);
expect(new Set(hrefs).size).toBe(hrefs.length);
});
it('geeft elke uitgestelde foto een noscript-tweeling met dezelfde alt', async () => {
const { document } = await fetchDocument(path);
const deferred = [
...document.body.querySelectorAll('img[data-deferred]'),
];
for (const image of deferred) {
const twin = image.nextElementSibling;
expect(twin?.tagName).toBe('NOSCRIPT');
const twinImage = twin!.querySelector('img');
expect(twinImage).not.toBeNull();
expect(twinImage!.getAttribute('alt')).toBe(
image.getAttribute('alt'),
);
expect(twinImage!.getAttribute('src')).toBeTruthy();
expect(image.hasAttribute('src')).toBe(false);
}
});
it('preloadt niets dat lazy is of alleen een tweeling is', async () => {
const { document } = await fetchDocument(path);
const linkFor = (src: string | null) =>
preloads(document).filter(
(link) => link.getAttribute('href') === src,
);
// Een lazy foto wordt door React niet gepreload en mag ook geen
// expliciete link hebben, tenzij een niet-lazy img (het donkere logo
// in de header en in de footer) hetzelfde bestand gebruikt
const eager = new Set(
[...document.body.querySelectorAll('img[src]')]
.filter(
(image) =>
image.getAttribute('loading') !== 'lazy' &&
!image.closest('noscript'),
)
.map((image) => image.getAttribute('src')),
);
for (const lazy of document.body.querySelectorAll(
'img[loading="lazy"][src]',
)) {
const src = lazy.getAttribute('src');
if (eager.has(src)) continue;
expect(linkFor(src)).toHaveLength(0);
}
// Een tweeling krijgt van React geen preload. Alleen een expliciete
// link met media (de eerste rij van /portfolio, BR-PRE-11) noemt
// dezelfde foto, want die is aan dezelfde breedte gebonden als de
// <source> van de tegel.
for (const twin of document.body.querySelectorAll('noscript img')) {
for (const link of linkFor(twin.getAttribute('src'))) {
expect(path).toBe('/portfolio');
expect(link.getAttribute('media')).toBeTruthy();
}
}
});
it('preloadt het lichte logo alleen op de homepage', async () => {
const { document } = await fetchDocument(path);
const light = preloads(document).filter((link) =>
/\/logo-light-/.test(link.getAttribute('href')!),
);
expect(light).toHaveLength(path === '/' ? 1 : 0);
});
});
describe.each(priorityPages)('prioriteitsfoto van %s', (path) => {
it('heeft zijn preload met fetchpriority high, uit dezelfde src als de img', async () => {
const { document } = await fetchDocument(path);
const body = document.body.cloneNode(true) as HTMLElement;
for (const node of body.querySelectorAll('noscript')) node.remove();
const prioritized = [
...body.querySelectorAll('img[fetchpriority="high"][src]'),
].filter((image) => !image.closest('picture'));
expect(prioritized.length).toBeGreaterThan(0);
for (const image of prioritized) {
const links = preloads(document).filter(
(link) =>
link.getAttribute('href') === image.getAttribute('src'),
);
expect(links).toHaveLength(1);
expect(links[0].getAttribute('fetchpriority')).toBe('high');
expect(links[0].hasAttribute('media')).toBe(false);
}
});
});
describe('preloads van /contact', () => {
it('heeft één media-link voor de foto naast het formulier en geen andere voor dat bestand', async () => {
const { document } = await fetchDocument('/contact');
const source = document.body.querySelector('picture source[srcset]');
expect(source).not.toBeNull();
const aside = source!.getAttribute('srcset');
const links = preloads(document).filter(
(link) => link.getAttribute('href') === aside,
);
expect(links).toHaveLength(1);
expect(links[0].getAttribute('media')).toBe('(min-width: 64em)');
expect(links[0].getAttribute('fetchpriority')).toBe('high');
expect(photoPreloads(document)).toHaveLength(1);
});
});
describe('preloads van /portfolio', () => {
it('heeft de React-link voor tegel 1 en twee media-links voor twee andere foto’s', async () => {
const { document } = await fetchDocument('/portfolio');
const links = photoPreloads(document);
const plain = links.filter((link) => !link.hasAttribute('media'));
const bound = links.filter((link) => link.hasAttribute('media'));
expect(plain).toHaveLength(1);
expect(plain[0].getAttribute('fetchpriority')).toBe('high');
expect(bound.map((link) => link.getAttribute('media'))).toEqual([
'(min-width: 48em)',
'(min-width: 64em)',
]);
expect(
new Set(
[...plain, ...bound].map((link) => link.getAttribute('href')),
).size,
).toBe(3);
// De React-link is de src van de eerste tegel
const first = document.querySelector(
'[data-testid="portfolio-tile-1"] img',
);
expect(first?.getAttribute('src')).toBe(plain[0].getAttribute('href'));
});
});
+295
View File
@@ -0,0 +1,295 @@
import { afterAll, beforeAll, describe, expect, it } from 'vitest';
import type { Page } from 'playwright-core';
import sitePages from '../src/sitePages.ts';
import { openPage, waitForHydration } from './support/browser.ts';
import { startServer } from './support/server.ts';
// FR-PR-11, FR-PR-21, V-D13, V-D15: welke foto's de browser opvraagt, wanneer
// en hoe vaak, per breedte. Het verzoeklogboek komt van page.on('request').
let server: Awaited<ReturnType<typeof startServer>>;
beforeAll(async () => {
server = await startServer();
});
afterAll(() => server.close());
interface Logged {
url: string;
// Aangevraagd voor de load-gebeurtenis
beforeLoad: boolean;
}
const isPhoto = (url: string) =>
/\/assets\/.*\.(jpe?g|png|webp|avif)$/.test(new URL(url).pathname) &&
!/\/logo-/.test(url);
// Logboek van de afbeeldingsverzoeken, vanaf de allereerste navigatie
function track() {
const log: Logged[] = [];
let loaded = false;
return {
log,
prepare: async (page: Page) => {
page.on('load', () => (loaded = true));
page.on('request', (request) => {
if (request.resourceType() !== 'image') return;
log.push({ url: request.url(), beforeLoad: !loaded });
});
},
};
}
const counts = (log: Logged[]) => {
const map = new Map<string, number>();
for (const { url } of log) map.set(url, (map.get(url) ?? 0) + 1);
return map;
};
// Scrolt de hele pagina door, zodat elke uitgestelde foto in de buurt komt
async function scrollThrough(page: Page) {
const height = await page.evaluate(() => document.body.scrollHeight);
const step = await page.evaluate(() => Math.floor(window.innerHeight / 2));
for (let y = 0; y <= height; y += step) {
await page.evaluate(
(top) => window.scrollTo({ top, behavior: 'instant' }),
y,
);
await page.waitForTimeout(150);
}
await page.waitForLoadState('networkidle');
}
const preloadInfo = (page: Page) =>
page.evaluate(() =>
[
...document.querySelectorAll<HTMLLinkElement>(
'link[rel="preload"][as="image"]',
),
]
.filter((link) => !/\/logo-/.test(link.href))
.map((link) => ({
href: link.href,
matches: matchMedia(link.media || 'all').matches,
})),
);
const displayedSources = (page: Page) =>
page.evaluate(() =>
[...document.querySelectorAll('img')]
.filter((image) => image.getClientRects().length > 0)
.map((image) => image.currentSrc)
.filter(Boolean),
);
const widths = [
{ width: 390, height: 844 },
{ width: 768, height: 1024 },
{ width: 1350, height: 940 },
];
describe('de tweeling wordt met JavaScript niet opgevraagd', () => {
it.each(['/soorten-fotoshoots', '/portfolio'])(
"%s vraagt voor de load alleen foto's op die in de eerste rij, in een preload of in een src staan, en daarna elke foto één keer",
async (path) => {
const requests = track();
const { page, ...opened } = await openPage(server.origin + path, {
width: 1350,
height: 940,
prepare: requests.prepare,
});
await page.waitForTimeout(500);
const early = requests.log
.filter((entry) => isPhoto(entry.url))
.map((r) => r.url);
const allowed = new Set([
...(await preloadInfo(page)).map((link) => link.href),
...(await displayedSources(page)),
]);
expect(early.length).toBeGreaterThan(0);
for (const url of early) expect(allowed).toContain(url);
await scrollThrough(page);
const total = counts(
requests.log.filter((entry) => isPhoto(entry.url)),
);
expect(total.size).toBeGreaterThanOrEqual(early.length);
for (const [url, count] of total) {
expect(count, url).toBe(1);
}
expect(opened.messages).toEqual([]);
},
);
});
describe('preloads per breedte', () => {
const expected = (path: string, width: number) => {
if (path === '/portfolio')
return width >= 1024 ? 3 : width >= 768 ? 2 : 1;
if (path === '/contact') return width >= 1024 ? 1 : 0;
return 1;
};
const preloadPages = Object.keys(sitePages).filter(
(path) => path !== '/privacyverklaring',
);
it.each(widths)(
'geeft elke pagina het juiste aantal passende preloads, gebruikt en niet dubbel opgevraagd ($width px)',
async (size) => {
for (const path of preloadPages) {
const requests = track();
const { page } = await openPage(server.origin + path, {
...size,
prepare: requests.prepare,
});
await page.waitForLoadState('networkidle');
const matching = (await preloadInfo(page)).filter(
(link) => link.matches,
);
expect(matching.length, `${path} bij ${size.width}`).toBe(
expected(path, size.width),
);
const shown = await displayedSources(page);
const asked = counts(requests.log);
for (const link of matching) {
expect(shown, `${path} gebruikt ${link.href}`).toContain(
link.href,
);
expect(asked.get(link.href), link.href).toBe(1);
}
}
},
);
});
describe('/contact', () => {
it('vraagt de foto naast het formulier op vanaf lg en nooit eronder, en het portret niet vanaf lg', async () => {
const wide = track();
const { page } = await openPage(server.origin + '/contact', {
width: 1350,
height: 940,
prepare: wide.prepare,
});
await page.waitForLoadState('networkidle');
const urls = await page.evaluate(() => ({
aside: (
document.querySelector('picture source[srcset]') as
HTMLSourceElement | undefined
)?.srcset,
portrait: [
...document.querySelectorAll<HTMLImageElement>(
'img[loading="lazy"]',
),
]
.filter((image) => !/\/logo-/.test(image.src))
.map((image) => image.src),
}));
expect(urls.aside).toBeTruthy();
const asked = counts(wide.log);
expect(asked.get(new URL(urls.aside!, server.origin).href)).toBe(1);
expect(urls.portrait.length).toBeGreaterThan(0);
for (const portrait of urls.portrait) {
expect(asked.get(portrait)).toBeUndefined();
}
const narrow = track();
const mobile = await openPage(server.origin + '/contact', {
width: 390,
height: 844,
prepare: narrow.prepare,
});
await mobile.page.waitForLoadState('networkidle');
expect(
counts(narrow.log).get(new URL(urls.aside!, server.origin).href),
).toBeUndefined();
});
});
describe("logo's", () => {
it('vraagt het lichte logo alleen op de homepage op', async () => {
for (const path of Object.keys(sitePages)) {
const requests = track();
const { page } = await openPage(server.origin + path, {
width: 1350,
height: 940,
prepare: requests.prepare,
});
await page.waitForLoadState('networkidle');
const light = requests.log.filter((entry) =>
/\/logo-light-/.test(entry.url),
);
expect(light.length, path).toBe(path === '/' ? 1 : 0);
}
});
});
describe('de eerste rij van /portfolio (V-D13)', () => {
it.each(widths)(
"heeft evenveel kolommen als eager foto's voor de load ($width px)",
async (size) => {
const requests = track();
const { page, ...opened } = await openPage(
server.origin + '/portfolio',
{ ...size, prepare: requests.prepare },
);
await page.waitForTimeout(500);
const columns = await page
.locator('[data-testid^="portfolio-tile-"]')
.evaluateAll((tiles) => {
const rects = tiles.map((tile) =>
tile.getBoundingClientRect(),
);
const top = Math.min(...rects.map((rect) => rect.top));
return new Set(
rects
.filter((rect) => Math.abs(rect.top - top) < 1)
.map((rect) => Math.round(rect.left)),
).size;
});
expect(columns).toBe(
size.width >= 1024 ? 3 : size.width >= 768 ? 2 : 1,
);
await scrollThrough(page);
const gridPhotos = new Set(
await page
.getByTestId('portfolio-grid')
.locator('img')
.evaluateAll((images) =>
images
.map((image) => (image as HTMLImageElement).src)
.filter(Boolean),
),
);
expect(gridPhotos.size).toBeGreaterThan(columns);
const before = requests.log.filter(
(entry) => entry.beforeLoad && gridPhotos.has(entry.url),
);
expect(before).toHaveLength(columns);
for (const [url, count] of counts(requests.log)) {
if (gridPhotos.has(url)) expect(count, url).toBe(1);
}
expect(opened.messages).toEqual([]);
},
);
});
describe('/portfolio?shoot= (V-D15)', () => {
it('vraagt geen enkele afbeelding twee keer op nadat het filter is toegepast', async () => {
const requests = track();
const { page, ...opened } = await openPage(
server.origin + '/portfolio?shoot=gezin',
{ width: 1350, height: 940, prepare: requests.prepare },
);
const tiles = page.locator('[data-testid^="portfolio-tile-"]');
const before = await tiles.count();
await waitForHydration(page);
await expect
.poll(() => tiles.count(), { timeout: 15_000, interval: 100 })
.toBeLessThan(before);
await scrollThrough(page);
for (const [url, count] of counts(requests.log)) {
expect(count, url).toBe(1);
}
expect(opened.messages).toEqual([]);
});
});
+3 -2
View File
@@ -168,8 +168,9 @@ describe('structured data en CSP (BR-SCR-22)', () => {
// V15: de stijlen staan in de HTML, de pagina springt niet bij de hydratatie.
// Een screenshotvergelijking met en zonder JavaScript gaat naar
// E2E_SCREENSHOT_DIR (alleen als die gezet is); er wordt naar gekeken, niet
// op pixels vergeleken, want Reveal en de afbeeldingen veranderen na de
// hydratatie bewust van uiterlijk (eenheid 2).
// op pixels vergeleken. Ook zonder JavaScript toont de pagina nu zijn inhoud
// (Reveal is zichtbaar, de foto's staan in de noscript-tweeling); alleen de
// uitgestelde foto's en de bedieningen die script nodig hebben verschillen.
describe('stijlen zonder en met JavaScript (V15)', () => {
it('heeft de stijlen in de HTML', async () => {
const html = await (await fetch(server.origin + '/over-mij')).text();
+183
View File
@@ -0,0 +1,183 @@
import { mkdirSync } from 'node:fs';
import { join } from 'node:path';
import { afterAll, beforeAll, describe, expect, it } from 'vitest';
import sitePages from '../src/sitePages.ts';
import { openPage } from './support/browser.ts';
import { startServer } from './support/server.ts';
// FR-PR-11, FR-PR-13, V-D12: elke pagina zonder JavaScript. Geen knop die niets
// doet, alle foto's geladen, geen lege plekken of mailadres-restanten.
let server: Awaited<ReturnType<typeof startServer>>;
beforeAll(async () => {
server = await startServer();
});
afterAll(() => server.close());
const pages = Object.keys(sitePages);
const widths = [390, 1280];
const dir = process.env.E2E_SCREENSHOT_DIR;
const fileName = (path: string) =>
path === '/' ? 'home' : path.slice(1).replaceAll('/', '-');
describe.each(widths)('zonder JavaScript op %i px', (width) => {
it.each([...pages, '/onbekend'])(
'%s toont alles en verbergt wat niets doet',
async (path) => {
const notFound = !pages.includes(path);
const { page, status } = await openPage(server.origin + path, {
javaScript: false,
width,
expectNotFound: notFound,
});
expect(status).toBe(notFound ? 404 : 200);
await page.waitForLoadState('networkidle');
// Geen knop die zonder script niets doet
await expect(page.locator('button:visible').count()).resolves.toBe(
0,
);
// Geen verborgen of halve Reveal
const opacities = await page
.locator('[data-reveal]')
.evaluateAll((elements) =>
elements.map((element) =>
Number(getComputedStyle(element).opacity),
),
);
expect(opacities.every((opacity) => opacity === 1)).toBe(true);
const images = await page.evaluate(() => {
const displayed = [...document.querySelectorAll('img')].filter(
(image) => image.getClientRects().length > 0,
);
return {
broken: displayed
.filter(
(image) =>
!image.complete || image.naturalWidth === 0,
)
.map((image) => image.outerHTML.slice(0, 160)),
deferredShown: [
...document.querySelectorAll('img[data-deferred]'),
]
.filter(
(image) =>
getComputedStyle(image).display !== 'none',
)
.map((image) => image.outerHTML.slice(0, 160)),
// Een foto telt in de toegankelijkheidsboom als hij een alt
// heeft en niet in een aria-hidden gedeelte staat
named: displayed.filter(
(image) =>
image.alt !== '' &&
!image.closest('[aria-hidden="true"]'),
).length,
};
});
expect(images.broken).toEqual([]);
expect(images.deferredShown).toEqual([]);
await expect(page.getByRole('img').count()).resolves.toBe(
images.named,
);
// Plaatsvervangers en bedieningen die script nodig hebben
await expect(
page
.locator(
'[data-email-pending]:visible, [data-requires-js]:visible',
)
.count(),
).resolves.toBe(0);
await expect(
page.locator('a[href^="mailto:"]').count(),
).resolves.toBe(0);
// De footer: geen kolom Contact en geen lege kolom
const footer = page.getByRole('contentinfo');
await expect(
footer.getByRole('heading', { name: 'Contact' }).count(),
).resolves.toBe(0);
// De kolom Contact is bewust weg (hij zit in een verborgen
// wrapper); wat overblijft is zichtbaar en niet leeg
const columns = await footer.locator('ul').evaluateAll((lists) =>
lists
.filter((list) => !list.closest('[data-requires-js]'))
.map((list) => ({
visible: list.getClientRects().length > 0,
items: list.querySelectorAll('li').length,
})),
);
expect(columns.length).toBeGreaterThan(0);
for (const column of columns) {
expect(column.visible).toBe(true);
expect(column.items).toBeGreaterThan(0);
}
if (path === '/') {
for (const id of [
'hero-prev-button',
'hero-next-button',
'hero-pause-button',
'hero-progress',
]) {
await expect(
page
.getByTestId(id)
.and(page.locator(':visible'))
.count(),
).resolves.toBe(0);
}
const hero = page.locator('[aria-roledescription="carousel"]');
await expect(
hero.locator('img:visible').count(),
).resolves.toBeGreaterThan(0);
// Eén review (V9 blijft zoals het was)
const shown = await page
.getByTestId('testimonials')
.locator('[data-testid^="testimonial-"]')
.evaluateAll(
(elements) =>
elements.filter(
(element) =>
element.getBoundingClientRect().height > 50,
).length,
);
expect(shown).toBe(1);
}
if (path === '/portfolio') {
await expect(
page.getByTestId('filter-bar').isVisible(),
).resolves.toBe(false);
const hrefs = await page
.locator('[data-testid^="portfolio-tile-"]')
.evaluateAll((tiles) =>
tiles.map((tile) => tile.getAttribute('href')),
);
expect(hrefs.length).toBeGreaterThan(0);
for (const href of hrefs) {
expect(href).toMatch(/\.(jpe?g|png|webp|avif)$/);
}
}
// V-D12: er wordt naar gekeken, niet op pixels vergeleken
if (dir) {
mkdirSync(dir, { recursive: true });
// Zonder decode tekent een fullPage-opname foto's buiten het
// scherm nog als lege vlakken
await page.evaluate(() =>
Promise.all(
[...document.querySelectorAll('img')]
.filter((image) => image.getClientRects().length)
.map((image) => image.decode().catch(() => {})),
),
);
await page.screenshot({
path: join(dir, `${fileName(path)}-${width}-zonder-js.png`),
fullPage: true,
});
}
},
);
});
+201
View File
@@ -0,0 +1,201 @@
import { afterAll, beforeAll, describe, expect, it } from 'vitest';
import type { Page } from 'playwright-core';
import { eventually, openPage } from './support/browser.ts';
import { startServer } from './support/server.ts';
// FR-PR-12, V-D4 (alleen Chrome), V-D9: het menu zonder JavaScript, met muis
// en toetsenbord. Firefox, Safari en Chrome op Android kunnen agenten niet
// nagaan; dat blijft voor een mens (V-D4).
let server: Awaited<ReturnType<typeof startServer>>;
beforeAll(async () => {
server = await startServer();
});
afterAll(() => server.close());
const shootLinks = [
'Newborn',
'Zwangerschap',
'Gezin',
'Loveshoot',
'Portretten',
];
const menuOrder = [
'Home',
'Over mij',
'Portfolio',
'Soorten fotoshoots',
...shootLinks,
'Contact',
];
const open = (width: number, height = 800, path = '/over-mij') =>
openPage(server.origin + path, { javaScript: false, width, height });
// Zonder pauze gelezen: de volgende Tab hoort direct op de goede plek te landen
const focusedText = (page: Page) =>
page.evaluate(() => document.activeElement?.textContent?.trim() ?? '');
const focusedTestId = (page: Page) =>
page.evaluate(
() => document.activeElement?.getAttribute('data-testid') ?? '',
);
const scrollY = (page: Page) => page.evaluate(() => window.scrollY);
const hash = (page: Page) => page.evaluate(() => location.hash);
// Het paneel opent met een clip-path-overgang; klikken kan pas als die klaar is
const panelFullyOpen = (page: Page) =>
eventually(() =>
page
.locator('#mobile-nav')
.evaluate((element) => getComputedStyle(element).clipPath),
).toBe('inset(0px)');
// Springt direct, ook als de pagina vloeiend scrolt
const scrollTo = (page: Page, y: number) =>
page.evaluate((top) => window.scrollTo({ top, behavior: 'instant' }), y);
describe('menu zonder JavaScript op 390 px', () => {
it('toont de open-link in plaats van het hamburgermenu en houdt het paneel dicht', async () => {
const { page } = await open(390);
await expect(
page.getByTestId('nav-menu-toggle').isVisible(),
).resolves.toBe(false);
const link = page.getByTestId('nav-noscript-open');
await expect(link.isVisible()).resolves.toBe(true);
const box = await link.boundingBox();
expect(box?.width).toBe(44);
expect(box?.height).toBe(44);
const panel = page.locator('#mobile-nav');
await expect(
panel.evaluate((element) => getComputedStyle(element).visibility),
).resolves.toBe('hidden');
// Tab vanaf de open-link komt niet in het dichte paneel
await link.focus();
for (let step = 0; step < 8; step++) {
await page.keyboard.press('Tab');
await expect(
page.evaluate(
() => !!document.activeElement?.closest('#mobile-nav'),
),
).resolves.toBe(false);
}
});
it.each(['/over-mij', '/'])(
'opent en sluit met de muis zonder te scrollen (%s)',
async (path) => {
const { page } = await open(390, 800, path);
await scrollTo(page, 300);
expect(await scrollY(page)).toBe(300);
const panel = page.locator('#mobile-nav');
await page.getByTestId('nav-noscript-open').click();
expect(await hash(page)).toBe('#mobile-nav');
await eventually(() => panel.isVisible()).toBe(true);
await panelFullyOpen(page);
// De shootlinks staan open zonder klik op een pijltje
for (const name of shootLinks) {
await expect(
panel.getByRole('link', { name }).isVisible(),
).resolves.toBe(true);
}
expect(await scrollY(page)).toBe(300);
await page.getByTestId('nav-noscript-close').click();
expect(await hash(page)).toBe('#site-header');
await eventually(() => panel.isVisible()).toBe(false);
expect(await scrollY(page)).toBe(300);
},
);
it('opent en sluit met het toetsenbord in de volgorde van het menu', async () => {
const { page } = await open(390);
const panel = page.locator('#mobile-nav');
await page.getByTestId('nav-noscript-open').focus();
await page.keyboard.press('Enter');
expect(await hash(page)).toBe('#mobile-nav');
// De hash staat meteen, de :target-stijl pas na de volgende frame; een
// mens drukt nooit binnen die frame op Tab
await eventually(() => panel.isVisible()).toBe(true);
await page.keyboard.press('Tab');
expect(await focusedTestId(page)).toBe('nav-noscript-close');
const order: string[] = [];
for (let step = 0; step < menuOrder.length; step++) {
await page.keyboard.press('Tab');
order.push(await focusedText(page));
}
expect(order).toEqual(menuOrder);
await page.getByTestId('nav-noscript-close').focus();
await page.keyboard.press('Enter');
expect(await hash(page)).toBe('#site-header');
await eventually(() => panel.isVisible()).toBe(false);
});
it('geeft de open- en sluitlink een zichtbare focusring (V-D9)', async () => {
const { page } = await open(390);
const outline = (testId: string) =>
page
.getByTestId(testId)
.evaluate((element) =>
parseFloat(getComputedStyle(element).outlineWidth),
);
// Met Tab bereikt, zodat :focus-visible geldt
for (let step = 0; step < 6; step++) {
await page.keyboard.press('Tab');
if ((await focusedTestId(page)) === 'nav-noscript-open') break;
}
expect(await focusedTestId(page)).toBe('nav-noscript-open');
expect(await outline('nav-noscript-open')).toBeGreaterThanOrEqual(2);
await page.keyboard.press('Enter');
await eventually(() => page.locator('#mobile-nav').isVisible()).toBe(
true,
);
await page.keyboard.press('Tab');
expect(await focusedTestId(page)).toBe('nav-noscript-close');
expect(await outline('nav-noscript-close')).toBeGreaterThanOrEqual(2);
});
});
describe('menu zonder JavaScript op 1280 px', () => {
it('toont geen open-link en geen paneel, ook niet bij #mobile-nav', async () => {
const { page } = await open(1280);
await expect(
page.getByTestId('nav-noscript-open').isVisible(),
).resolves.toBe(false);
const withHash = await openPage(
server.origin + '/over-mij#mobile-nav',
{ javaScript: false, width: 1280, height: 800 },
);
await expect(
withHash.page.locator('#mobile-nav').isVisible(),
).resolves.toBe(false);
});
it('opent het submenu op toetsenbordfocus, in volgorde, en sluit het daarna', async () => {
const { page } = await open(1280);
const header = page.getByRole('banner');
await expect(header.locator('button:visible').count()).resolves.toBe(0);
const panel = page.locator('[data-submenu-panel]');
await expect(panel.isVisible()).resolves.toBe(false);
await header
.getByRole('link', { name: 'Soorten fotoshoots', exact: true })
.focus();
const order: string[] = [];
for (const name of [...shootLinks, 'Contact']) {
await page.keyboard.press('Tab');
order.push(await focusedText(page));
if (name !== 'Contact') {
await expect(panel.isVisible()).resolves.toBe(true);
}
}
expect(order).toEqual([...shootLinks, 'Contact']);
await eventually(() => panel.isVisible()).toBe(false);
});
});
+296
View File
@@ -0,0 +1,296 @@
import { afterAll, beforeAll, describe, expect, it } from 'vitest';
import type { Page } from 'playwright-core';
import sitePages from '../src/sitePages.ts';
import { eventually, openPage, waitForHydration } from './support/browser.ts';
import { startServer } from './support/server.ts';
// FR-PR-09, FR-PR-10, V-D6: Reveal is zichtbaar in de HTML en in de eerste
// render; na de hydratatie verbergt alleen een element dat helemaal onder het
// scherm staat zich, zonder overgang, en het verschijnt bij het scrollen.
let server: Awaited<ReturnType<typeof startServer>>;
beforeAll(async () => {
server = await startServer();
});
afterAll(() => server.close());
interface Entry {
// Bovenkant en schermhoogte bij de eerste frame waarin het element bestaat
top: number;
viewport: number;
opacities: number[];
}
interface Sampler {
entries: Entry[];
mark: () => void;
marked: number;
}
declare global {
interface Window {
__reveal: Sampler;
}
}
// Leest op elke animatieframe, vanaf de eerste, de dekking van elke Reveal
async function installSampler(page: Page) {
await page.addInitScript(() => {
const seen = new Map<Element, { top: number; opacities: number[] }>();
const entries: Entry[] = [];
const sampler: Sampler = {
entries,
marked: 0,
mark() {
sampler.marked = entries.length;
},
};
window.__reveal = sampler;
const tick = () => {
for (const element of document.querySelectorAll('[data-reveal]')) {
let entry = seen.get(element) as Entry | undefined;
if (!entry) {
entry = {
top: element.getBoundingClientRect().top,
viewport: window.innerHeight,
opacities: [],
};
seen.set(element, entry);
entries.push(entry);
}
entry.opacities.push(Number(getComputedStyle(element).opacity));
}
requestAnimationFrame(tick);
};
requestAnimationFrame(tick);
});
}
const samples = (page: Page, from = 0) =>
page.evaluate((start) => window.__reveal.entries.slice(start), from);
const pages = [
'/',
'/over-mij',
'/portfolio',
'/soorten-fotoshoots',
'/contact',
'/soorten-fotoshoots/newborn',
];
const sizes = [
{ width: 390, height: 823 },
{ width: 1350, height: 940 },
];
// De opacity gaat nooit van 0 terug naar 1 zonder scroll: 1...1 0...0
const stepsDown = (opacities: number[]) =>
opacities.every((value, index) => {
if (value !== 0 && value !== 1) return false;
return index === 0 || !(opacities[index - 1] === 0 && value === 1);
});
const open = (
path: string,
size: { width: number; height: number },
reducedMotion?: 'reduce',
) =>
openPage(server.origin + path, {
...size,
reducedMotion,
prepare: installSampler,
});
// Na de hydratatie nog twee seconden meten: een late verberging of een
// overgang zou in die tijd zichtbaar worden
async function settle(page: Page) {
await waitForHydration(page);
await page.waitForTimeout(2000);
}
describe.each(sizes)('Reveal bij het laden op $width x $height', (size) => {
it.each(pages)(
'%s: wat in beeld staat blijft op elke frame 1, de rest gaat zonder overgang naar 0',
async (path) => {
const { page, ...opened } = await open(path, size);
await settle(page);
const entries = await samples(page);
expect(entries.length).toBeGreaterThan(0);
const hidden = await page.locator('[data-reveal="hidden"]').count();
let below = 0;
for (const entry of entries) {
if (entry.top < entry.viewport) {
expect(entry.opacities.every((value) => value === 1)).toBe(
true,
);
} else {
below++;
expect(stepsDown(entry.opacities)).toBe(true);
}
}
// Wat onder het scherm begon, is na de hydratatie verborgen,
// tenzij de opmaak het intussen in beeld schoof
const finalHidden = entries.filter(
(entry) => entry.opacities.at(-1) === 0,
).length;
expect(finalHidden).toBe(hidden);
expect(finalHidden).toBeLessThanOrEqual(below);
expect(opened.messages).toEqual([]);
},
);
it('met verminderde beweging is elke Reveal op elke frame zichtbaar', async () => {
for (const path of pages) {
const { page } = await open(path, size, 'reduce');
await settle(page);
const entries = await samples(page);
expect(entries.length).toBeGreaterThan(0);
for (const entry of entries) {
expect(entry.opacities.every((value) => value === 1)).toBe(
true,
);
}
await expect(
page.locator('[data-reveal="hidden"]').count(),
).resolves.toBe(0);
}
});
});
describe('Reveal bij het scrollen', () => {
it('toont een verborgen element binnen 1,5 s als het in beeld komt', async () => {
const { page } = await open('/', { width: 390, height: 823 });
await settle(page);
// Een handle: de locator zou na het tonen het volgende verborgen
// element aanwijzen
const target = await page
.locator('[data-reveal="hidden"]')
.first()
.elementHandle();
expect(target).not.toBeNull();
await target!.evaluate((element) =>
element.scrollIntoView({ block: 'center', behavior: 'instant' }),
);
await expect
.poll(() => target!.evaluate((e) => getComputedStyle(e).opacity), {
timeout: 1500,
interval: 50,
})
.toBe('1');
await expect(target!.getAttribute('data-reveal')).resolves.toBe(
'visible',
);
});
it('laat de prijskaarten onder het scherm met oplopende vertraging verschijnen', async () => {
const { page } = await open('/', { width: 1350, height: 940 });
await settle(page);
const cards = page.locator('[data-testid="pricing"] [data-reveal]');
const hiddenCards = page.locator(
'[data-testid="pricing"] [data-reveal="hidden"]',
);
await expect(cards.count()).resolves.toBeGreaterThan(3);
await expect(hiddenCards.count()).resolves.toBeGreaterThanOrEqual(3);
await page.getByTestId('pricing').evaluate((element) =>
element.scrollIntoView({
block: 'center',
behavior: 'instant',
}),
);
await expect
.poll(() => hiddenCards.count(), { timeout: 3000, interval: 50 })
.toBe(0);
const delays = await cards.evaluateAll((elements) =>
elements
.slice(-3)
.map((element) =>
parseFloat(getComputedStyle(element).transitionDelay),
),
);
expect(delays[0]).toBeLessThan(delays[1]);
expect(delays[1]).toBeLessThan(delays[2]);
});
it('toont het raster van /portfolio op 412 x 823 bij het laden (het oude lege raster)', async () => {
const { page } = await open('/portfolio', { width: 412, height: 823 });
await settle(page);
const wrapper = page.locator(
'[data-reveal]:has([data-testid="portfolio-grid"])',
);
await expect(wrapper.getAttribute('data-reveal')).resolves.toBe(
'visible',
);
await expect(
wrapper.evaluate((element) => getComputedStyle(element).opacity),
).resolves.toBe('1');
});
});
describe('Reveal bij een navigatie in de browser (O1)', () => {
it('houdt wat in beeld staat op elke frame zichtbaar na een klik op Over mij', async () => {
const { page, ...opened } = await open('/', {
width: 1350,
height: 940,
});
await settle(page);
await page.evaluate(() => window.__reveal.mark());
const from = await page.evaluate(() => window.__reveal.marked);
await page
.getByRole('navigation', { name: 'Hoofdmenu' })
.getByRole('link', { name: 'Over mij' })
.click();
await page.waitForURL('**/over-mij');
await eventually(() =>
page.locator('h1').first().textContent(),
).toMatch(/Over mij/);
await page.waitForTimeout(1500);
const entries = await samples(page, from);
expect(entries.length).toBeGreaterThan(0);
for (const entry of entries) {
if (entry.top < entry.viewport) {
expect(entry.opacities.every((value) => value === 1)).toBe(
true,
);
}
}
expect(opened.messages).toEqual([]);
});
});
// BR-RVL-13: een verborgen Reveal hoger dan (schermhoogte - 60) / 0,12 haalt
// de drempel van 12 % nooit. Per pagina en breedte wordt de hoogste genoteerd.
describe('hoogte van de verborgen Reveal (V-D6)', () => {
const viewports = [
{ width: 320, height: 568 },
{ width: 360, height: 640 },
{ width: 412, height: 823 },
{ width: 768, height: 1024 },
{ width: 1350, height: 940 },
];
it.each(viewports)(
'blijft onder de grens op $width x $height',
async (size) => {
const limit = (size.height - 60) / 0.12;
const tallest: string[] = [];
for (const path of Object.keys(sitePages)) {
const { page } = await openPage(server.origin + path, {
...size,
});
// De footer hydrateert eerder dan de pagina zelf: wacht tot
// ook de Reveals hun keuze hebben gemaakt
await settle(page);
const heights = await page
.locator('[data-reveal="hidden"]')
.evaluateAll((elements) =>
elements.map(
(element) => element.getBoundingClientRect().height,
),
);
const max = Math.max(0, ...heights);
tallest.push(`${path}: ${Math.round(max)} px`);
expect(max).toBeLessThanOrEqual(limit);
}
console.info(
`V-D6 ${size.width} x ${size.height}, grens ${Math.round(limit)} px; ` +
tallest.join('; '),
);
},
);
});
+4
View File
@@ -50,6 +50,8 @@ export interface OpenOptions {
javaScript?: boolean;
width?: number;
height?: number;
// prefers-reduced-motion: reduce, voor de tests van Reveal
reducedMotion?: 'reduce';
// Een onbekende URL krijgt van de server bewust status 404 (BR-SRV-05).
// Chrome meldt dat voor het document zelf als console-fout. Alleen die ene
// melding wordt genegeerd; elke andere fout, ook een 404 voor een bestand
@@ -71,6 +73,7 @@ export async function openPage(
javaScript = true,
width = 1280,
height = 800,
reducedMotion,
expectNotFound = false,
prepare,
}: OpenOptions = {},
@@ -80,6 +83,7 @@ export async function openPage(
).newContext({
javaScriptEnabled: javaScript,
viewport: { width, height },
reducedMotion,
});
contexts.add(context);
const page = await context.newPage();
@@ -60,7 +60,11 @@ describe('NO_SCRIPT_CSS', () => {
],
[
'group expanded',
'#mobile-nav [id^="mobile-group-"]{grid-template-rows:1fr;visibility:visible;transition:none}',
'#mobile-nav [id^="mobile-group-"]{grid-template-rows:1fr;transition:none}',
],
[
'group visible while open',
'#mobile-nav:target [id^="mobile-group-"]{visibility:visible}',
],
[
'desktop submenu',
+6 -2
View File
@@ -38,8 +38,11 @@ const FOCUS_RING =
// stays hidden from lg up, even when the address ends in the fragment.
const PANEL_OPEN = `#${MOBILE_NAV_ID}:target{clip-path:inset(0);visibility:visible}`;
// The shoot group is always expanded
const GROUP_EXPANDED = `#${MOBILE_NAV_ID} [id^="mobile-group-"]{grid-template-rows:1fr;visibility:visible;transition:none}`;
// The shoot group is always expanded. Its visibility is only restored while the
// panel is open: a visible child of a hidden parent is focusable, so the links
// would stay in the Tab order of the closed panel.
const GROUP_EXPANDED = `#${MOBILE_NAV_ID} [id^="mobile-group-"]{grid-template-rows:1fr;transition:none}`;
const GROUP_VISIBLE = `#${MOBILE_NAV_ID}:target [id^="mobile-group-"]{visibility:visible}`;
// The desktop submenu opens on keyboard focus. transition none: a Tab pressed
// while the visibility transition starts would skip the panel.
@@ -55,5 +58,6 @@ export const NO_SCRIPT_CSS = [
FOCUS_RING,
PANEL_OPEN,
GROUP_EXPANDED,
GROUP_VISIBLE,
SUBMENU_FOCUS,
].join('');