Skip to content

Commit 1b5b17c

Browse files
author
Paul Sachs
committed
Refactored the trailing slash cases
1 parent 3ec9c9d commit 1b5b17c

4 files changed

Lines changed: 12 additions & 6 deletions

File tree

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@ import {
4040
getIntersectionObserverMock,
4141
getSearchParamsFromURI,
4242
sleep,
43+
trailingSlashCases,
4344
} from './utils'
44-
import type { RouterHistory, TrailingSlashOption } from '../src'
45+
import type { RouterHistory } from '../src'
4546

4647
const ioObserveMock = vi.fn()
4748
const ioDisconnectMock = vi.fn()
@@ -5550,7 +5551,7 @@ describe.each([{ basepath: '' }, { basepath: '/basepath' }])(
55505551
)
55515552

55525553
describe("splat routes with empty splat", () => {
5553-
test.each([{ trailingSlash: "preserve" as TrailingSlashOption }, { trailingSlash: "always" as TrailingSlashOption }, { trailingSlash: "never" as TrailingSlashOption }])(
5554+
test.each(trailingSlashCases)(
55545555
'should handle empty _splat parameter with trailingSlash: $trailingSlash',
55555556
async ({ trailingSlash }) => {
55565557
const tail = trailingSlash === "always" ? '/' : ''

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import {
66
createRoute,
77
createRouter,
88
} from '../src'
9-
import type { RouterHistory, TrailingSlashOption } from '../src'
9+
import { trailingSlashCases } from './utils'
10+
import type { RouterHistory } from '../src'
1011

1112
afterEach(() => {
1213
vi.clearAllMocks()
@@ -1240,7 +1241,7 @@ describe('router.navigate navigation using optional path parameters - edge cases
12401241
})
12411242

12421243
describe('splat routes with empty splat', () => {
1243-
it.each([{ trailingSlash: "preserve" as TrailingSlashOption }, { trailingSlash: "always" as TrailingSlashOption }, { trailingSlash: "never" as TrailingSlashOption }])(
1244+
it.each(trailingSlashCases)(
12441245
'should handle empty _splat parameter with trailingSlash: $trailingSlash',
12451246
async ({ trailingSlash }) => {
12461247
const tail = trailingSlash === "always" ? '/' : ''

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
} from '@testing-library/react'
1111

1212
import { z } from 'zod'
13+
1314
import {
1415
Navigate,
1516
Outlet,
@@ -23,7 +24,8 @@ import {
2324
useNavigate,
2425
useParams,
2526
} from '../src'
26-
import type { RouterHistory, TrailingSlashOption } from '../src'
27+
import { trailingSlashCases } from './utils'
28+
import type { RouterHistory } from '../src'
2729

2830
let history: RouterHistory
2931

@@ -2557,7 +2559,7 @@ describe.each([{ basepath: '' }, { basepath: '/basepath' }])(
25572559
)
25582560

25592561
describe('splat routes with empty splat', () => {
2560-
test.each([{ trailingSlash: "preserve" as TrailingSlashOption }, { trailingSlash: "always" as TrailingSlashOption }, { trailingSlash: "never" as TrailingSlashOption }])(
2562+
test.each(trailingSlashCases)(
25612563
'should handle empty _splat parameter with trailingSlash: $trailingSlash',
25622564
async ({ trailingSlash }) => {
25632565
const tail = trailingSlash === "always" ? '/' : ''

‎packages/react-router/tests/utils.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,5 @@ export function getSearchParamsFromURI(uri: string) {
5454
const [, paramString] = uri.split('?')
5555
return new URLSearchParams(paramString)
5656
}
57+
58+
export const trailingSlashCases = (['preserve','always','never'] as const).map((t) => ({ trailingSlash: t }))

0 commit comments

Comments
 (0)