Skip to content

refactor: 💡 e2e admin tests - update locators #2931

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

Merged
merged 4 commits into from
Jul 17, 2025
Merged

refactor: 💡 e2e admin tests - update locators #2931

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
81840c0
refactor: 💡 e2e tests - update locators
wongtonyb Jul 15, 2025
f1034f0
refactor: 💡 addressing comments
wongtonyb Jul 16, 2025
ae929b6
refactor: 💡 update test for session-recording-aws-ent
wongtonyb Jul 16, 2025
def9da1
Merge branch 'main' into ICU-17174-locator-updates
wongtonyb Jul 17, 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
2 changes: 1 addition & 1 deletion e2e-tests/admin/pages/aliases.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export class AliasesPage extends BaseResourcePage {
await this.page
.getByRole('link', { name: `Back to ${orgName}`, exact: true })
.click();
await this.page.getByRole('link', { name: 'Orgs' }).click();
await this.page.getByRole('link', { name: 'Back to Global' }).click();
await this.page.getByRole('link', { name: 'Aliases' }).click();
await expect(
this.page
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/admin/pages/credential-stores.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export class CredentialStoresPage extends BaseResourcePage {
await this.page.getByLabel('Address').fill(vaultAddr);
await this.page
.getByLabel('Worker filter')
.locator('textarea')
.getByRole('textbox')
.fill(workerFilter);
await this.page.getByLabel('Token').fill(clientToken);
await this.page.getByRole('button', { name: 'Save' }).click();
Expand Down
12 changes: 8 additions & 4 deletions e2e-tests/admin/pages/storage-buckets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ export class StorageBucketsPage extends BaseResourcePage {
await this.page
.getByRole('link', { name: 'Storage Buckets', exact: true })
.click();
await this.page.getByRole('link', { name: 'New Storage Bucket' }).click();
await this.page
.getByRole('link', { name: 'New Storage Bucket', exact: true })
.click();
await this.page.getByLabel('Name (Optional)').fill(storageBucketName);
await this.page.getByLabel('Scope').selectOption({ label: scope });
await this.page
Expand All @@ -44,7 +46,7 @@ export class StorageBucketsPage extends BaseResourcePage {
await this.page.getByLabel('Secret access key').fill(secretAccessKey);
await this.page
.getByLabel('Worker filter')
.locator('textarea')
.getByRole('textbox')
.fill(workerFilter);
await this.page.getByLabel('Disable credential rotation').click();
await this.page.getByRole('button', { name: 'Save' }).click();
Expand Down Expand Up @@ -82,7 +84,9 @@ export class StorageBucketsPage extends BaseResourcePage {
await this.page
.getByRole('link', { name: 'Storage Buckets', exact: true })
.click();
await this.page.getByRole('link', { name: 'New Storage Bucket' }).click();
await this.page
.getByRole('link', { name: 'New Storage Bucket', exact: true })
.click();
await this.page.getByLabel('Name (Optional)').fill(storageBucketName);
await this.page.getByLabel('Scope').selectOption({ label: scope });
await this.page
Expand All @@ -96,7 +100,7 @@ export class StorageBucketsPage extends BaseResourcePage {
await this.page.getByLabel('Secret access key').fill(secretAccessKey);
await this.page
.getByLabel('Worker filter')
.locator('textarea')
.getByRole('textbox')
.fill(workerFilter);
await this.page.getByLabel('Disable credential rotation').click();
await this.page.getByRole('button', { name: 'Save' }).click();
Expand Down
21 changes: 10 additions & 11 deletions e2e-tests/admin/pages/targets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,8 @@ export class TargetsPage extends BaseResourcePage {
.click();

await this.page
.getByRole('cell', { name: hostSourceName })
.locator('..')
.getByRole('row')
.filter({ has: this.page.getByRole('cell', { name: hostSourceName }) })
.getByRole('checkbox')
.click({ force: true });
await this.page.getByRole('button', { name: 'Add Host Sources' }).click();
Expand All @@ -274,9 +274,8 @@ export class TargetsPage extends BaseResourcePage {

async removeHostSourceFromTarget(hostSourceName) {
await this.page
.getByRole('link', { name: hostSourceName })
.locator('..')
.locator('..')
.getByRole('row')
.filter({ has: this.page.getByRole('link', { name: hostSourceName }) })
.getByRole('button', { name: 'Manage' })
.click();
await this.page.getByRole('button', { name: 'Remove' }).click();
Expand Down Expand Up @@ -307,7 +306,7 @@ export class TargetsPage extends BaseResourcePage {
.getByText('Edit Ingress Worker Filter'),
).toBeVisible();

await this.page.locator('textarea').fill(filter);
await this.page.locator('.CodeMirror').getByRole('textbox').fill(filter);

await this.page.getByRole('button', { name: 'Save' }).click();
await this.dismissSuccessAlert();
Expand Down Expand Up @@ -336,7 +335,7 @@ export class TargetsPage extends BaseResourcePage {
.getByText('Edit Egress Worker Filter'),
).toBeVisible();

await this.page.locator('textarea').fill(filter);
await this.page.locator('.CodeMirror').getByRole('textbox').fill(filter);

await this.page.getByRole('button', { name: 'Save' }).click();
await this.dismissSuccessAlert();
Expand Down Expand Up @@ -377,8 +376,8 @@ export class TargetsPage extends BaseResourcePage {
.click();

await this.page
.getByRole('cell', { name: credentialName })
.locator('..')
.getByRole('row')
.filter({ has: this.page.getByRole('cell', { name: credentialName }) })
.getByRole('checkbox')
.click({ force: true });
await this.page
Expand Down Expand Up @@ -434,8 +433,8 @@ export class TargetsPage extends BaseResourcePage {
.click();

await this.page
.getByRole('cell', { name: credentialName })
.locator('..')
.getByRole('row')
.filter({ has: this.page.getByRole('cell', { name: credentialName }) })
.getByRole('checkbox')
.click({ force: true });
await this.page
Expand Down
4 changes: 2 additions & 2 deletions e2e-tests/admin/pages/users.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ export class UsersPage extends BaseResourcePage {
.getByRole('link', { name: 'Add Accounts', exact: true })
.click();
await this.page
.getByRole('cell', { name: loginName })
.locator('..')
.getByRole('row')
.filter({ has: this.page.getByRole('cell', { name: loginName }) })
.getByRole('checkbox')
.click({ force: true });

Expand Down
10 changes: 4 additions & 6 deletions e2e-tests/admin/pages/workers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,8 @@ export class WorkersPage extends BaseResourcePage {
*/
async editTag(origKey, newKey, newValue) {
await this.page
.getByRole('table')
.getByRole('cell', { name: origKey })
.locator('..')
.getByRole('row')
.filter({ has: this.page.getByRole('cell', { name: origKey }) })
.getByRole('cell', { name: 'Overflow Options' })
.click();
await this.page.getByRole('button', { name: 'Edit Tag' }).click();
Expand All @@ -58,9 +57,8 @@ export class WorkersPage extends BaseResourcePage {
*/
async removeTag(key) {
await this.page
.getByRole('table')
.getByRole('cell', { name: key })
.locator('..')
.getByRole('row')
.filter({ has: this.page.getByRole('cell', { name: key }) })
.getByRole('cell', { name: 'Overflow Options' })
.click();
await this.page.getByRole('button', { name: 'Remove Tag' }).click();
Expand Down
16 changes: 8 additions & 8 deletions e2e-tests/admin/tests/auth-method-ldap.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,15 +223,15 @@ test(

await expect(
page
.getByRole('cell', { name: ldapAccountName })
.locator('..')
.getByRole('row')
.filter({ has: page.getByRole('cell', { name: ldapAccountName }) })
.getByRole('cell')
.nth(fullNameIndex),
).toHaveText(ldapUserName);
await expect(
page
.getByRole('cell', { name: ldapAccountName })
.locator('..')
.getByRole('row')
.filter({ has: page.getByRole('cell', { name: ldapAccountName }) })
.getByRole('cell')
.nth(emailIndex),
).toHaveText(ldapUserName + '@mail.com');
Expand Down Expand Up @@ -265,15 +265,15 @@ test(

await expect(
page
.getByRole('cell', { name: ldapAccountName })
.locator('..')
.getByRole('row')
.filter({ has: page.getByRole('cell', { name: ldapAccountName }) })
.getByRole('cell')
.nth(fullNameIndex),
).toHaveText(ldapUserName);
await expect(
page
.getByRole('cell', { name: ldapAccountName })
.locator('..')
.getByRole('row')
.filter({ has: page.getByRole('cell', { name: ldapAccountName }) })
.getByRole('cell')
.nth(emailIndex),
).toHaveText(ldapUserName + '@mail.com');
Expand Down
16 changes: 8 additions & 8 deletions e2e-tests/admin/tests/auth-method-oidc-vault.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,15 +181,15 @@ test(

await expect(
page
.getByRole('cell', { name: userName })
.locator('..')
.getByRole('row')
.filter({ has: page.getByRole('cell', { name: userName }) })
.getByRole('cell')
.nth(fullNameIndex),
).toHaveText(userName);
await expect(
page
.getByRole('cell', { name: userName })
.locator('..')
.getByRole('row')
.filter({ has: page.getByRole('cell', { name: userName }) })
.getByRole('cell')
.nth(emailIndex),
).toHaveText(email);
Expand Down Expand Up @@ -223,15 +223,15 @@ test(

await expect(
page
.getByRole('cell', { name: userName })
.locator('..')
.getByRole('row')
.filter({ has: page.getByRole('cell', { name: userName }) })
.getByRole('cell')
.nth(fullNameIndex),
).toHaveText(userName);
await expect(
page
.getByRole('cell', { name: userName })
.locator('..')
.getByRole('row')
.filter({ has: page.getByRole('cell', { name: userName }) })
.getByRole('cell')
.nth(emailIndex),
).toHaveText(email);
Expand Down
10 changes: 4 additions & 6 deletions e2e-tests/admin/tests/credential-store-static-ent.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,8 @@ test(

// Remove a credential from the target
await page
.getByRole('link', { name: credentialName2 })
.locator('..')
.locator('..')
.getByRole('row')
.filter({ has: page.getByRole('link', { name: credentialName2 }) })
.getByRole('button', { name: 'Manage' })
.click();
await page.getByRole('button', { name: 'Remove' }).click();
Expand All @@ -92,9 +91,8 @@ test(

// Remove a credential from the target
await page
.getByRole('link', { name: credentialName2 })
.locator('..')
.locator('..')
.getByRole('row')
.filter({ has: page.getByRole('link', { name: credentialName2 }) })
.getByRole('button', { name: 'Manage' })
.click();
await page.getByRole('button', { name: 'Remove' }).click();
Expand Down
5 changes: 2 additions & 3 deletions e2e-tests/admin/tests/credential-store-static.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,9 +303,8 @@ test(

// Remove the host source from the target
await page
.getByRole('link', { name: credentialName2 })
.locator('..')
.locator('..')
.getByRole('row')
.filter({ has: page.getByRole('link', { name: credentialName2 }) })
.getByRole('button', { name: 'Manage' })
.click();
await page.getByRole('button', { name: 'Remove' }).click();
Expand Down
5 changes: 2 additions & 3 deletions e2e-tests/admin/tests/dynamic-host-catalog-aws-ent.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,8 @@ test.describe('AWS', () => {

// Remove the host source from the target
await page
.getByRole('link', { name: newHostSetName })
.locator('..')
.locator('..')
.getByRole('row')
.filter({ has: page.getByRole('link', { name: newHostSetName }) })
.getByRole('button', { name: 'Manage' })
.click();
await page.getByRole('button', { name: 'Remove' }).click();
Expand Down
5 changes: 2 additions & 3 deletions e2e-tests/admin/tests/dynamic-host-catalog-aws.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,8 @@ test.describe('AWS', () => {

// Remove the host source from the target
await page
.getByRole('link', { name: newHostSetName })
.locator('..')
.locator('..')
.getByRole('row')
.filter({ has: page.getByRole('link', { name: newHostSetName }) })
.getByRole('button', { name: 'Manage' })
.click();
await page.getByRole('button', { name: 'Remove' }).click();
Expand Down
46 changes: 22 additions & 24 deletions e2e-tests/admin/tests/session-recording-aws-ent.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,12 @@ test(
await page
.getByRole('link', { name: `Back to ${orgName}`, exact: true })
.click();
await page.getByRole('link', { name: 'Orgs', exact: true }).click();
await page
.getByRole('link', { name: 'Back to Global', exact: true })
.click();
await page
.getByRole('link', { name: 'Storage Buckets', exact: true })
.click();
const storageBucketsPage = new StorageBucketsPage(page);
const storageBucketName = await storageBucketsPage.createStorageBucketAws(
orgName,
Expand Down Expand Up @@ -113,14 +118,9 @@ test(
await page
.getByRole('link', { name: `Back to ${orgName}`, exact: true })
.click();
await page.getByRole('link', { name: 'Orgs', exact: true }).click();
await expect(page.getByRole('heading', { name: 'Orgs' })).toBeVisible();
await page.getByRole('link', { name: orgName }).click();
await expect(
page
.getByRole('navigation', { name: 'breadcrumbs' })
.getByText(orgName),
).toBeVisible();
await page
.getByRole('link', { name: 'Storage Policies', exact: true })
.click();
const storagePoliciesPage = new StoragePoliciesPage(page);
policyName = await storagePoliciesPage.createStoragePolicy();
await orgsPage.attachStoragePolicy(policyName);
Expand All @@ -141,8 +141,8 @@ test(
const sessionsPage = new SessionsPage(page);
await sessionsPage.waitForSessionToBeVisible(targetName);
await page
.getByRole('cell', { name: targetName })
.locator('..')
.getByRole('row')
.filter({ has: page.getByRole('cell', { name: targetName }) })
.getByRole('button', { name: 'Cancel' })
.click();
await expect(
Expand All @@ -155,7 +155,9 @@ test(
await page
.getByRole('link', { name: `Back to ${orgName}`, exact: true })
.click();
await page.getByRole('link', { name: 'Orgs', exact: true }).click();
await page
.getByRole('link', { name: 'Back to Global', exact: true })
.click();
await page
.getByRole('navigation', { name: 'Application local navigation' })
.getByRole('link', { name: 'Session Recordings', exact: true })
Expand All @@ -165,22 +167,14 @@ test(
.getByRole('link', { name: 'View' })
.click();
await page
.getByRole('cell', { name: 'Channel 1' })
.locator('..')
.getByRole('row')
.filter({ has: page.getByRole('cell', { name: 'Channel 1' }) })
.getByRole('link', { name: 'Play' })
.click();
await page.locator('div.session-recording-player').hover();
await page.locator('.ap-playback-button').click();

// Edit storage policy: do not protect from deletion
await page.getByRole('link', { name: 'Orgs', exact: true }).click();
await expect(page.getByRole('heading', { name: 'Orgs' })).toBeVisible();
await page.getByRole('link', { name: orgName }).click();
await expect(
page
.getByRole('navigation', { name: 'breadcrumbs' })
.getByText(orgName),
).toBeVisible();
await page
.getByRole('link', { name: 'Storage Policies', exact: true })
.click();
Expand All @@ -199,7 +193,9 @@ test(
await page.getByRole('button', { name: 'Dismiss' }).click();

// Re-apply storage policy to the session recording and delete
await page.getByRole('link', { name: 'Orgs', exact: true }).click();
await page
.getByRole('link', { name: 'Back to Global', exact: true })
.click();
await page
.getByRole('link', { name: 'Session Recordings', exact: true })
.click();
Expand All @@ -212,7 +208,9 @@ test(
await sessionRecordingsPage.deleteResource();

// Detach storage bucket from target
await page.getByRole('link', { name: 'Orgs', exact: true }).click();
await page
.getByRole('link', { name: 'Back to Global', exact: true })
.click();
await expect(page.getByRole('heading', { name: 'Orgs' })).toBeVisible();
await page.getByRole('link', { name: orgName }).click();
await page.getByRole('link', { name: projectName }).click();
Expand Down
Loading