Skip to content

Commit fcf1a82

Browse files
authored
test: restructure transition e2e tests (#5800)
1 parent 3028156 commit fcf1a82

File tree

14 files changed

+286
-80
lines changed

14 files changed

+286
-80
lines changed

e2e/react-router/basic-react-query-file-based/src/routeTree.gen.ts

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import { Route as rootRouteImport } from './routes/__root'
1212
import { Route as PostsRouteImport } from './routes/posts'
1313
import { Route as LayoutRouteImport } from './routes/_layout'
1414
import { Route as IndexRouteImport } from './routes/index'
15-
import { Route as TransitionIndexRouteImport } from './routes/transition/index'
1615
import { Route as PostsIndexRouteImport } from './routes/posts.index'
1716
import { Route as PostsPostIdRouteImport } from './routes/posts.$postId'
1817
import { Route as LayoutLayout2RouteImport } from './routes/_layout/_layout-2'
18+
import { Route as TransitionCountQueryRouteImport } from './routes/transition/count/query'
1919
import { Route as LayoutLayout2LayoutBRouteImport } from './routes/_layout/_layout-2/layout-b'
2020
import { Route as LayoutLayout2LayoutARouteImport } from './routes/_layout/_layout-2/layout-a'
2121

@@ -33,11 +33,6 @@ const IndexRoute = IndexRouteImport.update({
3333
path: '/',
3434
getParentRoute: () => rootRouteImport,
3535
} as any)
36-
const TransitionIndexRoute = TransitionIndexRouteImport.update({
37-
id: '/transition/',
38-
path: '/transition/',
39-
getParentRoute: () => rootRouteImport,
40-
} as any)
4136
const PostsIndexRoute = PostsIndexRouteImport.update({
4237
id: '/',
4338
path: '/',
@@ -52,6 +47,11 @@ const LayoutLayout2Route = LayoutLayout2RouteImport.update({
5247
id: '/_layout-2',
5348
getParentRoute: () => LayoutRoute,
5449
} as any)
50+
const TransitionCountQueryRoute = TransitionCountQueryRouteImport.update({
51+
id: '/transition/count/query',
52+
path: '/transition/count/query',
53+
getParentRoute: () => rootRouteImport,
54+
} as any)
5555
const LayoutLayout2LayoutBRoute = LayoutLayout2LayoutBRouteImport.update({
5656
id: '/layout-b',
5757
path: '/layout-b',
@@ -68,17 +68,17 @@ export interface FileRoutesByFullPath {
6868
'/posts': typeof PostsRouteWithChildren
6969
'/posts/$postId': typeof PostsPostIdRoute
7070
'/posts/': typeof PostsIndexRoute
71-
'/transition': typeof TransitionIndexRoute
7271
'/layout-a': typeof LayoutLayout2LayoutARoute
7372
'/layout-b': typeof LayoutLayout2LayoutBRoute
73+
'/transition/count/query': typeof TransitionCountQueryRoute
7474
}
7575
export interface FileRoutesByTo {
7676
'/': typeof IndexRoute
7777
'/posts/$postId': typeof PostsPostIdRoute
7878
'/posts': typeof PostsIndexRoute
79-
'/transition': typeof TransitionIndexRoute
8079
'/layout-a': typeof LayoutLayout2LayoutARoute
8180
'/layout-b': typeof LayoutLayout2LayoutBRoute
81+
'/transition/count/query': typeof TransitionCountQueryRoute
8282
}
8383
export interface FileRoutesById {
8484
__root__: typeof rootRouteImport
@@ -88,9 +88,9 @@ export interface FileRoutesById {
8888
'/_layout/_layout-2': typeof LayoutLayout2RouteWithChildren
8989
'/posts/$postId': typeof PostsPostIdRoute
9090
'/posts/': typeof PostsIndexRoute
91-
'/transition/': typeof TransitionIndexRoute
9291
'/_layout/_layout-2/layout-a': typeof LayoutLayout2LayoutARoute
9392
'/_layout/_layout-2/layout-b': typeof LayoutLayout2LayoutBRoute
93+
'/transition/count/query': typeof TransitionCountQueryRoute
9494
}
9595
export interface FileRouteTypes {
9696
fileRoutesByFullPath: FileRoutesByFullPath
@@ -99,17 +99,17 @@ export interface FileRouteTypes {
9999
| '/posts'
100100
| '/posts/$postId'
101101
| '/posts/'
102-
| '/transition'
103102
| '/layout-a'
104103
| '/layout-b'
104+
| '/transition/count/query'
105105
fileRoutesByTo: FileRoutesByTo
106106
to:
107107
| '/'
108108
| '/posts/$postId'
109109
| '/posts'
110-
| '/transition'
111110
| '/layout-a'
112111
| '/layout-b'
112+
| '/transition/count/query'
113113
id:
114114
| '__root__'
115115
| '/'
@@ -118,16 +118,16 @@ export interface FileRouteTypes {
118118
| '/_layout/_layout-2'
119119
| '/posts/$postId'
120120
| '/posts/'
121-
| '/transition/'
122121
| '/_layout/_layout-2/layout-a'
123122
| '/_layout/_layout-2/layout-b'
123+
| '/transition/count/query'
124124
fileRoutesById: FileRoutesById
125125
}
126126
export interface RootRouteChildren {
127127
IndexRoute: typeof IndexRoute
128128
LayoutRoute: typeof LayoutRouteWithChildren
129129
PostsRoute: typeof PostsRouteWithChildren
130-
TransitionIndexRoute: typeof TransitionIndexRoute
130+
TransitionCountQueryRoute: typeof TransitionCountQueryRoute
131131
}
132132

133133
declare module '@tanstack/react-router' {
@@ -153,13 +153,6 @@ declare module '@tanstack/react-router' {
153153
preLoaderRoute: typeof IndexRouteImport
154154
parentRoute: typeof rootRouteImport
155155
}
156-
'/transition/': {
157-
id: '/transition/'
158-
path: '/transition'
159-
fullPath: '/transition'
160-
preLoaderRoute: typeof TransitionIndexRouteImport
161-
parentRoute: typeof rootRouteImport
162-
}
163156
'/posts/': {
164157
id: '/posts/'
165158
path: '/'
@@ -181,6 +174,13 @@ declare module '@tanstack/react-router' {
181174
preLoaderRoute: typeof LayoutLayout2RouteImport
182175
parentRoute: typeof LayoutRoute
183176
}
177+
'/transition/count/query': {
178+
id: '/transition/count/query'
179+
path: '/transition/count/query'
180+
fullPath: '/transition/count/query'
181+
preLoaderRoute: typeof TransitionCountQueryRouteImport
182+
parentRoute: typeof rootRouteImport
183+
}
184184
'/_layout/_layout-2/layout-b': {
185185
id: '/_layout/_layout-2/layout-b'
186186
path: '/layout-b'
@@ -239,7 +239,7 @@ const rootRouteChildren: RootRouteChildren = {
239239
IndexRoute: IndexRoute,
240240
LayoutRoute: LayoutRouteWithChildren,
241241
PostsRoute: PostsRouteWithChildren,
242-
TransitionIndexRoute: TransitionIndexRoute,
242+
TransitionCountQueryRoute: TransitionCountQueryRoute,
243243
}
244244
export const routeTree = rootRouteImport
245245
._addFileChildren(rootRouteChildren)

e2e/react-router/basic-react-query-file-based/src/routes/transition/index.tsx renamed to e2e/react-router/basic-react-query-file-based/src/routes/transition/count/query.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const doubleQueryOptions = (n: number) =>
1717
placeholderData: (oldData) => oldData,
1818
})
1919

20-
export const Route = createFileRoute('/transition/')({
20+
export const Route = createFileRoute('/transition/count/query')({
2121
validateSearch: searchSchema,
2222
loader: ({ context: { queryClient }, location }) => {
2323
const { n } = searchSchema.parse(location.search)
@@ -37,7 +37,7 @@ function TransitionPage() {
3737
<Link
3838
data-testid="increase-button"
3939
className="border bg-gray-50 px-3 py-1"
40-
from="/transition"
40+
from="/transition/count/query"
4141
search={(s) => ({ n: s.n + 1 })}
4242
>
4343
Increase

e2e/react-router/basic-react-query-file-based/tests/transition.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { expect, test } from '@playwright/test'
33
test('react-query transitions keep previous data during navigation', async ({
44
page,
55
}) => {
6-
await page.goto('/transition')
6+
await page.goto('/transition/count/query')
77

88
await expect(page.getByTestId('n-value')).toContainText('n: 1')
99
await expect(page.getByTestId('double-value')).toContainText('double: 2')

e2e/solid-router/basic-file-based/src/routeTree.gen.ts

Lines changed: 44 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import { Route as Char45824Char54620Char48124Char44397RouteRouteImport } from '.
2121
import { Route as SearchParamsRouteRouteImport } from './routes/search-params/route'
2222
import { Route as NonNestedRouteRouteImport } from './routes/non-nested/route'
2323
import { Route as IndexRouteImport } from './routes/index'
24-
import { Route as TransitionIndexRouteImport } from './routes/transition/index'
2524
import { Route as SearchParamsIndexRouteImport } from './routes/search-params/index'
2625
import { Route as RelativeIndexRouteImport } from './routes/relative/index'
2726
import { Route as RedirectIndexRouteImport } from './routes/redirect/index'
@@ -48,6 +47,8 @@ import { Route as ParamsPsWildcardIndexRouteImport } from './routes/params-ps/wi
4847
import { Route as ParamsPsNamedIndexRouteImport } from './routes/params-ps/named/index'
4948
import { Route as Char45824Char54620Char48124Char44397Char55357Char56960IdRouteImport } from './routes/대한민국/🚀.$id'
5049
import { Route as Char45824Char54620Char48124Char44397WildcardSplatRouteImport } from './routes/대한민국/wildcard.$'
50+
import { Route as TransitionTypingCreateResourceRouteImport } from './routes/transition/typing/create-resource'
51+
import { Route as TransitionCountCreateResourceRouteImport } from './routes/transition/count/create-resource'
5152
import { Route as RelativeUseNavigateRelativeUseNavigateBRouteImport } from './routes/relative/useNavigate/relative-useNavigate-b'
5253
import { Route as RelativeUseNavigateRelativeUseNavigateARouteImport } from './routes/relative/useNavigate/relative-useNavigate-a'
5354
import { Route as RelativeLinkRelativeLinkBRouteImport } from './routes/relative/link/relative-link-b'
@@ -170,11 +171,6 @@ const IndexRoute = IndexRouteImport.update({
170171
path: '/',
171172
getParentRoute: () => rootRouteImport,
172173
} as any)
173-
const TransitionIndexRoute = TransitionIndexRouteImport.update({
174-
id: '/transition/',
175-
path: '/transition/',
176-
getParentRoute: () => rootRouteImport,
177-
} as any)
178174
const SearchParamsIndexRoute = SearchParamsIndexRouteImport.update({
179175
id: '/',
180176
path: '/',
@@ -309,6 +305,18 @@ const Char45824Char54620Char48124Char44397WildcardSplatRoute =
309305
path: '/wildcard/$',
310306
getParentRoute: () => Char45824Char54620Char48124Char44397RouteRoute,
311307
} as any)
308+
const TransitionTypingCreateResourceRoute =
309+
TransitionTypingCreateResourceRouteImport.update({
310+
id: '/transition/typing/create-resource',
311+
path: '/transition/typing/create-resource',
312+
getParentRoute: () => rootRouteImport,
313+
} as any)
314+
const TransitionCountCreateResourceRoute =
315+
TransitionCountCreateResourceRouteImport.update({
316+
id: '/transition/count/create-resource',
317+
path: '/transition/count/create-resource',
318+
getParentRoute: () => rootRouteImport,
319+
} as any)
312320
const RelativeUseNavigateRelativeUseNavigateBRoute =
313321
RelativeUseNavigateRelativeUseNavigateBRouteImport.update({
314322
id: '/relative-useNavigate-b',
@@ -680,7 +688,6 @@ export interface FileRoutesByFullPath {
680688
'/redirect': typeof RedirectIndexRoute
681689
'/relative': typeof RelativeIndexRoute
682690
'/search-params/': typeof SearchParamsIndexRoute
683-
'/transition': typeof TransitionIndexRoute
684691
'/non-nested/deep/$baz': typeof NonNestedDeepBazRouteRouteWithChildren
685692
'/non-nested/named/$baz': typeof NonNestedNamedBazRouteRouteWithChildren
686693
'/non-nested/path/baz': typeof NonNestedPathBazRouteRouteWithChildren
@@ -710,6 +717,8 @@ export interface FileRoutesByFullPath {
710717
'/relative/link/relative-link-b': typeof RelativeLinkRelativeLinkBRoute
711718
'/relative/useNavigate/relative-useNavigate-a': typeof RelativeUseNavigateRelativeUseNavigateARoute
712719
'/relative/useNavigate/relative-useNavigate-b': typeof RelativeUseNavigateRelativeUseNavigateBRoute
720+
'/transition/count/create-resource': typeof TransitionCountCreateResourceRoute
721+
'/transition/typing/create-resource': typeof TransitionTypingCreateResourceRoute
713722
'/대한민국/wildcard/$': typeof Char45824Char54620Char48124Char44397WildcardSplatRoute
714723
'/대한민국/🚀/$id': typeof Char45824Char54620Char48124Char44397Char55357Char56960IdRoute
715724
'/params-ps/named': typeof ParamsPsNamedIndexRoute
@@ -776,7 +785,6 @@ export interface FileRoutesByTo {
776785
'/redirect': typeof RedirectIndexRoute
777786
'/relative': typeof RelativeIndexRoute
778787
'/search-params': typeof SearchParamsIndexRoute
779-
'/transition': typeof TransitionIndexRoute
780788
'/params-ps/named/$foo': typeof ParamsPsNamedFooRouteRouteWithChildren
781789
'/params-ps/non-nested/$foo': typeof ParamsPsNonNestedFooRouteRouteWithChildren
782790
'/insidelayout': typeof groupLayoutInsidelayoutRoute
@@ -801,6 +809,8 @@ export interface FileRoutesByTo {
801809
'/relative/link/relative-link-b': typeof RelativeLinkRelativeLinkBRoute
802810
'/relative/useNavigate/relative-useNavigate-a': typeof RelativeUseNavigateRelativeUseNavigateARoute
803811
'/relative/useNavigate/relative-useNavigate-b': typeof RelativeUseNavigateRelativeUseNavigateBRoute
812+
'/transition/count/create-resource': typeof TransitionCountCreateResourceRoute
813+
'/transition/typing/create-resource': typeof TransitionTypingCreateResourceRoute
804814
'/대한민국/wildcard/$': typeof Char45824Char54620Char48124Char44397WildcardSplatRoute
805815
'/대한민국/🚀/$id': typeof Char45824Char54620Char48124Char44397Char55357Char56960IdRoute
806816
'/params-ps/named': typeof ParamsPsNamedIndexRoute
@@ -872,7 +882,6 @@ export interface FileRoutesById {
872882
'/redirect/': typeof RedirectIndexRoute
873883
'/relative/': typeof RelativeIndexRoute
874884
'/search-params/': typeof SearchParamsIndexRoute
875-
'/transition/': typeof TransitionIndexRoute
876885
'/non-nested/deep/$baz': typeof NonNestedDeepBazRouteRouteWithChildren
877886
'/non-nested/named/$baz': typeof NonNestedNamedBazRouteRouteWithChildren
878887
'/non-nested/path/baz': typeof NonNestedPathBazRouteRouteWithChildren
@@ -902,6 +911,8 @@ export interface FileRoutesById {
902911
'/relative/link/relative-link-b': typeof RelativeLinkRelativeLinkBRoute
903912
'/relative/useNavigate/relative-useNavigate-a': typeof RelativeUseNavigateRelativeUseNavigateARoute
904913
'/relative/useNavigate/relative-useNavigate-b': typeof RelativeUseNavigateRelativeUseNavigateBRoute
914+
'/transition/count/create-resource': typeof TransitionCountCreateResourceRoute
915+
'/transition/typing/create-resource': typeof TransitionTypingCreateResourceRoute
905916
'/대한민국/wildcard/$': typeof Char45824Char54620Char48124Char44397WildcardSplatRoute
906917
'/대한민국/🚀/$id': typeof Char45824Char54620Char48124Char44397Char55357Char56960IdRoute
907918
'/params-ps/named/': typeof ParamsPsNamedIndexRoute
@@ -973,7 +984,6 @@ export interface FileRouteTypes {
973984
| '/redirect'
974985
| '/relative'
975986
| '/search-params/'
976-
| '/transition'
977987
| '/non-nested/deep/$baz'
978988
| '/non-nested/named/$baz'
979989
| '/non-nested/path/baz'
@@ -1003,6 +1013,8 @@ export interface FileRouteTypes {
10031013
| '/relative/link/relative-link-b'
10041014
| '/relative/useNavigate/relative-useNavigate-a'
10051015
| '/relative/useNavigate/relative-useNavigate-b'
1016+
| '/transition/count/create-resource'
1017+
| '/transition/typing/create-resource'
10061018
| '/대한민국/wildcard/$'
10071019
| '/대한민국/🚀/$id'
10081020
| '/params-ps/named'
@@ -1069,7 +1081,6 @@ export interface FileRouteTypes {
10691081
| '/redirect'
10701082
| '/relative'
10711083
| '/search-params'
1072-
| '/transition'
10731084
| '/params-ps/named/$foo'
10741085
| '/params-ps/non-nested/$foo'
10751086
| '/insidelayout'
@@ -1094,6 +1105,8 @@ export interface FileRouteTypes {
10941105
| '/relative/link/relative-link-b'
10951106
| '/relative/useNavigate/relative-useNavigate-a'
10961107
| '/relative/useNavigate/relative-useNavigate-b'
1108+
| '/transition/count/create-resource'
1109+
| '/transition/typing/create-resource'
10971110
| '/대한민국/wildcard/$'
10981111
| '/대한민국/🚀/$id'
10991112
| '/params-ps/named'
@@ -1164,7 +1177,6 @@ export interface FileRouteTypes {
11641177
| '/redirect/'
11651178
| '/relative/'
11661179
| '/search-params/'
1167-
| '/transition/'
11681180
| '/non-nested/deep/$baz'
11691181
| '/non-nested/named/$baz'
11701182
| '/non-nested/path/baz'
@@ -1194,6 +1206,8 @@ export interface FileRouteTypes {
11941206
| '/relative/link/relative-link-b'
11951207
| '/relative/useNavigate/relative-useNavigate-a'
11961208
| '/relative/useNavigate/relative-useNavigate-b'
1209+
| '/transition/count/create-resource'
1210+
| '/transition/typing/create-resource'
11971211
| '/대한민국/wildcard/$'
11981212
| '/대한민국/🚀/$id'
11991213
| '/params-ps/named/'
@@ -1257,7 +1271,6 @@ export interface RootRouteChildren {
12571271
ParamsPsIndexRoute: typeof ParamsPsIndexRoute
12581272
RedirectIndexRoute: typeof RedirectIndexRoute
12591273
RelativeIndexRoute: typeof RelativeIndexRoute
1260-
TransitionIndexRoute: typeof TransitionIndexRoute
12611274
ParamsPsNamedFooRouteRoute: typeof ParamsPsNamedFooRouteRouteWithChildren
12621275
groupSubfolderInsideRoute: typeof groupSubfolderInsideRoute
12631276
ParamsPsNamedPrefixChar123fooChar125Route: typeof ParamsPsNamedPrefixChar123fooChar125Route
@@ -1272,6 +1285,8 @@ export interface RootRouteChildren {
12721285
RedirectPreloadFirstRoute: typeof RedirectPreloadFirstRoute
12731286
RedirectPreloadSecondRoute: typeof RedirectPreloadSecondRoute
12741287
RedirectPreloadThirdRoute: typeof RedirectPreloadThirdRoute
1288+
TransitionCountCreateResourceRoute: typeof TransitionCountCreateResourceRoute
1289+
TransitionTypingCreateResourceRoute: typeof TransitionTypingCreateResourceRoute
12751290
ParamsPsNamedIndexRoute: typeof ParamsPsNamedIndexRoute
12761291
ParamsPsWildcardIndexRoute: typeof ParamsPsWildcardIndexRoute
12771292
}
@@ -1362,13 +1377,6 @@ declare module '@tanstack/solid-router' {
13621377
preLoaderRoute: typeof IndexRouteImport
13631378
parentRoute: typeof rootRouteImport
13641379
}
1365-
'/transition/': {
1366-
id: '/transition/'
1367-
path: '/transition'
1368-
fullPath: '/transition'
1369-
preLoaderRoute: typeof TransitionIndexRouteImport
1370-
parentRoute: typeof rootRouteImport
1371-
}
13721380
'/search-params/': {
13731381
id: '/search-params/'
13741382
path: '/'
@@ -1551,6 +1559,20 @@ declare module '@tanstack/solid-router' {
15511559
preLoaderRoute: typeof Char45824Char54620Char48124Char44397WildcardSplatRouteImport
15521560
parentRoute: typeof Char45824Char54620Char48124Char44397RouteRoute
15531561
}
1562+
'/transition/typing/create-resource': {
1563+
id: '/transition/typing/create-resource'
1564+
path: '/transition/typing/create-resource'
1565+
fullPath: '/transition/typing/create-resource'
1566+
preLoaderRoute: typeof TransitionTypingCreateResourceRouteImport
1567+
parentRoute: typeof rootRouteImport
1568+
}
1569+
'/transition/count/create-resource': {
1570+
id: '/transition/count/create-resource'
1571+
path: '/transition/count/create-resource'
1572+
fullPath: '/transition/count/create-resource'
1573+
preLoaderRoute: typeof TransitionCountCreateResourceRouteImport
1574+
parentRoute: typeof rootRouteImport
1575+
}
15541576
'/relative/useNavigate/relative-useNavigate-b': {
15551577
id: '/relative/useNavigate/relative-useNavigate-b'
15561578
path: '/relative-useNavigate-b'
@@ -2415,7 +2437,6 @@ const rootRouteChildren: RootRouteChildren = {
24152437
ParamsPsIndexRoute: ParamsPsIndexRoute,
24162438
RedirectIndexRoute: RedirectIndexRoute,
24172439
RelativeIndexRoute: RelativeIndexRoute,
2418-
TransitionIndexRoute: TransitionIndexRoute,
24192440
ParamsPsNamedFooRouteRoute: ParamsPsNamedFooRouteRouteWithChildren,
24202441
groupSubfolderInsideRoute: groupSubfolderInsideRoute,
24212442
ParamsPsNamedPrefixChar123fooChar125Route:
@@ -2436,6 +2457,8 @@ const rootRouteChildren: RootRouteChildren = {
24362457
RedirectPreloadFirstRoute: RedirectPreloadFirstRoute,
24372458
RedirectPreloadSecondRoute: RedirectPreloadSecondRoute,
24382459
RedirectPreloadThirdRoute: RedirectPreloadThirdRoute,
2460+
TransitionCountCreateResourceRoute: TransitionCountCreateResourceRoute,
2461+
TransitionTypingCreateResourceRoute: TransitionTypingCreateResourceRoute,
24392462
ParamsPsNamedIndexRoute: ParamsPsNamedIndexRoute,
24402463
ParamsPsWildcardIndexRoute: ParamsPsWildcardIndexRoute,
24412464
}

0 commit comments

Comments
 (0)