@@ -203,18 +203,14 @@ describe('beforeLoad skip or exec', () => {
203203 } )
204204 await router . preloadRoute ( { to : '/foo' } )
205205 expect (
206- router . stores . cachedMatches
207- . get ( )
208- . some ( ( d ) => d . status === 'redirected' ) ,
206+ router . stores . cachedMatches . get ( ) . some ( ( d ) => d . status === 'redirected' ) ,
209207 ) . toBe ( false )
210208 await sleep ( 10 )
211209 await router . navigate ( { to : '/foo' } )
212210
213211 expect ( router . state . location . pathname ) . toBe ( '/foo' )
214212 expect (
215- router . stores . cachedMatches
216- . get ( )
217- . some ( ( d ) => d . status === 'redirected' ) ,
213+ router . stores . cachedMatches . get ( ) . some ( ( d ) => d . status === 'redirected' ) ,
218214 ) . toBe ( false )
219215 expect ( beforeLoad ) . toHaveBeenCalledTimes ( 2 )
220216 } )
@@ -230,17 +226,13 @@ describe('beforeLoad skip or exec', () => {
230226 router . preloadRoute ( { to : '/foo' } )
231227 await Promise . resolve ( )
232228 expect (
233- router . stores . cachedMatches
234- . get ( )
235- . some ( ( d ) => d . status === 'redirected' ) ,
229+ router . stores . cachedMatches . get ( ) . some ( ( d ) => d . status === 'redirected' ) ,
236230 ) . toBe ( false )
237231 await router . navigate ( { to : '/foo' } )
238232
239233 expect ( router . state . location . pathname ) . toBe ( '/foo' )
240234 expect (
241- router . stores . cachedMatches
242- . get ( )
243- . some ( ( d ) => d . status === 'redirected' ) ,
235+ router . stores . cachedMatches . get ( ) . some ( ( d ) => d . status === 'redirected' ) ,
244236 ) . toBe ( false )
245237 expect ( beforeLoad ) . toHaveBeenCalledTimes ( 2 )
246238 } )
@@ -456,18 +448,14 @@ describe('loader skip or exec', () => {
456448 } )
457449 await router . preloadRoute ( { to : '/foo' } )
458450 expect (
459- router . stores . cachedMatches
460- . get ( )
461- . some ( ( d ) => d . status === 'redirected' ) ,
451+ router . stores . cachedMatches . get ( ) . some ( ( d ) => d . status === 'redirected' ) ,
462452 ) . toBe ( false )
463453 await sleep ( 10 )
464454 await router . navigate ( { to : '/foo' } )
465455
466456 expect ( router . state . location . pathname ) . toBe ( '/foo' )
467457 expect (
468- router . stores . cachedMatches
469- . get ( )
470- . some ( ( d ) => d . status === 'redirected' ) ,
458+ router . stores . cachedMatches . get ( ) . some ( ( d ) => d . status === 'redirected' ) ,
471459 ) . toBe ( false )
472460 expect ( loader ) . toHaveBeenCalledTimes ( 2 )
473461 } )
@@ -483,17 +471,13 @@ describe('loader skip or exec', () => {
483471 router . preloadRoute ( { to : '/foo' } )
484472 await Promise . resolve ( )
485473 expect (
486- router . stores . cachedMatches
487- . get ( )
488- . some ( ( d ) => d . status === 'redirected' ) ,
474+ router . stores . cachedMatches . get ( ) . some ( ( d ) => d . status === 'redirected' ) ,
489475 ) . toBe ( false )
490476 await router . navigate ( { to : '/foo' } )
491477
492478 expect ( router . state . location . pathname ) . toBe ( '/bar' )
493479 expect (
494- router . stores . cachedMatches
495- . get ( )
496- . some ( ( d ) => d . status === 'redirected' ) ,
480+ router . stores . cachedMatches . get ( ) . some ( ( d ) => d . status === 'redirected' ) ,
497481 ) . toBe ( false )
498482 expect ( loader ) . toHaveBeenCalledTimes ( 1 )
499483 } )
@@ -513,14 +497,10 @@ describe('loader skip or exec', () => {
513497 } ) )
514498
515499 expect (
516- router . stores . cachedMatches
517- . get ( )
518- . some ( ( d ) => d . id === '/foo/foo' ) ,
500+ router . stores . cachedMatches . get ( ) . some ( ( d ) => d . id === '/foo/foo' ) ,
519501 ) . toBe ( false )
520502 expect (
521- router . stores . cachedMatches
522- . get ( )
523- . some ( ( d ) => d . status === 'redirected' ) ,
503+ router . stores . cachedMatches . get ( ) . some ( ( d ) => d . status === 'redirected' ) ,
524504 ) . toBe ( false )
525505 } )
526506
@@ -648,9 +628,7 @@ describe('stale loader reload triggers', () => {
648628 id : string ,
649629 ) =>
650630 router . state . matches . find ( ( match ) => match . id === id ) ??
651- router . stores . pendingMatches
652- . get ( )
653- . find ( ( match ) => match . id === id ) ??
631+ router . stores . pendingMatches . get ( ) . find ( ( match ) => match . id === id ) ??
654632 router . stores . cachedMatches . get ( ) . find ( ( match ) => match . id === id )
655633
656634 const hasActiveMatch = (
@@ -662,9 +640,7 @@ describe('stale loader reload triggers', () => {
662640 router : RouterCore < any , any , any , any , any > ,
663641 id : string ,
664642 ) =>
665- router . stores . pendingMatches
666- . get ( )
667- . some ( ( match ) => match . id === id ) ?? false
643+ router . stores . pendingMatches . get ( ) . some ( ( match ) => match . id === id ) ?? false
668644
669645 const setup = ( {
670646 loader,
0 commit comments