test(e2e/admin): Updates for 0.19.0 (#2665)

* test(e2e): Update "Inactive" locators

* test(e2e): Update worker filter locators

* test(e2e): Address flake

Ensure that the test has reached the org page before trying to click the Auth Methods link (there is an auth method link on both the global page and the org page).

e2e-tests/admin/pages/storage-buckets.js

@@ -32,7 +32,7 @@ export class StorageBucketsPage extends BaseResourcePage {
       .getByRole('link', { name: 'Storage Buckets', exact: true })
       .click();
     await this.page.getByRole('link', { name: 'New Storage Bucket' }).click();
-    await this.page.getByLabel(new RegExp('Name*')).fill(storageBucketName);
+    await this.page.getByLabel('Name (Optional)').fill(storageBucketName);
     await this.page.getByLabel('Scope').selectOption({ label: scope });
     await this.page
       .getByRole('group', { name: 'Provider' })
@@ -42,7 +42,10 @@ export class StorageBucketsPage extends BaseResourcePage {
     await this.page.getByLabel('Region').fill(region);
     await this.page.getByLabel('Access key ID').fill(accessKeyId);
     await this.page.getByLabel('Secret access key').fill(secretAccessKey);
-    await this.page.getByLabel('Worker filter').fill(workerFilter);
+    await this.page
+      .getByLabel('Worker filter')
+      .locator('textarea')
+      .fill(workerFilter);
     await this.page.getByLabel('Disable credential rotation').click();
     await this.page.getByRole('button', { name: 'Save' }).click();
     await this.dismissSuccessAlert();
@@ -80,7 +83,7 @@ export class StorageBucketsPage extends BaseResourcePage {
       .getByRole('link', { name: 'Storage Buckets', exact: true })
       .click();
     await this.page.getByRole('link', { name: 'New Storage Bucket' }).click();
-    await this.page.getByLabel(new RegExp('Name*')).fill(storageBucketName);
+    await this.page.getByLabel('Name (Optional)').fill(storageBucketName);
     await this.page.getByLabel('Scope').selectOption({ label: scope });
     await this.page
       .getByRole('group', { name: 'Provider' })
@@ -91,7 +94,10 @@ export class StorageBucketsPage extends BaseResourcePage {
     await this.page.getByLabel('Region').fill(region);
     await this.page.getByLabel('Access key ID').fill(accessKeyId);
     await this.page.getByLabel('Secret access key').fill(secretAccessKey);
-    await this.page.getByLabel('Worker filter').fill(workerFilter);
+    await this.page
+      .getByLabel('Worker filter')
+      .locator('textarea')
+      .fill(workerFilter);
     await this.page.getByLabel('Disable credential rotation').click();
     await this.page.getByRole('button', { name: 'Save' }).click();
     await this.dismissSuccessAlert();

e2e-tests/admin/pages/targets.js

@@ -299,7 +299,7 @@ export class TargetsPage extends BaseResourcePage {
     await this.page
       .getByText('Ingress workers')
       .locator('..')
-      .getByRole('link', { name: 'Edit worker filter' })
+      .getByRole('link', { name: 'Add worker filter' })
       .click();
     await expect(
       this.page
@@ -307,7 +307,7 @@ export class TargetsPage extends BaseResourcePage {
         .getByText('Edit Ingress Worker Filter'),
     ).toBeVisible();
 
-    await this.page.getByRole('textbox').fill(filter);
+    await this.page.locator('textarea').fill(filter);
 
     await this.page.getByRole('button', { name: 'Save' }).click();
     await this.dismissSuccessAlert();
@@ -328,7 +328,7 @@ export class TargetsPage extends BaseResourcePage {
     await this.page
       .getByText('Egress workers')
       .locator('..')
-      .getByRole('link', { name: 'Edit worker filter' })
+      .getByRole('link', { name: 'Add worker filter' })
       .click();
     await expect(
       this.page
@@ -336,7 +336,7 @@ export class TargetsPage extends BaseResourcePage {
         .getByText('Edit Egress Worker Filter'),
     ).toBeVisible();
 
-    await this.page.getByRole('textbox').fill(filter);
+    await this.page.locator('textarea').fill(filter);
 
     await this.page.getByRole('button', { name: 'Save' }).click();
     await this.dismissSuccessAlert();

e2e-tests/admin/tests/auth-method-ldap.spec.js

@@ -109,7 +109,7 @@ test('Set up LDAP auth method @ce @ent @docker', async ({
     ).toBeVisible();
 
     // Change state to active-public
-    await page.getByTitle('Inactive').click();
+    await page.getByRole('button', { name: 'Inactive' }).click();
     await page.getByText('Public').click();
     await expect(
       page.getByRole('alert').getByText('Success', { exact: true }),

e2e-tests/admin/tests/auth-method-oidc-vault.spec.js

@@ -71,7 +71,7 @@ test('Set up OIDC auth method @ce @ent @docker @aws', async ({
     );
 
     // Change OIDC Auth Method state to active-public
-    await page.getByTitle('Inactive').click();
+    await page.getByRole('button', { name: 'Inactive' }).click();
     await page.getByText('Public').click();
     await expect(
       page.getByRole('alert').getByText('Success', { exact: true }),
@@ -140,6 +140,11 @@ test('Set up OIDC auth method @ce @ent @docker @aws', async ({
 
     // View the OIDC account and verify account attributes
     await page.getByRole('link', { name: orgName }).click();
+    await expect(
+      page
+        .getByRole('navigation', { name: 'breadcrumbs' })
+        .getByText(orgName),
+    ).toBeVisible();
     await page
       .getByRole('navigation', { name: 'IAM' })
       .getByRole('link', { name: 'Auth Methods' })

e2e-tests/admin/tests/target.spec.js

@@ -211,10 +211,10 @@ test('Verify TCP target is updated @ce @aws @docker', async ({
     ).toBeVisible();
     await expect(page.getByText('"dev" in "/tags/type"')).toBeVisible();
 
-    await page.getByRole('textbox').click({ force: true });
+    await page.locator('textarea').click({ force: true });
     await page.keyboard.press('Meta+A');
     await page.keyboard.press('Backspace');
-    await page.getByRole('textbox').fill('"prod" in "/tags/type"');
+    await page.locator('textarea').fill('"prod" in "/tags/type"');
     await page.getByRole('button', { name: 'Save' }).click();
     const basePage = new BasePage(page);
     await basePage.dismissSuccessAlert();