From 8fb872b301ce9949f5c95c5e7136650570d0fb6a Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Tue, 18 Jan 2022 10:47:56 -0800
Subject: [PATCH] fix test

---
 packages/kit/test/apps/basics/src/hooks.js             |  9 ++++-----
 .../apps/basics/src/routes/no-router/__layout.svelte   |  2 +-
 .../kit/test/apps/basics/src/routes/no-router/a.svelte | 10 +++++++---
 .../kit/test/apps/basics/src/routes/no-router/b.svelte |  2 +-
 packages/kit/test/apps/basics/test/test.js             |  2 +-
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/packages/kit/test/apps/basics/src/hooks.js b/packages/kit/test/apps/basics/src/hooks.js
index 01ebdc61b7ece..b4581753e6b64 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 918af78c5965e..ef4b0dbfea125 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
@@ -9,4 +9,4 @@
 <a href="/no-router/a">a</a>
 <a href="/no-router/b">b</a>
 
-<slot></slot>
\ No newline at end of file
+<slot></slot>
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 32bd0fc793a01..30cb929bce229 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,9 @@
-<script context="module">
-	export const router = false;
+<script>
+	import { beforeNavigate } from '$app/navigation';
+
+	beforeNavigate(({ cancel }) => {
+		cancel();
+	});
 </script>
 
-<h1>a</h1>
\ No newline at end of file
+<h1>a</h1>
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 51902b4da7a66..e96ed3db8987f 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 @@
-<h1>b</h1>
\ No newline at end of file
+<h1>b</h1>
diff --git a/packages/kit/test/apps/basics/test/test.js b/packages/kit/test/apps/basics/test/test.js
index 469ebe3d9eeb7..ce9b120bc2009 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');