[risk=low][RW-13601] Upgrade react-router to 6 #8780
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,8 @@ import '@testing-library/jest-dom'; | |
|
|
||
| import * as React from 'react'; | ||
| import { MemoryRouter } from 'react-router'; | ||
|
There was a problem hiding this comment. Navigate is the replacement for Redirect |
||
| import { Switch } from 'react-router-dom'; | ||
| import { Navigate } from 'react-router-dom-v5-compat'; | ||
|
|
||
| import { render, screen } from '@testing-library/react'; | ||
| import { AppRoute, AppRouter, Guard } from 'app/components/app-router'; | ||
|
|
@@ -17,6 +18,17 @@ jest.mock('react-router-dom', () => { | |
| }; | ||
| }); | ||
|
|
||
| // unsure if this is needed | ||
| jest.mock('react-router-dom-v5-compat', () => { | ||
| const originalModule = jest.requireActual('react-router-dom-v5-compat'); | ||
|
|
||
| return { | ||
| __esModule: true, | ||
| ...originalModule, | ||
| BrowserRouter: ({ children }) => <div>{children}</div>, | ||
| }; | ||
| }); | ||
|
|
||
| class TestComponent extends React.Component<{ text: String }> { | ||
| render() { | ||
| return <span>{this.props.text}</span>; | ||
|
|
@@ -43,107 +55,97 @@ const renderingFalseGuard: Guard = { | |
| renderBlocked: () => <span>guard component</span>, | ||
| }; | ||
|
|
||
|
There was a problem hiding this comment. initialIndex was not used |
||
| const TestAppRouter = () => ( | ||
|
There was a problem hiding this comment. no changes, just componentizing it. (hide whitespace) |
||
| <AppRouter> | ||
| <Switch> | ||
| <AppRoute exact path='/unprotected-route'> | ||
| <TestComponent text={'Unprotected Route'} /> | ||
| </AppRoute> | ||
| <AppRoute exact path='/punting'> | ||
| <TestComponent text={'Punting'} /> | ||
| </AppRoute> | ||
| <AppRoute exact path='/unreachable-path' guards={[alwaysFalseGuard]}> | ||
| <TestComponent text={'Unreachable Path'} /> | ||
| </AppRoute> | ||
| <AppRoute exact path='/protected-route' guards={[alwaysTrueGuard]}> | ||
| <TestComponent text={'Protected Route'} /> | ||
| </AppRoute> | ||
| <AppRoute exact path='/block-render-route' guards={[renderingFalseGuard]}> | ||
| <TestComponent text={'Rendering Route'} /> | ||
| </AppRoute> | ||
| <AppRoute exact path='/other-protected-route' guards={[alwaysTrueGuard]}> | ||
| <TestComponent text={'Other Protected Route'} /> | ||
| </AppRoute> | ||
| <AppRoute | ||
| exact | ||
| path='/nested-protected-route' | ||
| guards={[alwaysTrueGuard, otherAlwaysTrueGuard]} | ||
| > | ||
| <TestComponent text={'Nested Protected Route'} /> | ||
| </AppRoute> | ||
| <AppRoute | ||
| exact | ||
| path='/nested-unreachable-path' | ||
| guards={[alwaysTrueGuard, alwaysFalseGuard]} | ||
| > | ||
| <TestComponent text={'Unreachable Path'} /> | ||
| </AppRoute> | ||
| <AppRoute exact path='/not-found'> | ||
| <TestComponent text={'Not Found'} /> | ||
| </AppRoute> | ||
| <AppRoute exact path='*'> | ||
| <Navigate to='/not-found' /> | ||
| </AppRoute> | ||
| </Switch> | ||
| </AppRouter> | ||
| ); | ||
|
|
||
| describe(AppRouter.name, () => { | ||
| const component = (initialEntries: string[]) => { | ||
| return render( | ||
| <MemoryRouter initialEntries={initialEntries}> | ||
| <TestAppRouter /> | ||
| </MemoryRouter> | ||
| ); | ||
| }; | ||
|
|
||
| it('allows anyone into unprotected route', () => { | ||
| component(['/unprotected-route']); | ||
| expect(screen.getByText('Unprotected Route')).toBeInTheDocument(); | ||
| }); | ||
|
|
||
| it('punts when user fails guard', () => { | ||
| component(['/unreachable-path']); | ||
| expect(screen.getByText('Punting')).toBeInTheDocument(); | ||
| }); | ||
|
|
||
| it('renders when user passes guard', () => { | ||
| component(['/protected-route']); | ||
| expect(screen.getByText('Protected Route')).toBeInTheDocument(); | ||
| }); | ||
|
|
||
| it('renders for sibling routes under a guard', () => { | ||
| component(['/other-protected-route']); | ||
| expect(screen.getByText('Other Protected Route')).toBeInTheDocument(); | ||
| }); | ||
|
|
||
| it('renders for nested protectedRoutes', () => { | ||
| component(['/nested-protected-route']); | ||
| expect(screen.getByText('Nested Protected Route')).toBeInTheDocument(); | ||
| }); | ||
|
|
||
| it('punts on failed nested protected route', () => { | ||
| component(['/nested-unreachable-path']); | ||
| expect(screen.getByText('Punting')).toBeInTheDocument(); | ||
| }); | ||
|
|
||
| it('redirects to not found page when no route is matched', async () => { | ||
| component(['/wharrgarbl']); | ||
| expect(await screen.findByText('Not Found')).toBeInTheDocument(); | ||
| }); | ||
|
|
||
| it('renders content when guard fails', () => { | ||
| component(['/block-render-route']); | ||
| expect(screen.getByText('guard component')).toBeInTheDocument(); | ||
| }); | ||
| }); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
just matches the version we were already using