Skip to content

Commit 3ec9c9d

Browse files
committed
Added full trailingSlash options testing matrix
1 parent 7cc7d00 commit 3ec9c9d

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

packages/react-router/tests/link.test.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import {
4141
getSearchParamsFromURI,
4242
sleep,
4343
} from './utils'
44-
import type { RouterHistory } from '../src'
44+
import type { RouterHistory, TrailingSlashOption } from '../src'
4545

4646
const ioObserveMock = vi.fn()
4747
const ioDisconnectMock = vi.fn()
@@ -5550,10 +5550,10 @@ describe.each([{ basepath: '' }, { basepath: '/basepath' }])(
55505550
)
55515551

55525552
describe("splat routes with empty splat", () => {
5553-
test.each([{ trailingSlash: true }, { trailingSlash: false }])(
5553+
test.each([{ trailingSlash: "preserve" as TrailingSlashOption }, { trailingSlash: "always" as TrailingSlashOption }, { trailingSlash: "never" as TrailingSlashOption }])(
55545554
'should handle empty _splat parameter with trailingSlash: $trailingSlash',
55555555
async ({ trailingSlash }) => {
5556-
const tail = trailingSlash ? '/' : ''
5556+
const tail = trailingSlash === "always" ? '/' : ''
55575557

55585558
const rootRoute = createRootRoute()
55595559
const indexRoute = createRoute({
@@ -5605,7 +5605,7 @@ describe("splat routes with empty splat", () => {
56055605
const router = createRouter({
56065606
routeTree: rootRoute.addChildren([indexRoute, splatRoute]),
56075607
history,
5608-
trailingSlash: trailingSlash ? 'always' : 'never',
5608+
trailingSlash,
56095609
})
56105610

56115611
render(<RouterProvider router={router} />)

packages/react-router/tests/navigate.test.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
createRoute,
77
createRouter,
88
} from '../src'
9-
import type { RouterHistory } from '../src'
9+
import type { RouterHistory, TrailingSlashOption } from '../src'
1010

1111
afterEach(() => {
1212
vi.clearAllMocks()
@@ -1240,10 +1240,10 @@ describe('router.navigate navigation using optional path parameters - edge cases
12401240
})
12411241

12421242
describe('splat routes with empty splat', () => {
1243-
it.each([{ trailingSlash: true }, { trailingSlash: false }])(
1243+
it.each([{ trailingSlash: "preserve" as TrailingSlashOption }, { trailingSlash: "always" as TrailingSlashOption }, { trailingSlash: "never" as TrailingSlashOption }])(
12441244
'should handle empty _splat parameter with trailingSlash: $trailingSlash',
12451245
async ({ trailingSlash }) => {
1246-
const tail = trailingSlash ? '/' : ''
1246+
const tail = trailingSlash === "always" ? '/' : ''
12471247

12481248
const history = createMemoryHistory({ initialEntries: ['/'] })
12491249

@@ -1261,7 +1261,7 @@ describe('splat routes with empty splat', () => {
12611261
const router = createRouter({
12621262
routeTree: rootRoute.addChildren([indexRoute, splatRoute]),
12631263
history,
1264-
trailingSlash: trailingSlash ? 'always' : 'never',
1264+
trailingSlash,
12651265
})
12661266

12671267
await router.load()

packages/react-router/tests/useNavigate.test.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import {
2323
useNavigate,
2424
useParams,
2525
} from '../src'
26-
import type { RouterHistory } from '../src'
26+
import type { RouterHistory, TrailingSlashOption } from '../src'
2727

2828
let history: RouterHistory
2929

@@ -2557,10 +2557,10 @@ describe.each([{ basepath: '' }, { basepath: '/basepath' }])(
25572557
)
25582558

25592559
describe('splat routes with empty splat', () => {
2560-
test.each([{ trailingSlash: true }, { trailingSlash: false }])(
2560+
test.each([{ trailingSlash: "preserve" as TrailingSlashOption }, { trailingSlash: "always" as TrailingSlashOption }, { trailingSlash: "never" as TrailingSlashOption }])(
25612561
'should handle empty _splat parameter with trailingSlash: $trailingSlash',
25622562
async ({ trailingSlash }) => {
2563-
const tail = trailingSlash ? '/' : ''
2563+
const tail = trailingSlash === "always" ? '/' : ''
25642564

25652565
const rootRoute = createRootRoute()
25662566
const indexRoute = createRoute({
@@ -2623,7 +2623,7 @@ describe('splat routes with empty splat', () => {
26232623
const router = createRouter({
26242624
routeTree: rootRoute.addChildren([indexRoute, splatRoute]),
26252625
history,
2626-
trailingSlash: trailingSlash ? 'always' : 'never',
2626+
trailingSlash,
26272627
})
26282628

26292629
render(<RouterProvider router={router} />)

0 commit comments

Comments
 (0)