@@ -366,7 +366,13 @@ it("folds a resolved conversation into avatars on its line until it is opened",
366366 } ;
367367 const container = document . createElement ( "div" ) ;
368368 container . className = "flex h-[700px] w-[900px]" ;
369- const withThread = ( isResolved : boolean ) => (
369+ const comment = {
370+ author : { login : "reviewer" , name : null , avatarUrl : null } ,
371+ body : "Rename this." ,
372+ createdAt : "2026-09-01T00:00:00Z" ,
373+ url : null ,
374+ } ;
375+ const withThread = ( isResolved : boolean , oldSideToo = false ) => (
370376 < PullRequestCodeTab
371377 scrollerRef = { ( ) => { } }
372378 environmentId = { EnvironmentId . make ( "environment" ) }
@@ -386,16 +392,21 @@ it("folds a resolved conversation into avatars on its line until it is opened",
386392 side : "right" ,
387393 isResolved,
388394 isOutdated : false ,
389- comments : [
390- {
391- id : "comment" ,
392- author : { login : "reviewer" , name : null , avatarUrl : null } ,
393- body : "Rename this." ,
394- createdAt : "2026-09-01T00:00:00Z" ,
395- url : null ,
396- } ,
397- ] ,
395+ comments : [ { id : "comment" , ...comment } ] ,
398396 } ,
397+ ...( oldSideToo
398+ ? [
399+ {
400+ id : "old-side" ,
401+ path : "a.ts" ,
402+ line : 3 ,
403+ side : "left" as const ,
404+ isResolved : true ,
405+ isOutdated : false ,
406+ comments : [ { id : "old-side-comment" , ...comment } ] ,
407+ } ,
408+ ]
409+ : [ ] ) ,
399410 ] ,
400411 } }
401412 selectedCommitOid = { null }
@@ -438,4 +449,11 @@ it("folds a resolved conversation into avatars on its line until it is opened",
438449 await screen . rerender ( withThread ( true ) ) ;
439450 await expect . element ( marker ( ) ) . toBeVisible ( ) ;
440451 await expect . element ( card ( "Resolved" ) ) . not . toBeInTheDocument ( ) ;
452+
453+ // Stacked view draws a context row once, so both sides' conversations share its marker.
454+ await screen . rerender ( withThread ( true , true ) ) ;
455+ await expect
456+ . element ( screen . getByRole ( "button" , { name : "Show 2 resolved conversations" } ) )
457+ . toBeVisible ( ) ;
458+ await expect . element ( marker ( ) ) . not . toBeInTheDocument ( ) ;
441459} ) ;
0 commit comments