diff --git a/frontend/src/lib/document/BulkDocumentEditLayout.svelte.spec.ts b/frontend/src/lib/document/BulkDocumentEditLayout.svelte.spec.ts index 415f80f4..f7ca98bc 100644 --- a/frontend/src/lib/document/BulkDocumentEditLayout.svelte.spec.ts +++ b/frontend/src/lib/document/BulkDocumentEditLayout.svelte.spec.ts @@ -4,7 +4,7 @@ import { cleanup, render } from 'vitest-browser-svelte'; import { page, userEvent } from 'vitest/browser'; import BulkDocumentEditLayout from './BulkDocumentEditLayout.svelte'; -vi.mock('$app/navigation', () => ({ goto: vi.fn() })); +vi.mock('$app/navigation'); afterEach(() => { cleanup(); diff --git a/frontend/src/lib/document/BulkSelectionBar.svelte.spec.ts b/frontend/src/lib/document/BulkSelectionBar.svelte.spec.ts index 80d2aa87..4322c790 100644 --- a/frontend/src/lib/document/BulkSelectionBar.svelte.spec.ts +++ b/frontend/src/lib/document/BulkSelectionBar.svelte.spec.ts @@ -5,7 +5,7 @@ import { goto } from '$app/navigation'; import BulkSelectionBar from './BulkSelectionBar.svelte'; import { bulkSelectionStore } from '$lib/document/bulkSelection.svelte'; -vi.mock('$app/navigation', () => ({ goto: vi.fn() })); +vi.mock('$app/navigation'); afterEach(() => { cleanup(); diff --git a/frontend/src/lib/document/DocumentRow.svelte.test.ts b/frontend/src/lib/document/DocumentRow.svelte.test.ts index 704428bc..07e1f0d1 100644 --- a/frontend/src/lib/document/DocumentRow.svelte.test.ts +++ b/frontend/src/lib/document/DocumentRow.svelte.test.ts @@ -2,19 +2,7 @@ import { describe, it, expect, vi, afterEach } from 'vitest'; import { cleanup, render } from 'vitest-browser-svelte'; import { page } from 'vitest/browser'; -vi.mock('$app/navigation', () => ({ - beforeNavigate: () => {}, - afterNavigate: () => {}, - goto: vi.fn(), - invalidate: vi.fn(), - invalidateAll: vi.fn(), - preloadCode: vi.fn(), - preloadData: vi.fn(), - pushState: vi.fn(), - replaceState: vi.fn(), - disableScrollHandling: vi.fn(), - onNavigate: () => () => {} -})); +vi.mock('$app/navigation'); const { default: DocumentRow } = await import('./DocumentRow.svelte'); diff --git a/frontend/src/lib/notification/NotificationBell.svelte.spec.ts b/frontend/src/lib/notification/NotificationBell.svelte.spec.ts index 0ab79577..8a750130 100644 --- a/frontend/src/lib/notification/NotificationBell.svelte.spec.ts +++ b/frontend/src/lib/notification/NotificationBell.svelte.spec.ts @@ -3,7 +3,7 @@ import { cleanup, render } from 'vitest-browser-svelte'; import type { NotificationItem } from '$lib/notification/notifications'; import NotificationBell from './NotificationBell.svelte'; -vi.mock('$app/navigation', () => ({ goto: vi.fn(), beforeNavigate: vi.fn() })); +vi.mock('$app/navigation'); vi.mock('$app/forms', () => ({ enhance(node: HTMLFormElement, submit?: (opts: { formData: FormData }) => unknown) { const handler = (e: Event) => { diff --git a/frontend/src/lib/notification/NotificationDropdown.svelte.test.ts b/frontend/src/lib/notification/NotificationDropdown.svelte.test.ts index bdbda7eb..a7343c68 100644 --- a/frontend/src/lib/notification/NotificationDropdown.svelte.test.ts +++ b/frontend/src/lib/notification/NotificationDropdown.svelte.test.ts @@ -4,7 +4,7 @@ import { page } from 'vitest/browser'; import { goto } from '$app/navigation'; import NotificationDropdown from './NotificationDropdown.svelte'; -vi.mock('$app/navigation', () => ({ goto: vi.fn() })); +vi.mock('$app/navigation'); // Configurable result for the enhance mock — tests that need failure set // mockFormResult.type = 'failure' before clicking. diff --git a/frontend/src/lib/person/genealogy/StammbaumSidePanel.svelte.spec.ts b/frontend/src/lib/person/genealogy/StammbaumSidePanel.svelte.spec.ts index 4dda616b..7fc0abd6 100644 --- a/frontend/src/lib/person/genealogy/StammbaumSidePanel.svelte.spec.ts +++ b/frontend/src/lib/person/genealogy/StammbaumSidePanel.svelte.spec.ts @@ -3,7 +3,7 @@ import { cleanup, render } from 'vitest-browser-svelte'; import { page } from 'vitest/browser'; import StammbaumSidePanel from './StammbaumSidePanel.svelte'; -vi.mock('$app/navigation', () => ({ invalidateAll: vi.fn() })); +vi.mock('$app/navigation'); vi.mock('$app/forms', () => ({ enhance: () => () => {} })); vi.mock('$lib/person/PersonTypeahead.svelte', () => ({ default: () => null })); diff --git a/frontend/src/lib/person/genealogy/StammbaumSidePanel.svelte.test.ts b/frontend/src/lib/person/genealogy/StammbaumSidePanel.svelte.test.ts index 7e33e3d8..ec0dd658 100644 --- a/frontend/src/lib/person/genealogy/StammbaumSidePanel.svelte.test.ts +++ b/frontend/src/lib/person/genealogy/StammbaumSidePanel.svelte.test.ts @@ -3,19 +3,7 @@ import { cleanup, render } from 'vitest-browser-svelte'; import { page } from 'vitest/browser'; import StammbaumSidePanel from './StammbaumSidePanel.svelte'; -vi.mock('$app/navigation', () => ({ - beforeNavigate: () => {}, - afterNavigate: () => {}, - goto: vi.fn(), - invalidate: vi.fn(), - invalidateAll: vi.fn(), - preloadCode: vi.fn(), - preloadData: vi.fn(), - pushState: vi.fn(), - replaceState: vi.fn(), - disableScrollHandling: vi.fn(), - onNavigate: () => () => {} -})); +vi.mock('$app/navigation'); afterEach(cleanup); diff --git a/frontend/src/routes/DocumentList.svelte.spec.ts b/frontend/src/routes/DocumentList.svelte.spec.ts index 19a11676..2bacade4 100644 --- a/frontend/src/routes/DocumentList.svelte.spec.ts +++ b/frontend/src/routes/DocumentList.svelte.spec.ts @@ -4,7 +4,7 @@ import { page } from 'vitest/browser'; import DocumentList from './DocumentList.svelte'; import type { components } from '$lib/generated/api'; -vi.mock('$app/navigation', () => ({ goto: vi.fn() })); +vi.mock('$app/navigation'); afterEach(() => cleanup()); diff --git a/frontend/src/routes/DocumentList.svelte.test.ts b/frontend/src/routes/DocumentList.svelte.test.ts index 782a60e6..3f10943d 100644 --- a/frontend/src/routes/DocumentList.svelte.test.ts +++ b/frontend/src/routes/DocumentList.svelte.test.ts @@ -2,19 +2,7 @@ import { describe, it, expect, vi, afterEach } from 'vitest'; import { cleanup, render } from 'vitest-browser-svelte'; import { page } from 'vitest/browser'; -vi.mock('$app/navigation', () => ({ - beforeNavigate: () => {}, - afterNavigate: () => {}, - goto: vi.fn(), - invalidate: vi.fn(), - invalidateAll: vi.fn(), - preloadCode: vi.fn(), - preloadData: vi.fn(), - pushState: vi.fn(), - replaceState: vi.fn(), - disableScrollHandling: vi.fn(), - onNavigate: () => () => {} -})); +vi.mock('$app/navigation'); const { default: DocumentList } = await import('./DocumentList.svelte'); diff --git a/frontend/src/routes/DropZone.svelte.spec.ts b/frontend/src/routes/DropZone.svelte.spec.ts index 440c2f0c..90925754 100644 --- a/frontend/src/routes/DropZone.svelte.spec.ts +++ b/frontend/src/routes/DropZone.svelte.spec.ts @@ -1,13 +1,11 @@ import { describe, it, expect, afterEach, vi } from 'vitest'; import { cleanup, render } from 'vitest-browser-svelte'; import { page } from 'vitest/browser'; +import { invalidateAll } from '$app/navigation'; import DropZone from './DropZone.svelte'; -// vi.hoisted lets the mock fn reference survive vi.mock's hoisting so tests -// can assert on it from below while the factory remains self-contained. -const { invalidateAllMock } = vi.hoisted(() => ({ invalidateAllMock: vi.fn(async () => {}) })); -vi.mock('$app/navigation', () => ({ invalidateAll: invalidateAllMock })); +vi.mock('$app/navigation'); afterEach(() => { cleanup(); @@ -68,7 +66,7 @@ describe('DropZone onUploadComplete', () => { // invalidateAll is the last async step of the upload handler — once it // has been called, the callback decision has already been made. await vi.waitFor(() => { - expect(invalidateAllMock).toHaveBeenCalled(); + expect(vi.mocked(invalidateAll)).toHaveBeenCalled(); }); expect(onUploadComplete).not.toHaveBeenCalled(); }); diff --git a/frontend/src/routes/DropZone.svelte.test.ts b/frontend/src/routes/DropZone.svelte.test.ts index 2499b3dd..789fed50 100644 --- a/frontend/src/routes/DropZone.svelte.test.ts +++ b/frontend/src/routes/DropZone.svelte.test.ts @@ -2,19 +2,7 @@ import { describe, it, expect, vi, afterEach } from 'vitest'; import { cleanup, render } from 'vitest-browser-svelte'; import { page } from 'vitest/browser'; -vi.mock('$app/navigation', () => ({ - beforeNavigate: () => {}, - afterNavigate: () => {}, - goto: vi.fn(), - invalidate: vi.fn(), - invalidateAll: vi.fn(), - preloadCode: vi.fn(), - preloadData: vi.fn(), - pushState: vi.fn(), - replaceState: vi.fn(), - disableScrollHandling: vi.fn(), - onNavigate: () => () => {} -})); +vi.mock('$app/navigation'); const { default: DropZone } = await import('./DropZone.svelte'); diff --git a/frontend/src/routes/admin/groups/[id]/page.svelte.spec.ts b/frontend/src/routes/admin/groups/[id]/page.svelte.spec.ts index fdf05428..1443c635 100644 --- a/frontend/src/routes/admin/groups/[id]/page.svelte.spec.ts +++ b/frontend/src/routes/admin/groups/[id]/page.svelte.spec.ts @@ -5,7 +5,7 @@ import Page from './+page.svelte'; import { createConfirmService, CONFIRM_KEY } from '$lib/shared/services/confirm.svelte.js'; vi.mock('$app/forms', () => ({ enhance: () => () => {} })); -vi.mock('$app/navigation', () => ({ beforeNavigate: vi.fn(), goto: vi.fn() })); +vi.mock('$app/navigation'); import { beforeNavigate, goto } from '$app/navigation'; diff --git a/frontend/src/routes/admin/groups/new/page.svelte.spec.ts b/frontend/src/routes/admin/groups/new/page.svelte.spec.ts index a094997f..f348a050 100644 --- a/frontend/src/routes/admin/groups/new/page.svelte.spec.ts +++ b/frontend/src/routes/admin/groups/new/page.svelte.spec.ts @@ -11,7 +11,7 @@ vi.mock('$app/forms', () => ({ return { destroy: vi.fn() }; } })); -vi.mock('$app/navigation', () => ({ beforeNavigate: vi.fn(), goto: vi.fn() })); +vi.mock('$app/navigation'); import { beforeNavigate, goto } from '$app/navigation'; diff --git a/frontend/src/routes/admin/groups/new/page.svelte.test.ts b/frontend/src/routes/admin/groups/new/page.svelte.test.ts index d9841e91..1ec734b1 100644 --- a/frontend/src/routes/admin/groups/new/page.svelte.test.ts +++ b/frontend/src/routes/admin/groups/new/page.svelte.test.ts @@ -2,19 +2,7 @@ import { describe, it, expect, vi, afterEach } from 'vitest'; import { cleanup, render } from 'vitest-browser-svelte'; import { page } from 'vitest/browser'; -vi.mock('$app/navigation', () => ({ - beforeNavigate: () => {}, - afterNavigate: () => {}, - goto: vi.fn(), - invalidate: vi.fn(), - invalidateAll: vi.fn(), - preloadCode: vi.fn(), - preloadData: vi.fn(), - pushState: vi.fn(), - replaceState: vi.fn(), - disableScrollHandling: vi.fn(), - onNavigate: () => () => {} -})); +vi.mock('$app/navigation'); const { default: AdminGroupNewPage } = await import('./+page.svelte'); diff --git a/frontend/src/routes/admin/page.svelte.spec.ts b/frontend/src/routes/admin/page.svelte.spec.ts index ef44cc4b..2ce05ee6 100644 --- a/frontend/src/routes/admin/page.svelte.spec.ts +++ b/frontend/src/routes/admin/page.svelte.spec.ts @@ -8,7 +8,7 @@ import { cleanup, render } from 'vitest-browser-svelte'; import { page } from 'vitest/browser'; import Page from './+page.svelte'; -vi.mock('$app/navigation', () => ({ goto: vi.fn() })); +vi.mock('$app/navigation'); const fullData = { userCount: 4, diff --git a/frontend/src/routes/admin/page.svelte.test.ts b/frontend/src/routes/admin/page.svelte.test.ts index 64a54168..892544ba 100644 --- a/frontend/src/routes/admin/page.svelte.test.ts +++ b/frontend/src/routes/admin/page.svelte.test.ts @@ -2,19 +2,7 @@ import { describe, it, expect, vi, afterEach } from 'vitest'; import { cleanup, render } from 'vitest-browser-svelte'; import { page } from 'vitest/browser'; -vi.mock('$app/navigation', () => ({ - beforeNavigate: () => {}, - afterNavigate: () => {}, - goto: vi.fn(), - invalidate: vi.fn(), - invalidateAll: vi.fn(), - preloadCode: vi.fn(), - preloadData: vi.fn(), - pushState: vi.fn(), - replaceState: vi.fn(), - disableScrollHandling: vi.fn(), - onNavigate: () => () => {} -})); +vi.mock('$app/navigation'); const { default: AdminEntryPage } = await import('./+page.svelte'); diff --git a/frontend/src/routes/admin/tags/[id]/page.svelte.spec.ts b/frontend/src/routes/admin/tags/[id]/page.svelte.spec.ts index d4386c0d..161e2cd2 100644 --- a/frontend/src/routes/admin/tags/[id]/page.svelte.spec.ts +++ b/frontend/src/routes/admin/tags/[id]/page.svelte.spec.ts @@ -5,11 +5,7 @@ import Page from './+page.svelte'; import { createConfirmService, CONFIRM_KEY } from '$lib/shared/services/confirm.svelte.js'; vi.mock('$app/forms', () => ({ enhance: () => () => {} })); -vi.mock('$app/navigation', () => ({ - beforeNavigate: vi.fn(), - goto: vi.fn(), - replaceState: vi.fn() -})); +vi.mock('$app/navigation'); vi.mock('$app/stores', () => ({ page: { subscribe: (fn: (v: { url: URL }) => void) => { diff --git a/frontend/src/routes/admin/tags/[id]/page.svelte.test.ts b/frontend/src/routes/admin/tags/[id]/page.svelte.test.ts index 5297722e..5591a99a 100644 --- a/frontend/src/routes/admin/tags/[id]/page.svelte.test.ts +++ b/frontend/src/routes/admin/tags/[id]/page.svelte.test.ts @@ -17,19 +17,7 @@ vi.mock('$lib/shared/services/confirm.svelte', () => ({ getConfirmService: () => ({ confirm: async () => false }) })); -vi.mock('$app/navigation', () => ({ - beforeNavigate: () => {}, - afterNavigate: () => {}, - goto: vi.fn(), - invalidate: vi.fn(), - invalidateAll: vi.fn(), - preloadCode: vi.fn(), - preloadData: vi.fn(), - pushState: vi.fn(), - replaceState: vi.fn(), - disableScrollHandling: vi.fn(), - onNavigate: () => () => {} -})); +vi.mock('$app/navigation'); const { default: AdminTagEditPage } = await import('./+page.svelte'); diff --git a/frontend/src/routes/admin/users/[id]/page.svelte.spec.ts b/frontend/src/routes/admin/users/[id]/page.svelte.spec.ts index dd8325a9..5c93301c 100644 --- a/frontend/src/routes/admin/users/[id]/page.svelte.spec.ts +++ b/frontend/src/routes/admin/users/[id]/page.svelte.spec.ts @@ -15,7 +15,7 @@ vi.mock('$app/forms', () => ({ return () => {}; } })); -vi.mock('$app/navigation', () => ({ beforeNavigate: vi.fn(), goto: vi.fn() })); +vi.mock('$app/navigation'); import { beforeNavigate, goto } from '$app/navigation'; diff --git a/frontend/src/routes/admin/users/new/page.svelte.spec.ts b/frontend/src/routes/admin/users/new/page.svelte.spec.ts index 84efe99e..923debdc 100644 --- a/frontend/src/routes/admin/users/new/page.svelte.spec.ts +++ b/frontend/src/routes/admin/users/new/page.svelte.spec.ts @@ -11,7 +11,7 @@ vi.mock('$app/forms', () => ({ return { destroy: vi.fn() }; } })); -vi.mock('$app/navigation', () => ({ beforeNavigate: vi.fn(), goto: vi.fn() })); +vi.mock('$app/navigation'); import { beforeNavigate, goto } from '$app/navigation'; diff --git a/frontend/src/routes/admin/users/new/page.svelte.test.ts b/frontend/src/routes/admin/users/new/page.svelte.test.ts index 97528d4e..047d536b 100644 --- a/frontend/src/routes/admin/users/new/page.svelte.test.ts +++ b/frontend/src/routes/admin/users/new/page.svelte.test.ts @@ -2,19 +2,7 @@ import { describe, it, expect, vi, afterEach } from 'vitest'; import { cleanup, render } from 'vitest-browser-svelte'; import { page } from 'vitest/browser'; -vi.mock('$app/navigation', () => ({ - beforeNavigate: () => {}, - afterNavigate: () => {}, - goto: vi.fn(), - invalidate: vi.fn(), - invalidateAll: vi.fn(), - preloadCode: vi.fn(), - preloadData: vi.fn(), - pushState: vi.fn(), - replaceState: vi.fn(), - disableScrollHandling: vi.fn(), - onNavigate: () => () => {} -})); +vi.mock('$app/navigation'); const { default: AdminUserNewPage } = await import('./+page.svelte'); diff --git a/frontend/src/routes/aktivitaeten/page.svelte.test.ts b/frontend/src/routes/aktivitaeten/page.svelte.test.ts index def1980f..d6bd7461 100644 --- a/frontend/src/routes/aktivitaeten/page.svelte.test.ts +++ b/frontend/src/routes/aktivitaeten/page.svelte.test.ts @@ -14,19 +14,7 @@ vi.mock('$app/state', () => ({ } })); -vi.mock('$app/navigation', () => ({ - beforeNavigate: () => {}, - afterNavigate: () => {}, - goto: vi.fn(), - invalidate: vi.fn(), - invalidateAll: vi.fn(), - preloadCode: vi.fn(), - preloadData: vi.fn(), - pushState: vi.fn(), - replaceState: vi.fn(), - disableScrollHandling: vi.fn(), - onNavigate: () => () => {} -})); +vi.mock('$app/navigation'); vi.mock('$lib/notification/notifications.svelte', () => ({ notificationStore: { diff --git a/frontend/src/routes/briefwechsel/CorrespondenzHero.svelte.spec.ts b/frontend/src/routes/briefwechsel/CorrespondenzHero.svelte.spec.ts index cad5bc96..18f1f504 100644 --- a/frontend/src/routes/briefwechsel/CorrespondenzHero.svelte.spec.ts +++ b/frontend/src/routes/briefwechsel/CorrespondenzHero.svelte.spec.ts @@ -3,7 +3,7 @@ import { cleanup, render } from 'vitest-browser-svelte'; import { page } from 'vitest/browser'; import CorrespondenzHero from './CorrespondenzHero.svelte'; -vi.mock('$app/navigation', () => ({ goto: vi.fn() })); +vi.mock('$app/navigation'); afterEach(cleanup); diff --git a/frontend/src/routes/briefwechsel/page.svelte.spec.ts b/frontend/src/routes/briefwechsel/page.svelte.spec.ts index f23171d8..ba373cc3 100644 --- a/frontend/src/routes/briefwechsel/page.svelte.spec.ts +++ b/frontend/src/routes/briefwechsel/page.svelte.spec.ts @@ -3,7 +3,7 @@ import { cleanup, render } from 'vitest-browser-svelte'; import { page } from 'vitest/browser'; import Page from './+page.svelte'; -vi.mock('$app/navigation', () => ({ goto: vi.fn() })); +vi.mock('$app/navigation'); afterEach(cleanup); diff --git a/frontend/src/routes/briefwechsel/page.svelte.test.ts b/frontend/src/routes/briefwechsel/page.svelte.test.ts index 8bbcd354..ecf0a434 100644 --- a/frontend/src/routes/briefwechsel/page.svelte.test.ts +++ b/frontend/src/routes/briefwechsel/page.svelte.test.ts @@ -2,19 +2,7 @@ import { describe, it, expect, vi, afterEach } from 'vitest'; import { cleanup, render } from 'vitest-browser-svelte'; import { page } from 'vitest/browser'; -vi.mock('$app/navigation', () => ({ - beforeNavigate: () => {}, - afterNavigate: () => {}, - goto: vi.fn(), - invalidate: vi.fn(), - invalidateAll: vi.fn(), - preloadCode: vi.fn(), - preloadData: vi.fn(), - pushState: vi.fn(), - replaceState: vi.fn(), - disableScrollHandling: vi.fn(), - onNavigate: () => () => {} -})); +vi.mock('$app/navigation'); const { default: BriefwechselPage } = await import('./+page.svelte'); diff --git a/frontend/src/routes/documents/[id]/page.svelte.test.ts b/frontend/src/routes/documents/[id]/page.svelte.test.ts index d3ee08f0..26f4be93 100644 --- a/frontend/src/routes/documents/[id]/page.svelte.test.ts +++ b/frontend/src/routes/documents/[id]/page.svelte.test.ts @@ -13,19 +13,7 @@ vi.mock('$app/state', () => ({ } })); -vi.mock('$app/navigation', () => ({ - beforeNavigate: () => {}, - afterNavigate: () => {}, - goto: vi.fn(), - invalidate: vi.fn(), - invalidateAll: vi.fn(), - preloadCode: vi.fn(), - preloadData: vi.fn(), - pushState: vi.fn(), - replaceState: vi.fn(), - disableScrollHandling: vi.fn(), - onNavigate: () => () => {} -})); +vi.mock('$app/navigation'); vi.mock('$lib/shared/services/confirm.svelte', () => ({ getConfirmService: () => ({ confirm: async () => false }) diff --git a/frontend/src/routes/documents/bulk-edit/page.svelte.test.ts b/frontend/src/routes/documents/bulk-edit/page.svelte.test.ts index a455ced2..cabb9deb 100644 --- a/frontend/src/routes/documents/bulk-edit/page.svelte.test.ts +++ b/frontend/src/routes/documents/bulk-edit/page.svelte.test.ts @@ -1,21 +1,9 @@ import { describe, it, expect, vi, afterEach } from 'vitest'; import { cleanup, render } from 'vitest-browser-svelte'; import { page } from 'vitest/browser'; +import { goto } from '$app/navigation'; -const gotoSpy = vi.fn(); -vi.mock('$app/navigation', () => ({ - beforeNavigate: () => {}, - afterNavigate: () => {}, - goto: gotoSpy, - invalidate: vi.fn(), - invalidateAll: vi.fn(), - preloadCode: vi.fn(), - preloadData: vi.fn(), - pushState: vi.fn(), - replaceState: vi.fn(), - disableScrollHandling: vi.fn(), - onNavigate: () => () => {} -})); +vi.mock('$app/navigation'); const { bulkSelectionStore } = await import('$lib/document/bulkSelection.svelte'); const { default: BulkEditPage } = await import('./+page.svelte'); @@ -23,14 +11,14 @@ const { default: BulkEditPage } = await import('./+page.svelte'); afterEach(() => { cleanup(); bulkSelectionStore.clear(); - gotoSpy.mockClear(); + vi.mocked(goto).mockClear(); }); describe('documents/bulk-edit page', () => { it('redirects to /documents when no documents are selected', async () => { render(BulkEditPage, { props: {} }); - await vi.waitFor(() => expect(gotoSpy).toHaveBeenCalledWith('/documents')); + await vi.waitFor(() => expect(vi.mocked(goto)).toHaveBeenCalledWith('/documents')); }); it('shows the loading spinner while fetching batch metadata', async () => { diff --git a/frontend/src/routes/documents/page.svelte.spec.ts b/frontend/src/routes/documents/page.svelte.spec.ts index da97bcec..bf08c53e 100644 --- a/frontend/src/routes/documents/page.svelte.spec.ts +++ b/frontend/src/routes/documents/page.svelte.spec.ts @@ -2,7 +2,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; import { cleanup, render } from 'vitest-browser-svelte'; import { page } from 'vitest/browser'; -vi.mock('$app/navigation', () => ({ goto: vi.fn() })); +vi.mock('$app/navigation'); vi.mock('$app/state', () => ({ navigating: { to: null } })); import Page from './+page.svelte'; diff --git a/frontend/src/routes/documents/page.svelte.test.ts b/frontend/src/routes/documents/page.svelte.test.ts index 5731ea18..e8fb3ba3 100644 --- a/frontend/src/routes/documents/page.svelte.test.ts +++ b/frontend/src/routes/documents/page.svelte.test.ts @@ -4,19 +4,7 @@ import { page } from 'vitest/browser'; const mockNavigating = { to: null }; -vi.mock('$app/navigation', () => ({ - beforeNavigate: () => {}, - afterNavigate: () => {}, - goto: vi.fn(), - invalidate: vi.fn(), - invalidateAll: vi.fn(), - preloadCode: vi.fn(), - preloadData: vi.fn(), - pushState: vi.fn(), - replaceState: vi.fn(), - disableScrollHandling: vi.fn(), - onNavigate: () => () => {} -})); +vi.mock('$app/navigation'); vi.mock('$app/state', () => ({ get navigating() { diff --git a/frontend/src/routes/geschichten/[id]/edit/page.svelte.test.ts b/frontend/src/routes/geschichten/[id]/edit/page.svelte.test.ts index 5376edb6..1196443e 100644 --- a/frontend/src/routes/geschichten/[id]/edit/page.svelte.test.ts +++ b/frontend/src/routes/geschichten/[id]/edit/page.svelte.test.ts @@ -2,19 +2,7 @@ import { describe, it, expect, vi, afterEach } from 'vitest'; import { cleanup, render } from 'vitest-browser-svelte'; import { page } from 'vitest/browser'; -vi.mock('$app/navigation', () => ({ - beforeNavigate: () => {}, - afterNavigate: () => {}, - goto: vi.fn(), - invalidate: vi.fn(), - invalidateAll: vi.fn(), - preloadCode: vi.fn(), - preloadData: vi.fn(), - pushState: vi.fn(), - replaceState: vi.fn(), - disableScrollHandling: vi.fn(), - onNavigate: () => () => {} -})); +vi.mock('$app/navigation'); const { default: GeschichtenEditPage } = await import('./+page.svelte'); diff --git a/frontend/src/routes/geschichten/new/page.svelte.test.ts b/frontend/src/routes/geschichten/new/page.svelte.test.ts index 7e10a727..ba10167c 100644 --- a/frontend/src/routes/geschichten/new/page.svelte.test.ts +++ b/frontend/src/routes/geschichten/new/page.svelte.test.ts @@ -2,19 +2,7 @@ import { describe, it, expect, vi, afterEach } from 'vitest'; import { cleanup, render } from 'vitest-browser-svelte'; import { page } from 'vitest/browser'; -vi.mock('$app/navigation', () => ({ - beforeNavigate: () => {}, - afterNavigate: () => {}, - goto: vi.fn(), - invalidate: vi.fn(), - invalidateAll: vi.fn(), - preloadCode: vi.fn(), - preloadData: vi.fn(), - pushState: vi.fn(), - replaceState: vi.fn(), - disableScrollHandling: vi.fn(), - onNavigate: () => () => {} -})); +vi.mock('$app/navigation'); const { default: GeschichtenNewPage } = await import('./+page.svelte'); diff --git a/frontend/src/routes/geschichten/page.svelte.spec.ts b/frontend/src/routes/geschichten/page.svelte.spec.ts index f5f7621e..b0c9e0ff 100644 --- a/frontend/src/routes/geschichten/page.svelte.spec.ts +++ b/frontend/src/routes/geschichten/page.svelte.spec.ts @@ -2,7 +2,7 @@ import { afterEach, describe, expect, it, vi } from 'vitest'; import { cleanup, render } from 'vitest-browser-svelte'; import { page } from 'vitest/browser'; -vi.mock('$app/navigation', () => ({ goto: vi.fn() })); +vi.mock('$app/navigation'); vi.mock('$app/state', () => ({ navigating: { to: null } })); import Page from './+page.svelte'; diff --git a/frontend/src/routes/geschichten/page.svelte.test.ts b/frontend/src/routes/geschichten/page.svelte.test.ts index d5e78ba0..94b6d69a 100644 --- a/frontend/src/routes/geschichten/page.svelte.test.ts +++ b/frontend/src/routes/geschichten/page.svelte.test.ts @@ -2,19 +2,7 @@ import { describe, it, expect, vi, afterEach } from 'vitest'; import { cleanup, render } from 'vitest-browser-svelte'; import { page } from 'vitest/browser'; -vi.mock('$app/navigation', () => ({ - beforeNavigate: () => {}, - afterNavigate: () => {}, - goto: vi.fn(), - invalidate: vi.fn(), - invalidateAll: vi.fn(), - preloadCode: vi.fn(), - preloadData: vi.fn(), - pushState: vi.fn(), - replaceState: vi.fn(), - disableScrollHandling: vi.fn(), - onNavigate: () => () => {} -})); +vi.mock('$app/navigation'); const { default: GeschichtenListPage } = await import('./+page.svelte'); diff --git a/frontend/src/routes/page.svelte.spec.ts b/frontend/src/routes/page.svelte.spec.ts index a022cafa..bc6b48c1 100644 --- a/frontend/src/routes/page.svelte.spec.ts +++ b/frontend/src/routes/page.svelte.spec.ts @@ -8,7 +8,7 @@ type User = components['schemas']['AppUser']; afterEach(cleanup); -vi.mock('$app/navigation', () => ({ goto: vi.fn(), invalidateAll: vi.fn() })); +vi.mock('$app/navigation'); const baseUser: User = { id: 'u1', diff --git a/frontend/src/routes/persons/page.svelte.spec.ts b/frontend/src/routes/persons/page.svelte.spec.ts index 19697f80..c9625023 100644 --- a/frontend/src/routes/persons/page.svelte.spec.ts +++ b/frontend/src/routes/persons/page.svelte.spec.ts @@ -5,7 +5,7 @@ import Page from './+page.svelte'; const tick = () => new Promise((r) => setTimeout(r, 0)); -vi.mock('$app/navigation', () => ({ goto: vi.fn() })); +vi.mock('$app/navigation'); const makePerson = (overrides = {}) => ({ id: '1', diff --git a/frontend/src/routes/persons/page.svelte.test.ts b/frontend/src/routes/persons/page.svelte.test.ts index 71d90e6f..9d46c761 100644 --- a/frontend/src/routes/persons/page.svelte.test.ts +++ b/frontend/src/routes/persons/page.svelte.test.ts @@ -2,19 +2,7 @@ import { describe, it, expect, vi, afterEach } from 'vitest'; import { cleanup, render } from 'vitest-browser-svelte'; import { page } from 'vitest/browser'; -vi.mock('$app/navigation', () => ({ - beforeNavigate: () => {}, - afterNavigate: () => {}, - goto: vi.fn(), - invalidate: vi.fn(), - invalidateAll: vi.fn(), - preloadCode: vi.fn(), - preloadData: vi.fn(), - pushState: vi.fn(), - replaceState: vi.fn(), - disableScrollHandling: vi.fn(), - onNavigate: () => () => {} -})); +vi.mock('$app/navigation'); const { default: PersonsListPage } = await import('./+page.svelte');