@@ -23,12 +23,14 @@ function buttonWithText(container: HTMLElement, label: string) {
2323 return button ! ;
2424}
2525
26- async function scrollTo ( element : HTMLElement , top : number ) {
26+ async function scrollTo ( element : HTMLElement , top : number , revealedText ?: string ) {
2727 await act ( async ( ) => {
2828 element . scrollTop = top ;
2929 element . dispatchEvent ( new Event ( "scroll" ) ) ;
30- await new Promise ( requestAnimationFrame ) ;
3130 } ) ;
31+ if ( revealedText !== undefined ) {
32+ await vi . waitFor ( ( ) => expect ( text ( element ) ) . toContain ( revealedText ) ) ;
33+ }
3234}
3335
3436describe ( "ChangedFilesCard" , ( ) => {
@@ -145,8 +147,7 @@ describe("ChangedFilesTree", () => {
145147 expect ( text ( container ) ) . not . toContain ( "folder-0999" ) ;
146148
147149 const viewport = container . firstElementChild as HTMLElement ;
148- await scrollTo ( viewport , viewport . scrollHeight ) ;
149- expect ( text ( container ) ) . toContain ( "folder-0999" ) ;
150+ await scrollTo ( viewport , viewport . scrollHeight , "folder-0999" ) ;
150151 expect ( container . querySelectorAll ( "button" ) . length ) . toBeLessThan ( 60 ) ;
151152 await act ( async ( ) => buttonWithText ( container , "folder-0999" ) . click ( ) ) ;
152153 expect ( text ( container ) ) . toContain ( "index.ts" ) ;
@@ -188,13 +189,11 @@ describe("ChangedFilesTree", () => {
188189 expect ( text ( container ) ) . toContain ( "file-00000.ts" ) ;
189190 expect ( text ( container ) ) . not . toContain ( "file-08000.ts" ) ;
190191
191- await scrollTo ( viewport , 420 + 8_001 * 28 ) ;
192- expect ( text ( container ) ) . toContain ( "file-08000.ts" ) ;
192+ await scrollTo ( viewport , 420 + 8_001 * 28 , "file-08000.ts" ) ;
193193 expect ( text ( container ) ) . not . toContain ( "file-00000.ts" ) ;
194194 expect ( container . querySelectorAll ( "button" ) . length ) . toBeLessThan ( 60 ) ;
195195
196- await scrollTo ( viewport , viewport . scrollHeight ) ;
197- expect ( text ( container ) ) . toContain ( "file-16184.ts" ) ;
196+ await scrollTo ( viewport , viewport . scrollHeight , "file-16184.ts" ) ;
198197 await act ( async ( ) => buttonWithText ( container , "file-16184.ts" ) . click ( ) ) ;
199198 expect ( onOpenTurnDiff ) . toHaveBeenCalledWith ( RunId . make ( "run-1" ) , "src/file-16184.ts" ) ;
200199 await act ( async ( ) =>
@@ -235,17 +234,15 @@ describe("ChangedFilesTree", () => {
235234 ) ;
236235 const { container } = screen ;
237236 const viewport = container . firstElementChild as HTMLElement ;
238- await scrollTo ( viewport , 420 ) ;
237+ await scrollTo ( viewport , 420 , "src" ) ;
239238 await act ( async ( ) => buttonWithText ( container , "src" ) . click ( ) ) ;
240239 expect ( container . querySelectorAll ( "button" ) . length ) . toBeLessThan ( 60 ) ;
241240
242- await scrollTo ( viewport , 420 + 8_001 * 28 ) ;
243- expect ( text ( container ) ) . toContain ( "file-08000.ts" ) ;
241+ await scrollTo ( viewport , 420 + 8_001 * 28 , "file-08000.ts" ) ;
244242 expect ( container . querySelectorAll ( "button" ) . length ) . toBeLessThan ( 60 ) ;
245243
246- await scrollTo ( viewport , viewport . scrollHeight ) ;
247- expect ( text ( container ) ) . toContain ( "file-16184.ts" ) ;
248- await scrollTo ( viewport , 420 ) ;
244+ await scrollTo ( viewport , viewport . scrollHeight , "file-16184.ts" ) ;
245+ await scrollTo ( viewport , 420 , "src" ) ;
249246 await act ( async ( ) => buttonWithText ( container , "src" ) . click ( ) ) ;
250247 expect ( text ( container ) ) . not . toContain ( "file-00000.ts" ) ;
251248 expect ( container . querySelectorAll ( "button" ) . length ) . toBe ( 1 ) ;
@@ -267,8 +264,7 @@ describe("ChangedFilesTree", () => {
267264 const viewport = container . firstElementChild as HTMLElement ;
268265 const focusedFile = buttonWithText ( container , "file-00000.ts" ) ;
269266 await act ( async ( ) => focusedFile . focus ( ) ) ;
270- await scrollTo ( viewport , 8_001 * 28 ) ;
271- expect ( text ( container ) ) . toContain ( "file-08000.ts" ) ;
267+ await scrollTo ( viewport , 8_001 * 28 , "file-08000.ts" ) ;
272268 expect ( document . activeElement ) . toBe ( focusedFile ) ;
273269 expect ( container . querySelectorAll ( "button" ) . length ) . toBeLessThan ( 60 ) ;
274270
@@ -294,7 +290,7 @@ describe("ChangedFilesTree", () => {
294290 await using screen = await render ( content ( 140 , 0 ) ) ;
295291 const { container } = screen ;
296292 const viewport = container . firstElementChild as HTMLElement ;
297- await scrollTo ( viewport , 8_001 * 28 ) ;
293+ await scrollTo ( viewport , 8_001 * 28 , "file-08000.ts" ) ;
298294 const beforeResize = container . querySelectorAll ( "button" ) . length ;
299295 await screen . rerender ( content ( 560 , 560 ) ) ;
300296 await expect
0 commit comments