Skip to content

Commit 0b56d04

Browse files
committed
fix test setup: use new memory history for every test
1 parent f68f3d6 commit 0b56d04

1 file changed

Lines changed: 18 additions & 16 deletions

File tree

‎packages/router-core/tests/load.test.ts‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { describe, expect, test, vi } from 'vitest'
2+
import { createMemoryHistory } from '@tanstack/history'
23
import {
34
BaseRootRoute,
45
BaseRoute,
@@ -30,12 +31,13 @@ describe('beforeLoad skip or exec', () => {
3031

3132
const router = new RouterCore({
3233
routeTree,
34+
history: createMemoryHistory(),
3335
})
3436

3537
return router
3638
}
3739

38-
test('nothing happens if nothing happens', async () => {
40+
test('baseline', async () => {
3941
const beforeLoad = vi.fn()
4042
const router = setup({ beforeLoad })
4143
await router.load()
@@ -65,13 +67,10 @@ describe('beforeLoad skip or exec', () => {
6567
expect(beforeLoad).toHaveBeenCalledTimes(1)
6668
})
6769

68-
test('skip if preload is ongoing', async () => {
69-
const beforeLoad = vi.fn(
70-
() => new Promise((resolve) => setTimeout(resolve, 100)),
71-
)
70+
test('skip if resolved preload (success)', async () => {
71+
const beforeLoad = vi.fn()
7272
const router = setup({ beforeLoad })
73-
router.preloadRoute({ to: '/foo' })
74-
await Promise.resolve()
73+
await router.preloadRoute({ to: '/foo' })
7574
expect(router.state.cachedMatches).toEqual(
7675
expect.arrayContaining([expect.objectContaining({ id: '/foo' })]),
7776
)
@@ -80,10 +79,13 @@ describe('beforeLoad skip or exec', () => {
8079
expect(beforeLoad).toHaveBeenCalledTimes(1)
8180
})
8281

83-
test('skip if preload resolved successfully', async () => {
84-
const beforeLoad = vi.fn()
82+
test('skip if pending preload (success)', async () => {
83+
const beforeLoad = vi.fn(
84+
() => new Promise((resolve) => setTimeout(resolve, 100)),
85+
)
8586
const router = setup({ beforeLoad })
86-
await router.preloadRoute({ to: '/foo' })
87+
router.preloadRoute({ to: '/foo' })
88+
await Promise.resolve()
8789
expect(router.state.cachedMatches).toEqual(
8890
expect.arrayContaining([expect.objectContaining({ id: '/foo' })]),
8991
)
@@ -92,7 +94,7 @@ describe('beforeLoad skip or exec', () => {
9294
expect(beforeLoad).toHaveBeenCalledTimes(1)
9395
})
9496

95-
test('exec if preload has rejected w/ notFound', async () => {
97+
test('exec if rejected preload (notFound)', async () => {
9698
const beforeLoad = vi.fn<BeforeLoad>(async ({ preload }) => {
9799
if (preload) throw notFound()
98100
await Promise.resolve()
@@ -106,7 +108,7 @@ describe('beforeLoad skip or exec', () => {
106108
expect(beforeLoad).toHaveBeenCalledTimes(2)
107109
})
108110

109-
test('exec if preload is pending, but will reject w/ notFound', async () => {
111+
test('exec if pending preload (notFound)', async () => {
110112
const beforeLoad = vi.fn<BeforeLoad>(async ({ preload }) => {
111113
await new Promise((resolve) => setTimeout(resolve, 100))
112114
if (preload) throw notFound()
@@ -121,7 +123,7 @@ describe('beforeLoad skip or exec', () => {
121123
expect(beforeLoad).toHaveBeenCalledTimes(2)
122124
})
123125

124-
test('exec if preload has rejected w/ redirect', async () => {
126+
test('exec if rejected preload (redirect)', async () => {
125127
const beforeLoad = vi.fn<BeforeLoad>(async ({ preload }) => {
126128
if (preload) throw redirect({ to: '/bar' })
127129
await Promise.resolve()
@@ -136,7 +138,7 @@ describe('beforeLoad skip or exec', () => {
136138
expect(beforeLoad).toHaveBeenCalledTimes(2)
137139
})
138140

139-
test('exec if preload is pending, but will reject w/ redirect', async () => {
141+
test('exec if pending preload (redirect)', async () => {
140142
const beforeLoad = vi.fn<BeforeLoad>(async ({ preload }) => {
141143
await new Promise((resolve) => setTimeout(resolve, 100))
142144
if (preload) throw redirect({ to: '/bar' })
@@ -152,7 +154,7 @@ describe('beforeLoad skip or exec', () => {
152154
expect(beforeLoad).toHaveBeenCalledTimes(2)
153155
})
154156

155-
test('exec if preload has rejected w/ regular Error', async () => {
157+
test('exec if rejected preload (error)', async () => {
156158
const beforeLoad = vi.fn<BeforeLoad>(async ({ preload }) => {
157159
if (preload) throw new Error('error')
158160
await Promise.resolve()
@@ -166,7 +168,7 @@ describe('beforeLoad skip or exec', () => {
166168
expect(beforeLoad).toHaveBeenCalledTimes(2)
167169
})
168170

169-
test('exec if preload is pending, but will reject w/ regular Error', async () => {
171+
test('exec if pending preload (error)', async () => {
170172
const beforeLoad = vi.fn<BeforeLoad>(async ({ preload }) => {
171173
await new Promise((resolve) => setTimeout(resolve, 100))
172174
if (preload) throw new Error('error')

0 commit comments

Comments
 (0)