From 6d4768272a0d59f8739a951327d2c99cc4fc6e58 Mon Sep 17 00:00:00 2001 From: hashicc <191911133+hashicc@users.noreply.github.com> Date: Wed, 12 Feb 2025 10:16:44 -0500 Subject: [PATCH] =?UTF-8?q?test:=20=F0=9F=92=8D=20update=20e2e=20tests=20w?= =?UTF-8?q?ith=20afterEach=20cleanup=20(#2677)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- e2e-tests/admin/tests/credential-store-vault-ent.spec.js | 6 ++++-- e2e-tests/admin/tests/credential-store-vault.spec.js | 8 +++++--- e2e-tests/admin/tests/delete-resources-ent.spec.js | 7 +++++-- e2e-tests/admin/tests/delete-resources.spec.js | 7 +++++-- .../tests/ssh-certificate-injection-vault-ent.spec.js | 8 +++----- .../tests/ssh-credential-injection-vault-ent.spec.js | 6 ++++-- e2e-tests/desktop/tests/credentials.spec.js | 8 ++++---- 7 files changed, 30 insertions(+), 20 deletions(-) diff --git a/e2e-tests/admin/tests/credential-store-vault-ent.spec.js b/e2e-tests/admin/tests/credential-store-vault-ent.spec.js index 00b218922..94b537d7a 100644 --- a/e2e-tests/admin/tests/credential-store-vault-ent.spec.js +++ b/e2e-tests/admin/tests/credential-store-vault-ent.spec.js @@ -25,11 +25,13 @@ test.beforeAll(async () => { }); test.beforeEach(async ({ page }) => { + await page.goto('/'); +}); + +test.afterEach(() => { execSync(`vault policy delete ${secretPolicyName}`); execSync(`vault policy delete ${boundaryPolicyName}`); execSync(`vault secrets disable ${secretsPath}`); - - await page.goto('/'); }); test('Vault Credential Store (User & Key Pair) @ent @aws @docker', async ({ diff --git a/e2e-tests/admin/tests/credential-store-vault.spec.js b/e2e-tests/admin/tests/credential-store-vault.spec.js index b848f7e1f..49f07754a 100644 --- a/e2e-tests/admin/tests/credential-store-vault.spec.js +++ b/e2e-tests/admin/tests/credential-store-vault.spec.js @@ -28,12 +28,14 @@ test.beforeAll(async () => { }); test.beforeEach(async ({ page }) => { + await page.goto('/'); +}); + +test.afterEach(() => { execSync(`vault policy delete ${secretPolicyName}`); execSync(`vault policy delete ${boundaryPolicyName}`); execSync(`vault secrets disable ${secretsPath}`); - - await page.goto('/'); -}); +}) test('Vault Credential Store (User & Key Pair) @ce @aws @docker', async ({ page, diff --git a/e2e-tests/admin/tests/delete-resources-ent.spec.js b/e2e-tests/admin/tests/delete-resources-ent.spec.js index 3606a4441..50af728d8 100644 --- a/e2e-tests/admin/tests/delete-resources-ent.spec.js +++ b/e2e-tests/admin/tests/delete-resources-ent.spec.js @@ -27,8 +27,6 @@ test.beforeAll(async () => { test.beforeEach( async ({ baseURL, adminAuthMethodId, adminLoginName, adminPassword }) => { - execSync(`vault policy delete ${secretPolicyName}`); - execSync(`vault policy delete ${boundaryPolicyName}`); await boundaryCli.authenticateBoundary( baseURL, adminAuthMethodId, @@ -38,6 +36,11 @@ test.beforeEach( }, ); +test.afterEach(() => { + execSync(`vault policy delete ${secretPolicyName}`); + execSync(`vault policy delete ${boundaryPolicyName}`); +}) + test('Verify resources can be deleted (enterprise) @ent @aws', async ({ page, awsRegion, diff --git a/e2e-tests/admin/tests/delete-resources.spec.js b/e2e-tests/admin/tests/delete-resources.spec.js index 265fd5356..7c9cd434c 100644 --- a/e2e-tests/admin/tests/delete-resources.spec.js +++ b/e2e-tests/admin/tests/delete-resources.spec.js @@ -27,8 +27,6 @@ test.beforeAll(async () => { test.beforeEach( async ({ baseURL, adminAuthMethodId, adminLoginName, adminPassword }) => { - execSync(`vault policy delete ${secretPolicyName}`); - execSync(`vault policy delete ${boundaryPolicyName}`); await boundaryCli.authenticateBoundary( baseURL, adminAuthMethodId, @@ -38,6 +36,11 @@ test.beforeEach( }, ); +test.afterEach(() => { + execSync(`vault policy delete ${secretPolicyName}`); + execSync(`vault policy delete ${boundaryPolicyName}`); +}); + test('Verify resources can be deleted @ce @aws', async ({ page, awsRegion, diff --git a/e2e-tests/admin/tests/ssh-certificate-injection-vault-ent.spec.js b/e2e-tests/admin/tests/ssh-certificate-injection-vault-ent.spec.js index 45b77a253..8eb1d8101 100644 --- a/e2e-tests/admin/tests/ssh-certificate-injection-vault-ent.spec.js +++ b/e2e-tests/admin/tests/ssh-certificate-injection-vault-ent.spec.js @@ -26,8 +26,10 @@ test.beforeAll(async () => { await vaultCli.checkVaultCli(); }); -test.beforeEach(async () => { +test.afterEach(async () => { execSync(`vault secrets disable ${secretsPath}`); + execSync(`vault policy delete ${sshPolicyName}`); + execSync(`vault policy delete ${boundaryPolicyName}`); }); test('SSH Certificate Injection @ent @docker', async ({ @@ -143,9 +145,5 @@ test('SSH Certificate Injection @ent @docker', async ({ if (orgId) { await boundaryCli.deleteScope(orgId); } - - execSync(`vault secrets disable ${secretsPath}`); - execSync(`vault policy delete ${sshPolicyName}`); - execSync(`vault policy delete ${boundaryPolicyName}`); } }); diff --git a/e2e-tests/admin/tests/ssh-credential-injection-vault-ent.spec.js b/e2e-tests/admin/tests/ssh-credential-injection-vault-ent.spec.js index 34023017c..a66d86e56 100644 --- a/e2e-tests/admin/tests/ssh-credential-injection-vault-ent.spec.js +++ b/e2e-tests/admin/tests/ssh-credential-injection-vault-ent.spec.js @@ -25,11 +25,13 @@ test.beforeAll(async () => { }); test.beforeEach(async ({ page }) => { + await page.goto('/'); +}); + +test.afterEach(() => { execSync(`vault policy delete ${secretPolicyName}`); execSync(`vault policy delete ${boundaryPolicyName}`); execSync(`vault secrets disable ${secretsPath}`); - - await page.goto('/'); }); test('SSH Credential Injection (Vault User & Key Pair) @ent @docker', async ({ diff --git a/e2e-tests/desktop/tests/credentials.spec.js b/e2e-tests/desktop/tests/credentials.spec.js index f48733bb0..15a00cd19 100644 --- a/e2e-tests/desktop/tests/credentials.spec.js +++ b/e2e-tests/desktop/tests/credentials.spec.js @@ -43,10 +43,6 @@ test.beforeEach( sshKeyPath, vaultAddr, }) => { - execSync(`vault policy delete ${secretPolicyName}`); - execSync(`vault policy delete ${boundaryPolicyName}`); - execSync(`vault secrets disable ${secretsPath}`); - org = await boundaryHttp.createOrg(request); const project = await boundaryHttp.createProject(request, org.id); @@ -198,6 +194,10 @@ test.beforeEach( ); test.afterEach(async ({ request }) => { + execSync(`vault policy delete ${secretPolicyName}`); + execSync(`vault policy delete ${boundaryPolicyName}`); + execSync(`vault secrets disable ${secretsPath}`); + if (org) { await boundaryHttp.deleteOrg(request, org.id); }