@@ -619,10 +619,6 @@ it.live("Stop settles an initial navigation before its request event", () =>
619619 return send ( operation , input ) ;
620620 } ) ;
621621 yield * viewer . input ( { type : "stopLoading" } ) ;
622- const { sessions } = yield * manager . list ( { threadId : scope . thread . threadId } ) ;
623- expect ( sessions . find ( ( session ) => session . tabId === tabId ) ?. navStatus ) . toEqual ( {
624- _tag : "Idle" ,
625- } ) ;
626622 let settled = yield * PubSub . take ( events ) ;
627623 while (
628624 settled . type !== "navigated" ||
@@ -631,6 +627,10 @@ it.live("Stop settles an initial navigation before its request event", () =>
631627 ) {
632628 settled = yield * PubSub . take ( events ) ;
633629 }
630+ const { sessions } = yield * manager . list ( { threadId : scope . thread . threadId } ) ;
631+ expect ( sessions . find ( ( session ) => session . tabId === tabId ) ?. navStatus ) . toEqual ( {
632+ _tag : "Idle" ,
633+ } ) ;
634634 } ) ,
635635 ) . pipe ( Effect . provide ( layer ) ) ,
636636) ;
@@ -726,17 +726,17 @@ it.live.each([
726726 input : { } ,
727727 } ) ;
728728 expect ( status . loading ) . toBe ( false ) ;
729+ const expectedStatus = blank ? "Idle" : "Success" ;
730+ let settled = yield * PubSub . take ( events ) ;
731+ while ( settled . type !== "navigated" || settled . snapshot . navStatus . _tag !== expectedStatus ) {
732+ settled = yield * PubSub . take ( events ) ;
733+ }
729734 if ( blank ) {
730735 const { sessions } = yield * manager . list ( { threadId : scope . thread . threadId } ) ;
731736 expect ( sessions . find ( ( session ) => session . tabId === tabId ) ?. navStatus ) . toEqual ( {
732737 _tag : "Idle" ,
733738 } ) ;
734739 }
735- const expectedStatus = blank ? "Idle" : "Success" ;
736- let settled = yield * PubSub . take ( events ) ;
737- while ( settled . type !== "navigated" || settled . snapshot . navStatus . _tag !== expectedStatus ) {
738- settled = yield * PubSub . take ( events ) ;
739- }
740740 if ( settled . snapshot . navStatus . _tag === "Success" )
741741 expect ( settled . snapshot . navStatus . url ) . toBe ( "http://localhost:5173/fixed" ) ;
742742 expect ( page [ method ] ) . toHaveBeenCalledTimes ( method === "goto" && ! blank ? 2 : 1 ) ;
0 commit comments