@@ -48,34 +48,15 @@ export async function testToggleCollapsePopoverAndClaim({
4848
4949 const claim = u . po . keylessPopover . promptsToClaim ( ) ;
5050
51- const [ newPage ] = await Promise . all ( [ context . waitForEvent ( 'page' ) , claim . click ( ) ] ) ;
52-
53- await newPage . waitForLoadState ( ) ;
54-
55- await newPage . waitForURL ( url => {
56- const signInForceRedirectUrl = url . searchParams . get ( 'sign_in_force_redirect_url' ) ;
57- const signUpForceRedirectUrl = url . searchParams . get ( 'sign_up_force_redirect_url' ) ;
58-
59- const signInHasRequiredParams =
60- signInForceRedirectUrl ?. includes ( `${ dashboardUrl } apps/claim` ) &&
61- signInForceRedirectUrl ?. includes ( 'token=' ) &&
62- signInForceRedirectUrl ?. includes ( `framework=${ framework } ` ) ;
63-
64- const signUpRegularCase =
65- signUpForceRedirectUrl ?. includes ( `${ dashboardUrl } apps/claim` ) &&
66- signUpForceRedirectUrl ?. includes ( 'token=' ) &&
67- signUpForceRedirectUrl ?. includes ( `framework=${ framework } ` ) ;
68-
69- const signUpPrepareAccountCase =
70- signUpForceRedirectUrl ?. startsWith ( `${ dashboardUrl } prepare-account` ) &&
71- signUpForceRedirectUrl ?. includes ( encodeURIComponent ( 'apps/claim' ) ) &&
72- signUpForceRedirectUrl ?. includes ( encodeURIComponent ( 'token=' ) ) &&
73- signUpForceRedirectUrl ?. includes ( encodeURIComponent ( `framework=${ framework } ` ) ) ;
74-
75- const signUpHasRequiredParams = signUpRegularCase || signUpPrepareAccountCase ;
76-
77- return url . pathname === '/apps/claim/sign-in' && signInHasRequiredParams && signUpHasRequiredParams ;
78- } ) ;
51+ const href = await claim . getAttribute ( 'href' ) ;
52+ expect ( href ) . toBeTruthy ( ) ;
53+
54+ const claimUrl = new URL ( href ! ) ;
55+ expect ( claimUrl . origin + '/' ) . toBe ( dashboardUrl ) ;
56+ expect ( claimUrl . pathname ) . toBe ( '/apps/claim' ) ;
57+ expect ( claimUrl . searchParams . get ( 'framework' ) ) . toBe ( framework ) ;
58+ expect ( claimUrl . searchParams . has ( 'token' ) ) . toBe ( true ) ;
59+ expect ( claimUrl . searchParams . has ( 'return_url' ) ) . toBe ( true ) ;
7960}
8061
8162/**
0 commit comments