From dba5a5d3133a660569f301028ff246a0fcdfba0f Mon Sep 17 00:00:00 2001
From: Angel Garbarino <Monkeychip@users.noreply.github.com>
Date: Tue, 30 Nov 2021 15:58:08 -0700
Subject: [PATCH] KV spelling error on destroy (#13313) (#13315)

* fix spelling error

* add test coverage

* whoops

* browserstack fail
---
 ui/app/components/secret-delete-menu.js            |  2 ++
 ui/app/models/secret-v2-version.js                 |  2 +-
 ui/app/templates/components/secret-edit.hbs        |  2 +-
 .../acceptance/secrets/backend/kv/secret-test.js   | 14 ++++++++++++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ui/app/components/secret-delete-menu.js b/ui/app/components/secret-delete-menu.js
index b976bdb3bc8d..f5c563428926 100644
--- a/ui/app/components/secret-delete-menu.js
+++ b/ui/app/components/secret-delete-menu.js
@@ -138,6 +138,8 @@ export default class SecretDeleteMenu extends Component {
         .v2DeleteOperation(this.store, this.args.modelForData.id, deleteType, currentVersionForNoReadMetadata)
         .then(resp => {
           if (Ember.testing) {
+            this.showDeleteModal = false;
+            // we don't want a refresh otherwise test loop will rerun in a loop
             return;
           }
           if (!resp) {
diff --git a/ui/app/models/secret-v2-version.js b/ui/app/models/secret-v2-version.js
index 530a0253543d..f413148f26d5 100644
--- a/ui/app/models/secret-v2-version.js
+++ b/ui/app/models/secret-v2-version.js
@@ -7,7 +7,7 @@ export default class SecretV2VersionModel extends SecretModel {
   @attr('string') path;
   @attr('string') deletionTime;
   @attr('string') createdTime;
-  @attr('boolean') detroyed;
+  @attr('boolean') destroyed;
   @attr('number') currentVersion;
   @belongsTo('secret-v2') secret;
 
diff --git a/ui/app/templates/components/secret-edit.hbs b/ui/app/templates/components/secret-edit.hbs
index 42c52ead5730..3d42a361c2d9 100644
--- a/ui/app/templates/components/secret-edit.hbs
+++ b/ui/app/templates/components/secret-edit.hbs
@@ -21,7 +21,7 @@
   <div class="tabs-container box is-bottomless is-marginless is-fullwidth is-paddingless">
     <nav class="tabs">
       <ul>
-        <LinkTo @route="vault.cluster.secrets.backend.show" @model={{key.id}} @tagName="li" @activeClass="is-active">
+        <LinkTo @route="vault.cluster.secrets.backend.show" @model={{key.id}} @tagName="li" @activeClass="is-active" data-test-secret-tab>
           <LinkTo @route="vault.cluster.secrets.backend.show">
             Secret
           </LinkTo>
diff --git a/ui/tests/acceptance/secrets/backend/kv/secret-test.js b/ui/tests/acceptance/secrets/backend/kv/secret-test.js
index 14dc4252c5aa..6aaa41fd3965 100644
--- a/ui/tests/acceptance/secrets/backend/kv/secret-test.js
+++ b/ui/tests/acceptance/secrets/backend/kv/secret-test.js
@@ -682,6 +682,19 @@ module('Acceptance | secrets/secret/create', function(hooks) {
     assert.dom('[data-test-delete-modal="destroy-version"]').exists('destroy this version option shows');
     assert.dom('[data-test-delete-modal="destroy-all-versions"]').exists('destroy all versions option shows');
     assert.dom('[data-test-delete-modal="delete-version"]').doesNotExist('delete version does not show');
+
+    // because destroy requires a page refresh (making the test suite run in a loop) this action is caught in ember testing and does not refresh.
+    // therefore to show new state change after modal closes we jump to the metadata tab and then back.
+    await click('#destroy-version');
+    await settled();
+    await click('[data-test-modal-delete]');
+    await settled();
+    await click('[data-test-secret-metadata-tab]');
+    await settled();
+    await click('[data-test-secret-tab]');
+    await settled();
+    let text = document.querySelector('[data-test-empty-state-title]').innerText.trim();
+    assert.equal(text, 'Version 1 of this secret has been permanently destroyed');
   });
 
   test('version 2 with policy with only delete option does not show modal and undelete is an option', async function(assert) {
@@ -721,6 +734,7 @@ module('Acceptance | secrets/secret/create', function(hooks) {
     await visit(url);
     await settled();
     await click(`[data-test-secret-link=${secretPath}]`);
+    await settled();
     assert.dom('[data-test-component="empty-state"]').exists('secret has been deleted');
     assert.dom('[data-test-secret-undelete]').exists('undelete button shows');
   });