File tree Expand file tree Collapse file tree 1 file changed +13
-17
lines changed
Expand file tree Collapse file tree 1 file changed +13
-17
lines changed Original file line number Diff line number Diff line change @@ -3546,27 +3546,23 @@ class Playwright extends Helper {
35463546 expectedUrl = baseUrl + urlPart
35473547 }
35483548
3549- return this . page
3550- . waitForURL (
3551- url => {
3552- const currUrl = decodeURIComponent ( window . location . href )
3553- return currUrl . indexOf ( url ) > - 1
3554- } ,
3555- expectedUrl ,
3549+ try {
3550+ await this . page . waitForURL (
3551+ url => url . href . includes ( expectedUrl ) ,
35563552 { timeout : waitTimeout } ,
35573553 )
3558- . catch ( async e => {
3559- const currUrl = await this . _getPageUrl ( )
3560- if ( / T i m e o u t / i. test ( e . message ) ) {
3561- if ( ! currUrl . includes ( expectedUrl ) ) {
3562- throw new Error ( `expected url to be ${ expectedUrl } , but found ${ currUrl } ` )
3563- } else {
3564- throw new Error ( `expected url not loaded, error message: ${ e . message } ` )
3565- }
3554+ } catch ( e ) {
3555+ const currUrl = await this . _getPageUrl ( )
3556+ if ( / T i m e o u t / i. test ( e . message ) ) {
3557+ if ( ! currUrl . includes ( expectedUrl ) ) {
3558+ throw new Error ( `expected url to be ${ expectedUrl } , but found ${ currUrl } ` )
35663559 } else {
3567- throw e
3560+ throw new Error ( `expected url not loaded, error message: ${ e . message } ` )
35683561 }
3569- } )
3562+ } else {
3563+ throw e
3564+ }
3565+ }
35703566 }
35713567
35723568 /**
You can’t perform that action at this time.
0 commit comments