fix test

sveltejs · Jan 18, 2022 · 492f169 · 492f169
1 parent ceb555c
commit 492f169
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 14 deletions.
diff --git 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
@@ -7,6 +7,6 @@
 </button>
 
 <a href="/no-router/a">a</a>
-<a href="/no-router/b">b</a>
+<a href="/no-router/b" rel="external">b</a>
 
-<slot></slot>
+<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
@@ -1,5 +1 @@
-<script context="module">
- export const router = false;
-</script>
-
-<h1>a</h1>
+<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
@@ -1 +1 @@
-<h1>b</h1>
+<h1>b</h1>
diff --git 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');