@@ -283,13 +283,12 @@ test.describe('Scrolling', () => {
283283 test ( 'url-supplied non-ascii anchor works on navigation to page after manual scroll' , async ( {
284284 page,
285285 in_view,
286- clicknav
286+ clicknav,
287+ scroll_to
287288 } ) => {
288289 await page . goto ( '/anchor' ) ;
289290 await clicknav ( '#non-ascii-anchor' ) ;
290- await page . evaluate ( ( ) => {
291- window . scrollTo ( 0 , 50 ) ;
292- } ) ;
291+ await scroll_to ( 0 , 50 ) ;
293292 await page . locator ( '#non-ascii-anchor' ) . click ( ) ;
294293 expect ( await in_view ( '#go-to-encöded' ) ) . toBe ( true ) ;
295294 } ) ;
@@ -359,7 +358,8 @@ test.describe('Scrolling', () => {
359358
360359 test ( 'scroll is restored after hitting the back button for an in-app cross-document navigation' , async ( {
361360 page,
362- clicknav
361+ clicknav,
362+ scroll_to
363363 } ) => {
364364 await page . goto ( '/scroll/cross-document/a' ) ;
365365
@@ -368,7 +368,7 @@ test.describe('Scrolling', () => {
368368 if ( ! rect ) throw new Error ( 'Could not determine bounding box' ) ;
369369
370370 const target_scroll_y = rect . y + rect . height - height ;
371- await page . evaluate ( ( y ) => scrollTo ( 0 , y ) , target_scroll_y ) ;
371+ await scroll_to ( 0 , target_scroll_y ) ;
372372
373373 await page . locator ( '[href="/scroll/cross-document/b"]' ) . click ( ) ;
374374 expect ( await page . textContent ( 'h1' ) ) . toBe ( 'b' ) ;
@@ -441,7 +441,8 @@ test.describe('Scrolling', () => {
441441 test ( 'scroll positions are recovered on reloading the page' , async ( {
442442 page,
443443 app,
444- browserName
444+ browserName,
445+ scroll_to
445446 } ) => {
446447 // No idea why the workaround below works only in dev mode
447448 // A better solution would probably be to set fission.webContentIsolationStrategy: 1
@@ -451,20 +452,21 @@ test.describe('Scrolling', () => {
451452 }
452453
453454 await page . goto ( '/anchor' ) ;
454- await page . evaluate ( ( ) => window . scrollTo ( 0 , 1000 ) ) ;
455+ await scroll_to ( 0 , 1000 ) ;
455456 await app . goto ( '/anchor/anchor' ) ;
456- await page . evaluate ( ( ) => window . scrollTo ( 0 , 1000 ) ) ;
457+ await scroll_to ( 0 , 1000 ) ;
457458
458459 await page . reload ( ) ;
459460 if ( browserName === 'firefox' ) {
460461 // Firefox with Playwright pushed new history entry history after reload
461462 // See https://github.com/microsoft/playwright/issues/22640
462463 await page . goBack ( ) ;
463464 }
464- expect ( await page . evaluate ( ( ) => window . scrollY ) ) . toBe ( 1000 ) ;
465+ await page . waitForFunction ( ( ) => window . scrollY === 1000 ) ;
465466
467+ const waiter = page . waitForFunction ( ( ) => window . scrollY === 1000 ) ;
466468 await page . goBack ( ) ;
467- expect ( await page . evaluate ( ( ) => window . scrollY ) ) . toBe ( 1000 ) ;
469+ await waiter ;
468470 } ) ;
469471
470472 test ( 'scroll position is top of page on ssr:false reload' , async ( { page } ) => {
@@ -474,26 +476,32 @@ test.describe('Scrolling', () => {
474476 expect ( await page . evaluate ( ( ) => window . scrollY ) ) . toBe ( 0 ) ;
475477 } ) ;
476478
477- test ( 'clicking # or #top takes you to the top of the current page' , async ( { page } ) => {
479+ test ( 'clicking # or #top takes you to the top of the current page' , async ( {
480+ page,
481+ scroll_to
482+ } ) => {
478483 await page . goto ( '/scroll/top' ) ;
479484
480485 for ( const href of [ '#' , '#top' ] ) {
481- await page . evaluate ( ( ) => window . scrollTo ( 0 , 1000 ) ) ;
486+ await scroll_to ( 0 , 1000 ) ;
482487 await page . click ( `a[href="${ href } ) ;
483488 expect ( await page . evaluate ( ( ) => window . scrollY ) ) . toBe ( 0 ) ;
484489
485- await page . evaluate ( ( ) => window . scrollTo ( 0 , 1000 ) ) ;
490+ await scroll_to ( 0 , 1000 ) ;
486491 await page . click ( `a[href="${ href } ) ;
487492 expect ( await page . evaluate ( ( ) => window . scrollY ) ) . toBe ( 0 ) ;
488493 }
489494 } ) ;
490495
491- test ( 'Scroll position is correct after going back from a shallow route' , async ( { page } ) => {
496+ test ( 'Scroll position is correct after going back from a shallow route' , async ( {
497+ page,
498+ scroll_to
499+ } ) => {
492500 await page . goto ( '/scroll/push-state' ) ;
493501 await page . locator ( '#subpage-link' ) . click ( ) ;
494502 await page . locator ( '#back-button' ) . click ( ) ;
495503
496- await page . evaluate ( ( ) => window . scrollTo ( 0 , 9999 ) ) ;
504+ await scroll_to ( 0 , 9999 ) ;
497505
498506 const scroll = await page . evaluate ( ( ) => window . scrollY ) ;
499507 expect ( scroll ) . toBeGreaterThan ( 0 ) ;
0 commit comments