Fixes two nginx rule defects found by real nginx in CI
Plain map keys compare case-insensitively, so /Over-Mij was not redirected. A path starting with an encoded backslash could become an open redirect through the trailing-slash rule; it now gets the 404 page. Also makes the tests readable for nginx's workers and less sensitive to the slow CI runner. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
+25
-7
@@ -1,7 +1,7 @@
|
||||
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 { eventually, 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
|
||||
@@ -44,8 +44,19 @@ const counts = (log: Logged[]) => {
|
||||
return map;
|
||||
};
|
||||
|
||||
// Elke uitgestelde foto is gehydrateerd: React hangt dan een fiber aan het
|
||||
// element. Scrollen voor die tijd (traag apparaat) laat de bovenste foto's
|
||||
// nooit in de buurt komen, want ze krijgen pas een src na de hydratatie.
|
||||
const deferredImagesHydrated = (page: Page) =>
|
||||
page.waitForFunction(() =>
|
||||
[...document.querySelectorAll('img[data-deferred]')].every((image) =>
|
||||
Object.keys(image).some((key) => key.startsWith('__reactFiber')),
|
||||
),
|
||||
);
|
||||
|
||||
// Scrolt de hele pagina door, zodat elke uitgestelde foto in de buurt komt
|
||||
async function scrollThrough(page: Page) {
|
||||
await deferredImagesHydrated(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) {
|
||||
@@ -218,12 +229,16 @@ describe("logo's", () => {
|
||||
height: 940,
|
||||
prepare: requests.prepare,
|
||||
});
|
||||
const light = () =>
|
||||
requests.log.filter((entry) =>
|
||||
/\/logo-light-/.test(entry.url),
|
||||
);
|
||||
// Het verzoek komt pas na de load én de hydratatie; op een
|
||||
// traag apparaat is het netwerk dan al even stil geweest
|
||||
await eventually(async () => light().length).toBeGreaterThan(0);
|
||||
await page.waitForLoadState('networkidle');
|
||||
const light = requests.log.filter((entry) =>
|
||||
/\/logo-light-/.test(entry.url),
|
||||
);
|
||||
expect(light.length, path).toBe(1);
|
||||
expect(light[0].beforeLoad, path).toBe(path === '/');
|
||||
expect(light().length, path).toBe(1);
|
||||
expect(light()[0].beforeLoad, path).toBe(path === '/');
|
||||
}
|
||||
},
|
||||
);
|
||||
@@ -303,7 +318,10 @@ describe('de eerste rij van /portfolio (V-D13)', () => {
|
||||
.locator('img')
|
||||
.evaluateAll((images) =>
|
||||
images
|
||||
.map((image) => (image as HTMLImageElement).src)
|
||||
.map(
|
||||
(image) =>
|
||||
(image as HTMLImageElement).currentSrc,
|
||||
)
|
||||
.filter(Boolean),
|
||||
),
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user