Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions packages/react-router/tests/router.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1816,3 +1816,44 @@ describe('does not strip search params if search validation fails', () => {
expect(window.location.search).toBe('?root=hello')
})
})

describe('statusCode reset on navigation', () => {
it('should reset statusCode to 200 when navigating from 404 to valid route', async () => {
const history = createMemoryHistory({ initialEntries: ['/'] })

const rootRoute = createRootRoute({
component: () => <Outlet />,
})

const indexRoute = createRoute({
getParentRoute: () => rootRoute,
path: '/',
component: () => <div>Home</div>,
})

const validRoute = createRoute({
getParentRoute: () => rootRoute,
path: '/valid',
component: () => <div>Valid Route</div>,
})

const routeTree = rootRoute.addChildren([indexRoute, validRoute])
const router = createRouter({ routeTree, history })

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

expect(router.state.statusCode).toBe(200)

await act(() => router.navigate({ to: '/' }))
expect(router.state.statusCode).toBe(200)

await act(() => router.navigate({ to: '/non-existing' }))
expect(router.state.statusCode).toBe(404)

await act(() => router.navigate({ to: '/valid' }))
expect(router.state.statusCode).toBe(200)

await act(() => router.navigate({ to: '/another-non-existing' }))
expect(router.state.statusCode).toBe(404)
})
})
1 change: 1 addition & 0 deletions packages/router-core/src/router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1796,6 +1796,7 @@ export class RouterCore<
this.__store.setState((s) => ({
...s,
status: 'pending',
statusCode: 200,
isLoading: true,
location: this.latestLocation,
pendingMatches,
Expand Down
41 changes: 41 additions & 0 deletions packages/solid-router/tests/router.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1591,3 +1591,44 @@ describe('does not strip search params if search validation fails', () => {
expect(window.location.search).toBe('?root=hello')
})
})

describe('statusCode reset on navigation', () => {
it('should reset statusCode to 200 when navigating from 404 to valid route', async () => {
const history = createMemoryHistory({ initialEntries: ['/'] })

const rootRoute = createRootRoute({
component: () => <Outlet />,
})

const indexRoute = createRoute({
getParentRoute: () => rootRoute,
path: '/',
component: () => <div>Home</div>,
})

const validRoute = createRoute({
getParentRoute: () => rootRoute,
path: '/valid',
component: () => <div>Valid Route</div>,
})

const routeTree = rootRoute.addChildren([indexRoute, validRoute])
const router = createRouter({ routeTree, history })

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

expect(router.state.statusCode).toBe(200)

await router.navigate({ to: '/' })
await waitFor(() => expect(router.state.statusCode).toBe(200))

await router.navigate({ to: '/non-existing' })
await waitFor(() => expect(router.state.statusCode).toBe(404))

await router.navigate({ to: '/valid' })
await waitFor(() => expect(router.state.statusCode).toBe(200))

await router.navigate({ to: '/another-non-existing' })
await waitFor(() => expect(router.state.statusCode).toBe(404))
})
})