File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -771,16 +771,34 @@ describe("Cline", () => {
771771 expect ( JSON . parse ( firstApiReq ?. text ?? "{}" ) ) . toMatchObject ( { cancelReason : "streaming_failed" } )
772772 expect ( attemptApiRequestSpy ) . toHaveBeenCalledTimes ( 2 )
773773
774+ let markCancelWaiting : ( ( ) => void ) | undefined
775+ const cancelWaiting = new Promise < void > ( ( resolve ) => {
776+ markCancelWaiting = resolve
777+ } )
778+ vi . mocked ( pWaitFor ) . mockImplementation ( ( condition , options ) =>
779+ realPWaitFor ( async ( ) => {
780+ const done = await condition ( )
781+ if ( ! done ) markCancelWaiting ?.( )
782+ return done
783+ } , options ) ,
784+ )
785+
786+ vi . spyOn ( mockProvider , "createTaskWithHistoryItem" ) . mockImplementation ( ( historyItem ) =>
787+ ClineProvider . prototype . createTaskWithHistoryItem . call ( mockProvider , historyItem , {
788+ startTask : false ,
789+ } ) ,
790+ )
791+
774792 let cancelSettled = false
775793 cancel = mockProvider . cancelTask ( ) . then ( ( ) => {
776794 cancelSettled = true
777795 } )
778- await new Promise ( ( resolve ) => setTimeout ( resolve , 200 ) )
796+ await Promise . race ( [ cancelWaiting , cancel ] )
779797 expect ( cancelSettled , "cancelTask must wait while the retry stream is live" ) . toBe ( false )
780798
781799 releaseRetryStream ?.( )
782800 await cancel
783- await request
801+ await expect ( request ) . resolves . toBe ( true )
784802 } finally {
785803 releaseRetryStream ?.( )
786804 await Promise . allSettled ( [ request , cancel ] )
You can’t perform that action at this time.
0 commit comments