Skip to content

fix: replace page.textContent with page.locator in integration tests #15021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 4 commits into
base: main
Choose a base branch
from
+520 −518
Draft

fix: replace page.textContent with page.locator in integration tests #15021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
60b17af
Initial plan
Copilot Dec 3, 2025
2f8742c
Replace page.textContent with page.locator in smaller test files
Copilot Dec 3, 2025
072b627
Replace page.textContent with page.locator in all integration test files
Copilot Dec 3, 2025
3199618
Format test files with prettier
Copilot Dec 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/kit/test/apps/amp/test/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ test('only includes CSS for rendered components', async ({ page, baseURL }) => {
test('http-equiv tags are removed', async ({ page }) => {
await page.goto('/http-equiv/cache-control');

expect(await page.textContent('h1')).toBe(
await expect(page.locator('h1')).toHaveText(
'the cache-control headers should be removed from this page'
);
expect(await page.innerHTML('head')).not.toContain('http-equiv="cache-control"');
Expand All @@ -67,7 +67,7 @@ test.skip('prints validation errors', async ({ page, baseURL }) => {
test.skip('throws error on encountering stylesheet links', async ({ page }) => {
await page.goto('/invalid/has-stylesheet');

expect(await page.textContent('body')).toContain(
await expect(page.locator('body')).toContainText(
'An AMP document cannot contain <link rel="stylesheet"> — ensure that inlineStyleThreshold is set to Infinity, and remove links from your page template and <svelte:head> elements'
);
});
278 changes: 139 additions & 139 deletions packages/kit/test/apps/basics/test/client.test.js
View file
Open in desktop

Large diffs are not rendered by default.

88 changes: 44 additions & 44 deletions packages/kit/test/apps/basics/test/cross-platform/client.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ test.describe('Navigation lifecycle functions', () => {

await page.click('a[href="#x"]');
await page.goBack();
expect(await page.textContent('h1')).toBe('before_navigate_ran: false');
await expect(page.locator('h1')).toHaveText('before_navigate_ran: false');
});

test('beforeNavigate cancel() on an unloading navigation does not prevent subsequent beforeNavigate callbacks', async ({
Expand Down Expand Up @@ -248,22 +248,22 @@ test.describe('Navigation lifecycle functions', () => {

test('afterNavigate calls callback', async ({ page, clicknav }) => {
await page.goto('/navigation-lifecycle/after-navigate/a');
expect(await page.textContent('h1')).toBe(
await expect(page.locator('h1')).toHaveText(
'undefined -> /navigation-lifecycle/after-navigate/a'
);

await clicknav('[href="/navigation-lifecycle/after-navigate/b"]');
expect(await page.textContent('h1')).toBe(
await expect(page.locator('h1')).toHaveText(
'/navigation-lifecycle/after-navigate/a -> /navigation-lifecycle/after-navigate/b'
);
});

test('onNavigate calls callback', async ({ page, clicknav }) => {
await page.goto('/navigation-lifecycle/on-navigate/a');
expect(await page.textContent('h1')).toBe('undefined -> undefined (...) false');
await expect(page.locator('h1')).toHaveText('undefined -> undefined (...) false');

await clicknav('[href="/navigation-lifecycle/on-navigate/b"]');
expect(await page.textContent('h1')).toBe(
await expect(page.locator('h1')).toHaveText(
'/navigation-lifecycle/on-navigate/a -> /navigation-lifecycle/on-navigate/b (link) true'
);
});
Expand All @@ -273,7 +273,7 @@ test.describe('Navigation lifecycle functions', () => {
await clicknav('[href="/navigation-lifecycle/after-navigate-properly-removed/a"]');
await clicknav('[href="/navigation-lifecycle/after-navigate-properly-removed/b"]');

expect(await page.textContent('.nav-lifecycle-after-nav-removed-test-target')).toBe('false');
await expect(page.locator('.nav-lifecycle-after-nav-removed-test-target')).toHaveText('false');
});

test('navigation.event is populated', async ({ page, clicknav }) => {
Expand Down Expand Up @@ -414,15 +414,15 @@ test.describe('Scrolling', () => {
await scroll_to(0, target_scroll_y);

await page.locator('[href="/scroll/cross-document/b"]').click();
expect(await page.textContent('h1')).toBe('b');
await expect(page.locator('h1')).toHaveText('b');
await page.waitForSelector('body.started');

await clicknav('[href="/scroll/cross-document/c"]');
expect(await page.textContent('h1')).toBe('c');
await expect(page.locator('h1')).toHaveText('c');

await page.goBack(); // client-side back
await page.goBack(); // native back
expect(await page.textContent('h1')).toBe('a');
await expect(page.locator('h1')).toHaveText('a');
await page.waitForSelector('body.started');

await page.waitForTimeout(250); // needed for the test to fail reliably without the fix
Expand Down Expand Up @@ -591,26 +591,26 @@ test.describe.serial('Errors', () => {
test('client-side load errors', async ({ page }) => {
await page.goto('/errors/load-client');

expect(await page.textContent('footer')).toBe('Custom layout');
expect(await page.textContent('#message')).toBe(
await expect(page.locator('footer')).toHaveText('Custom layout');
await expect(page.locator('#message')).toHaveText(
'This is your custom error page saying: "Crashing now (500 Internal Error)"'
);
});

test('client-side module context errors', async ({ page }) => {
await page.goto('/errors/module-scope-client');

expect(await page.textContent('footer')).toBe('Custom layout');
expect(await page.textContent('#message')).toBe(
await expect(page.locator('footer')).toHaveText('Custom layout');
await expect(page.locator('#message')).toHaveText(
'This is your custom error page saying: "Crashing now (500 Internal Error)"'
);
});

test('client-side error from load()', async ({ page }) => {
await page.goto('/errors/load-error-client');

expect(await page.textContent('footer')).toBe('Custom layout');
expect(await page.textContent('#message')).toBe(
await expect(page.locator('footer')).toHaveText('Custom layout');
await expect(page.locator('#message')).toHaveText(
'This is your custom error page saying: "Not found"'
);
expect(await page.innerHTML('h1')).toBe('555');
Expand All @@ -619,8 +619,8 @@ test.describe.serial('Errors', () => {
test('client-side 4xx status without error from load()', async ({ page }) => {
await page.goto('/errors/load-status-without-error-client');

expect(await page.textContent('footer')).toBe('Custom layout');
expect(await page.textContent('#message')).toBe(
await expect(page.locator('footer')).toHaveText('Custom layout');
await expect(page.locator('#message')).toHaveText(
'This is your custom error page saying: "Error: 401"'
);
expect(await page.innerHTML('h1')).toBe('401');
Expand All @@ -630,8 +630,8 @@ test.describe.serial('Errors', () => {
await page.goto('/errors/error-html');
await clicknav('button:text-is("Unexpected")');

expect(await page.textContent('h1')).toBe('Error - 500');
expect(await page.textContent('p')).toBe(
await expect(page.locator('h1')).toHaveText('Error - 500');
await expect(page.locator('p')).toHaveText(
'This is the static error page with the following message: Failed to load (500 Internal Error)'
);
});
Expand All @@ -640,8 +640,8 @@ test.describe.serial('Errors', () => {
await page.goto('/errors/error-html');
await clicknav('button:text-is("Expected")');

expect(await page.textContent('h1')).toBe('Error - 401');
expect(await page.textContent('p')).toBe(
await expect(page.locator('h1')).toHaveText('Error - 401');
await expect(page.locator('p')).toHaveText(
'This is the static error page with the following message: Not allowed'
);
});
Expand Down Expand Up @@ -785,36 +785,36 @@ test.describe('Routing', () => {
page.on('request', (r) => requests.push(r.url()));

await clicknav('a[href="/routing/a"]');
expect(await page.textContent('h1')).toBe('a');
await expect(page.locator('h1')).toHaveText('a');

expect(requests.filter((url) => !url.endsWith('/favicon.png'))).toEqual([]);
});

test('navigates programmatically', async ({ page, app }) => {
await page.goto('/routing/a');
await app.goto('/routing/b');
expect(await page.textContent('h1')).toBe('b');
await expect(page.locator('h1')).toHaveText('b');
});

test('page.url.hash is correctly set on page load', async ({ page }) => {
await page.goto('/routing/hashes/pagestate#target');
expect(await page.textContent('#window-hash')).toBe('#target');
expect(await page.textContent('#page-url-hash')).toBe('#target');
await expect(page.locator('#window-hash')).toHaveText('#target');
await expect(page.locator('#page-url-hash')).toHaveText('#target');
});

test('page.url.hash is correctly set on navigation', async ({ page }) => {
await page.goto('/routing/hashes/pagestate');
expect(await page.textContent('#window-hash')).toBe('');
expect(await page.textContent('#page-url-hash')).toBe('');
await expect(page.locator('#window-hash')).toHaveText('');
await expect(page.locator('#page-url-hash')).toHaveText('');
await page.locator('[href="#target"]').click();
expect(await page.textContent('#window-hash')).toBe('#target');
expect(await page.textContent('#page-url-hash')).toBe('#target');
await expect(page.locator('#window-hash')).toHaveText('#target');
await expect(page.locator('#page-url-hash')).toHaveText('#target');
await page.locator('[href="/routing/hashes/pagestate"]').click();
await expect(page.locator('#window-hash')).toHaveText('#target'); // hashchange doesn't fire for these
await expect(page.locator('#page-url-hash')).toHaveText('');
await page.goBack();
expect(await page.textContent('#window-hash')).toBe('#target');
expect(await page.textContent('#page-url-hash')).toBe('#target');
await expect(page.locator('#window-hash')).toHaveText('#target');
await expect(page.locator('#page-url-hash')).toHaveText('#target');
});

test('clicking on a hash link focuses the associated element', async ({ page }) => {
Expand Down Expand Up @@ -865,7 +865,7 @@ test.describe('Routing', () => {
expect(page.url()).toBe(`${baseURL}/routing/hashes/a#hash-target`);

await clicknav('[href="/routing/hashes/b"]');
expect(await page.textContent('h1')).toBe('b');
await expect(page.locator('h1')).toHaveText('b');

await expect(page.locator('h1')).toHaveText('b');
await page.goBack();
Expand Down Expand Up @@ -903,16 +903,16 @@ test.describe('Routing', () => {

test('ignores popstate events from outside the router', async ({ page }) => {
await page.goto('/routing/external-popstate');
expect(await page.textContent('h1')).toBe('hello');
await expect(page.locator('h1')).toHaveText('hello');

await page.locator('button').click();
expect(await page.textContent('h1')).toBe('hello');
await expect(page.locator('h1')).toHaveText('hello');

await page.goBack();
expect(await page.textContent('h1')).toBe('hello');
await expect(page.locator('h1')).toHaveText('hello');

await page.goForward();
expect(await page.textContent('h1')).toBe('hello');
await expect(page.locator('h1')).toHaveText('hello');
});

test('recognizes clicks outside the app target', async ({ page }) => {
Expand Down Expand Up @@ -977,10 +977,10 @@ test.describe('Routing', () => {
await page.goto('/routing/missing-href');
const selector = '[data-testid="count"]';

expect(await page.textContent(selector)).toBe('count: 1');
await expect(page.locator(selector)).toHaveText('count: 1');

await page.locator(selector).click();
expect(await page.textContent(selector)).toBe('count: 1');
await expect(page.locator(selector)).toHaveText('count: 1');
});

test('trailing slash redirect', async ({ page, clicknav }) => {
Expand Down Expand Up @@ -1024,7 +1024,7 @@ test.describe('Shadow DOM', () => {
page.on('request', (r) => requests.push(r.url()));

await clicknav('div[id="clickme"]');
expect(await page.textContent('h1')).toBe('a');
await expect(page.locator('h1')).toHaveText('a');

expect(requests.filter((url) => !url.endsWith('/favicon.png'))).toEqual([]);
});
Expand Down Expand Up @@ -1054,14 +1054,14 @@ test.describe('Interactivity', () => {
});

await page.goto('/interactivity/toggle-element');
expect(await page.textContent('button')).toBe('remove');
await expect(page.locator('button')).toHaveText('remove');

await page.locator('button').click();
expect(await page.textContent('button')).toBe('add');
expect(await page.textContent('a')).toBe('add');
await expect(page.locator('button')).toHaveText('add');
await expect(page.locator('a')).toHaveText('add');

await page.locator('a').filter({ hasText: 'add' }).click();
expect(await page.textContent('a')).toBe('remove');
await expect(page.locator('a')).toHaveText('remove');

expect(errored).toBe(false);
});
Expand All @@ -1079,7 +1079,7 @@ test.describe('Load', () => {
});

await page.goto('/load/window-fetch/outside-load');
expect(await page.textContent('h1')).toBe('42');
await expect(page.locator('h1')).toHaveText('42');

expect(warnings).not.toContain(
`Loading ${baseURL}/load/window-fetch/data.json using \`window.fetch\`. For best results, use the \`fetch\` that is passed to your \`load\` function: https://svelte.dev/docs/kit/load#making-fetch-requests`
Expand Down
Loading
Loading