test: wait for cancelled popstate navigation

packages/kit/test/apps/basics/test/cross-platform/client.test.js

@@ -42,7 +42,7 @@
 		expect(await page.evaluate(() => (document.activeElement || {}).nodeName)).toBe('INPUT');
 	});
 
 	test('sets focus for valid hash but invalid selector', async ({ page }) => {
 		await page.goto('/reset-focus#an:invalid+selector');
 		await expect(page.locator('button')).toBeFocused();
 	});
@@ -109,7 +109,7 @@
 		await expect(page.locator('#input')).toBeFocused();
 	});
 
 	test('autofocus from previous page is ignored', async ({ page, clicknav }) => {
 		await page.addInitScript(`
 			window.active = null;
 			window.addEventListener('focusin', () => window.active = document.activeElement);
@@ -186,8 +186,10 @@
 		await page.click('h1'); // The browsers block attempts to prevent navigation on a frame that's never had a user gesture.
 
 		await page.goBack();
-		expect(await page.innerHTML('pre')).toBe('1 false popstate');
-		expect(page.url()).toBe(baseURL + '/navigation-lifecycle/before-navigate/prevent-navigation');
+		await expect(page.locator('pre')).toHaveText('1 false popstate');
+		await expect(page).toHaveURL(
+			baseURL + '/navigation-lifecycle/before-navigate/prevent-navigation'
+		);
 	});
 
 	test('beforeNavigate prevents unload', async ({ page }) => {
@@ -232,7 +234,7 @@
 		await page.goBack();
 		expect(await page.textContent('h1')).toBe('before_navigate_ran: false');
 	});
 
 	test('beforeNavigate cancel() on an unloading navigation does not prevent subsequent beforeNavigate callbacks', async ({
 		page,
 		app
@@ -484,7 +486,7 @@
 		await page.locator('#non-ascii-anchor').click();
 		expect(await in_view('#go-to-encöded')).toBe(true);
 	});
 
 	test('url-supplied anchor with special characters works on navigation to page', async ({
 		page,
 		in_view,
@@ -695,7 +697,7 @@
 			expect(await page.evaluate(() => window.scrollY)).toBe(0);
 		}
 	});
 
 	test('Scroll position is correct after going back from a shallow route', async ({
 		page,
 		scroll_to
@@ -805,7 +807,7 @@
 			'This is the static error page with the following message: Not allowed'
 		);
 	});
 
 	test('Root 404 redirects somewhere due to root layout', async ({ page, baseURL, clicknav }) => {
 		await page.goto('/errors/error-html');
 		await clicknav('button:text-is("Redirect")');