diff --git a/packages/kit/test/apps/basics/src/hooks.js b/packages/kit/test/apps/basics/src/hooks.js index 01ebdc61b7ec..b4581753e6b6 100644 --- a/packages/kit/test/apps/basics/src/hooks.js +++ b/packages/kit/test/apps/basics/src/hooks.js @@ -31,15 +31,14 @@ export const handle = sequence( return resolve(request); }, async ({ request, resolve }) => { - if (request.url.pathname === '/errors/error-in-handle') { + const pathname = request.url.pathname; + if (pathname === '/errors/error-in-handle') { throw new Error('Error in handle'); } const response = await resolve(request, { - hydrate: - request.url.pathname !== '/no-hydrate' && request.url.pathname !== '/no-hydrate/no-js', - router: - request.url.pathname !== '/no-router/a' && request.url.pathname !== '/no-hydrate/no-js', + hydrate: pathname !== '/no-hydrate' && pathname !== '/no-hydrate/no-js', + router: pathname !== '/no-router/a' && pathname !== '/no-hydrate/no-js', ssr: !request.url.pathname.startsWith('/no-ssr') }); diff --git a/packages/kit/test/apps/basics/src/routes/no-router/__layout.svelte b/packages/kit/test/apps/basics/src/routes/no-router/__layout.svelte index 918af78c5965..bd7db22d6e0f 100644 --- a/packages/kit/test/apps/basics/src/routes/no-router/__layout.svelte +++ b/packages/kit/test/apps/basics/src/routes/no-router/__layout.svelte @@ -7,6 +7,6 @@ a -b +b - \ No newline at end of file + diff --git a/packages/kit/test/apps/basics/src/routes/no-router/a.svelte b/packages/kit/test/apps/basics/src/routes/no-router/a.svelte index 32bd0fc793a0..57f9d40797b8 100644 --- a/packages/kit/test/apps/basics/src/routes/no-router/a.svelte +++ b/packages/kit/test/apps/basics/src/routes/no-router/a.svelte @@ -1,5 +1 @@ - - -

a

\ No newline at end of file +

a

diff --git a/packages/kit/test/apps/basics/src/routes/no-router/b.svelte b/packages/kit/test/apps/basics/src/routes/no-router/b.svelte index 51902b4da7a6..e96ed3db8987 100644 --- a/packages/kit/test/apps/basics/src/routes/no-router/b.svelte +++ b/packages/kit/test/apps/basics/src/routes/no-router/b.svelte @@ -1 +1 @@ -

b

\ No newline at end of file +

b

diff --git a/packages/kit/test/apps/basics/test/test.js b/packages/kit/test/apps/basics/test/test.js index 469ebe3d9eeb..ce9b120bc200 100644 --- a/packages/kit/test/apps/basics/test/test.js +++ b/packages/kit/test/apps/basics/test/test.js @@ -1104,7 +1104,7 @@ test.describe.parallel('Nested layouts', () => { }); }); -test.describe.parallel('Page options', () => { +test.describe.parallel('Resolve options', () => { test('does not hydrate page with hydrate=false', async ({ page, javaScriptEnabled }) => { await page.goto('/no-hydrate');