From 735e124642774e72732391454eb4717f3ffb6d37 Mon Sep 17 00:00:00 2001 From: Michael Li Date: Wed, 9 Aug 2023 12:16:45 -0400 Subject: [PATCH] test(admin/e2e): Updates to the dynamic host catalog e2e test (#1830) * test(admin/e2e): Return to the host list page * test(admin/e2e): Remove unneeded second host set check --- .../e2e/tests/dynamic-host-catalog.spec.js | 67 +------------------ 1 file changed, 1 insertion(+), 66 deletions(-) diff --git a/ui/admin/tests/e2e/tests/dynamic-host-catalog.spec.js b/ui/admin/tests/e2e/tests/dynamic-host-catalog.spec.js index 127d65efc..47b0cfc09 100644 --- a/ui/admin/tests/e2e/tests/dynamic-host-catalog.spec.js +++ b/ui/admin/tests/e2e/tests/dynamic-host-catalog.spec.js @@ -17,8 +17,6 @@ test.beforeAll(async () => { 'E2E_AWS_SECRET_ACCESS_KEY', 'E2E_AWS_HOST_SET_FILTER', 'E2E_AWS_HOST_SET_IPS', - 'E2E_AWS_HOST_SET_FILTER2', - 'E2E_AWS_HOST_SET_IPS2', ]); }); @@ -156,70 +154,7 @@ test.describe('AWS', async () => { .getByRole('navigation', { name: 'breadcrumbs' }) .getByRole('link', { name: hostSetName1 }) .click(); - } - - // Create second host set - const hostSetName2 = 'Host Set ' + nanoid(); - await page - .getByRole('navigation', { name: 'breadcrumbs' }) - .getByRole('link', { name: hostCatalogName }) - .click(); - await page.getByText('Manage').click(); - await page.getByRole('link', { name: 'New Host Set' }).click(); - await page.getByLabel('Name').fill(hostSetName2); - await page.getByLabel('Description').fill('This is an automated test'); - await page - .getByRole('group', { name: 'Filter' }) - .getByRole('textbox') - .fill(process.env.E2E_AWS_HOST_SET_FILTER2); - await page - .getByRole('group', { name: 'Filter' }) - .getByRole('button', { name: 'Add' }) - .click(); - await page.getByRole('button', { name: 'Save' }).click(); - await expect( - page.getByRole('alert').getByText('Success', { exact: true }) - ).toBeVisible(); - await page.getByRole('button', { name: 'Dismiss' }).click(); - await expect( - page - .getByRole('navigation', { name: 'breadcrumbs' }) - .getByRole('link', { name: hostSetName2 }) - ).toBeVisible(); - - // Check number of hosts in host set - await page.getByRole('link', { name: 'Hosts' }).click(); - i = 0; - rowCount = 0; - hostsAreVisible = false; - expectedHosts = JSON.parse(process.env.E2E_AWS_HOST_SET_IPS2); - do { - i = i + 1; - // Getting the number of rows in the second rowgroup (the first rowgroup is the header row) - rowCount = await page - .getByRole('table') - .getByRole('rowgroup') - .nth(1) - .getByRole('row') - .count(); - if (rowCount == expectedHosts.length) { - hostsAreVisible = true; - break; - } - await page.reload(); - await page - .getByRole('navigation', { name: 'breadcrumbs' }) - .getByRole('link', { name: hostSetName2 }) - .waitFor(); - } while (i < 5); - - if (!hostsAreVisible) { - throw new Error( - 'Hosts are not visible. EXPECTED: ' + - expectedHosts.length + - ', ACTUAL: ' + - rowCount - ); + await page.getByRole('link', { name: 'Hosts' }).click(); } }); });