@@ -156,23 +156,25 @@ describe('matchRoute()', () => {
156
156
) . toMatchObject ( {
157
157
route : routeA ,
158
158
} ) ;
159
+
159
160
expect (
160
161
// @ts -ignore
161
- matchRoute ( [ routeB , routeA ] , '/base/abc ' , DEFAULT_QUERY_PARAMS , basePath )
162
+ matchRoute ( [ routeB , routeA ] , '/base/def ' , DEFAULT_QUERY_PARAMS , basePath )
162
163
) . toMatchObject ( {
163
164
route : routeB ,
164
165
} ) ;
165
166
} ) ;
166
167
167
168
it ( 'should ignore basePath when navigating to just basePath' , ( ) => {
168
169
const routeA = { path : '/base' , component : Noop } ;
169
- const routeB = { path : '/:bar' , component : Noop } ;
170
+ const routeB = { path : '/' , component : Noop } ;
171
+ const routeC = { path : '/:bar' , component : Noop } ;
170
172
const basePath = '/base' ;
171
173
expect (
172
174
matchRoute (
173
175
// @ts -ignore
174
- [ routeA , routeB ] ,
175
- '/base' ,
176
+ [ routeA , routeB , routeC ] ,
177
+ basePath ,
176
178
DEFAULT_QUERY_PARAMS ,
177
179
basePath
178
180
)
@@ -181,16 +183,36 @@ describe('matchRoute()', () => {
181
183
} ) ;
182
184
183
185
expect (
184
- // @ts -ignore
185
- matchRoute ( [ routeA , routeB ] , '/abc' , DEFAULT_QUERY_PARAMS , basePath )
186
- ) . toBeNull ( ) ;
186
+ matchRoute (
187
+ // @ts -ignore
188
+ [ routeA , routeB , routeC ] ,
189
+ '/base/base' ,
190
+ DEFAULT_QUERY_PARAMS ,
191
+ basePath
192
+ )
193
+ ) . toMatchObject ( {
194
+ route : routeA ,
195
+ } ) ;
187
196
188
197
expect (
189
- // @ts -ignore
190
- matchRoute ( [ routeA , routeB ] , '/base/abc' , DEFAULT_QUERY_PARAMS , basePath )
198
+ matchRoute (
199
+ // @ts -ignore
200
+ [ routeC , routeA , routeB ] ,
201
+ '/base/' ,
202
+ DEFAULT_QUERY_PARAMS ,
203
+ basePath
204
+ )
191
205
) . toMatchObject ( {
192
206
route : routeB ,
193
207
} ) ;
208
+
209
+ expect (
210
+ // @ts -ignore
211
+ matchRoute ( [ routeA , routeC , routeB ] , '/base/abc' , DEFAULT_QUERY_PARAMS , basePath )
212
+ ) . toMatchObject ( {
213
+ route : routeC ,
214
+ } ) ;
215
+
194
216
} ) ;
195
217
} ) ;
196
218
0 commit comments