{{secondary}}
@@ -33,24 +33,6 @@
{{#popup-menu name="secondary-details"}}
{{/popup-menu}}
diff --git a/ui/lib/replication/addon/templates/mode/secondaries/revoke.hbs b/ui/lib/replication/addon/templates/mode/secondaries/revoke.hbs
index 2214a7b6531d..9a87689ac4cb 100644
--- a/ui/lib/replication/addon/templates/mode/secondaries/revoke.hbs
+++ b/ui/lib/replication/addon/templates/mode/secondaries/revoke.hbs
@@ -17,18 +17,18 @@
- {{#confirm-action
- onConfirmAction=(action "onSubmit" "revoke-secondary" "primary" (hash id=id))
- confirmMessage=(concat "Are you sure you want to revoke " id "?")
- disabledMessage="A secondary ID is required perform revocation."
- buttonClasses="is-primary button"
- confirmButtonText="Revoke"
- cancelButtonText="Cancel"
- showConfirm=isRevoking
- disabled=(not id)
- }}
+
Revoke
- {{/confirm-action}}
+
{{#unless isRevoking}}
diff --git a/ui/tests/acceptance/secrets/backend/pki/role-test.js b/ui/tests/acceptance/secrets/backend/pki/role-test.js
index 85a23b38915b..6718c87d945e 100644
--- a/ui/tests/acceptance/secrets/backend/pki/role-test.js
+++ b/ui/tests/acceptance/secrets/backend/pki/role-test.js
@@ -53,12 +53,10 @@ module('Acceptance | secrets/pki/create', function(hooks) {
});
test('it deletes a role', async function(assert) {
- await mountAndNav(assert);
+ const path = await mountAndNav(assert);
await editPage.createRole('role', 'example.com');
- await showPage.edit();
- assert.equal(currentRouteName(), 'vault.cluster.secrets.backend.edit', 'navs to the edit page');
-
- await editPage.deleteRole();
+ await showPage.visit({ backend: path, id: 'role' });
+ await showPage.deleteRole();
assert.equal(currentRouteName(), 'vault.cluster.secrets.backend.list-root', 'redirects to list page');
assert.ok(listPage.backendIsEmpty, 'no roles listed');
});
diff --git a/ui/tests/acceptance/secrets/backend/ssh/role-test.js b/ui/tests/acceptance/secrets/backend/ssh/role-test.js
index e9303c756424..250b6c2004ea 100644
--- a/ui/tests/acceptance/secrets/backend/ssh/role-test.js
+++ b/ui/tests/acceptance/secrets/backend/ssh/role-test.js
@@ -44,12 +44,10 @@ module('Acceptance | secrets/ssh', function(hooks) {
});
test('it deletes a role', async function(assert) {
- await mountAndNav(assert);
+ const path = await mountAndNav(assert);
await editPage.createOTPRole('role');
- await showPage.edit();
- assert.equal(currentRouteName(), 'vault.cluster.secrets.backend.edit', 'navs to the edit page');
-
- await editPage.deleteRole();
+ await showPage.visit({ backend: path, id: 'role' });
+ await showPage.deleteRole();
assert.equal(currentRouteName(), 'vault.cluster.secrets.backend.list-root', 'redirects to list page');
assert.ok(listPage.backendIsEmpty, 'no roles listed');
});
diff --git a/ui/tests/integration/components/edit-form-test.js b/ui/tests/integration/components/edit-form-test.js
index 813ac4dac21a..ab7b3cbb21d9 100644
--- a/ui/tests/integration/components/edit-form-test.js
+++ b/ui/tests/integration/components/edit-form-test.js
@@ -87,25 +87,4 @@ module('Integration | Component | edit form', function(hooks) {
assert.equal(flash.success.callCount, 1, 'calls flash message success');
});
});
-
- test('it calls flash message fns on delete', async function(assert) {
- let model = createModel();
- let onSave = () => {
- return resolve();
- };
- this.set('model', model);
- this.set('onSave', onSave);
- let saveSpy = sinon.spy(this, 'onSave');
-
- await render(hbs`{{edit-form model=model onSave=onSave}}`);
- await component.deleteButton();
- await component.deleteConfirm();
-
- later(() => run.cancelTimers(), 50);
- return settled().then(() => {
- assert.ok(saveSpy.calledOnce, 'calls onSave');
- assert.equal(saveSpy.getCall(0).args[0].saveType, 'destroyRecord');
- assert.deepEqual(saveSpy.getCall(0).args[0].model, model, 'passes model to onSave');
- });
- });
});
diff --git a/ui/tests/pages/access/identity/aliases/index.js b/ui/tests/pages/access/identity/aliases/index.js
index dfdab4f2f803..82027783daa6 100644
--- a/ui/tests/pages/access/identity/aliases/index.js
+++ b/ui/tests/pages/access/identity/aliases/index.js
@@ -12,8 +12,5 @@ export default create({
scope: '[data-test-item-delete]',
testContainer: '#ember-testing',
}),
- confirmDelete: clickable('[data-test-confirm-button]', {
- scope: '[data-test-item-delete]',
- testContainer: '#ember-testing',
- }),
+ confirmDelete: clickable('[data-test-confirm-button]'),
});
diff --git a/ui/tests/pages/access/identity/index.js b/ui/tests/pages/access/identity/index.js
index 16fe15f0d1cd..8bb6fbdbba5d 100644
--- a/ui/tests/pages/access/identity/index.js
+++ b/ui/tests/pages/access/identity/index.js
@@ -13,8 +13,5 @@ export default create({
scope: '[data-test-item-delete]',
testContainer: '#ember-testing',
}),
- confirmDelete: clickable('[data-test-confirm-button]', {
- scope: '[data-test-item-delete]',
- testContainer: '#ember-testing',
- }),
+ confirmDelete: clickable('[data-test-confirm-button]'),
});
diff --git a/ui/tests/pages/secrets/backend/pki/edit-role.js b/ui/tests/pages/secrets/backend/pki/edit-role.js
index 76b51e24daac..2ad5ba6091a1 100644
--- a/ui/tests/pages/secrets/backend/pki/edit-role.js
+++ b/ui/tests/pages/secrets/backend/pki/edit-role.js
@@ -11,11 +11,6 @@ export default create({
allowAnyName: clickable('[data-test-input="allowAnyName"]'),
allowedDomains: fillable('[data-test-input="allowedDomains"] input'),
save: clickable('[data-test-role-create]'),
- deleteBtn: clickable('[data-test-role-delete] button'),
- confirmBtn: clickable('[data-test-confirm-button]'),
- deleteRole() {
- return this.deleteBtn().confirmBtn();
- },
createRole(name, allowedDomains) {
return this.toggleDomain()
diff --git a/ui/tests/pages/secrets/backend/pki/show.js b/ui/tests/pages/secrets/backend/pki/show.js
index f1b75fcdd018..8267cf78562d 100644
--- a/ui/tests/pages/secrets/backend/pki/show.js
+++ b/ui/tests/pages/secrets/backend/pki/show.js
@@ -12,4 +12,9 @@ export default create({
generateCertIsPresent: isPresent('[data-test-credentials-link]'),
signCert: clickable('[data-test-sign-link]'),
signCertIsPresent: isPresent('[data-test-sign-link]'),
+ deleteBtn: clickable('[data-test-role-delete] button'),
+ confirmBtn: clickable('[data-test-confirm-button]'),
+ deleteRole() {
+ return this.deleteBtn().confirmBtn();
+ },
});
diff --git a/ui/tests/pages/secrets/backend/ssh/edit-role.js b/ui/tests/pages/secrets/backend/ssh/edit-role.js
index 4871958fcf5d..6e9567218ec1 100644
--- a/ui/tests/pages/secrets/backend/ssh/edit-role.js
+++ b/ui/tests/pages/secrets/backend/ssh/edit-role.js
@@ -11,11 +11,6 @@ export default create({
name: fillable('[data-test-input="name"]'),
CIDR: fillable('[data-test-input="cidrList"]'),
save: clickable('[data-test-role-ssh-create]'),
- deleteBtn: clickable('[data-test-confirm-action-trigger]'),
- confirmBtn: clickable('[data-test-confirm-button]'),
- deleteRole() {
- return this.deleteBtn().confirmBtn();
- },
async createOTPRole(name) {
await this.toggleMore()
diff --git a/ui/tests/pages/secrets/backend/ssh/show.js b/ui/tests/pages/secrets/backend/ssh/show.js
index 787b7e5668a1..2ccc8828f5b5 100644
--- a/ui/tests/pages/secrets/backend/ssh/show.js
+++ b/ui/tests/pages/secrets/backend/ssh/show.js
@@ -8,4 +8,9 @@ export default create({
editIsPresent: isPresent('[data-test-edit-link]'),
generate: clickable('[data-test-backend-credentials]'),
generateIsPresent: isPresent('[data-test-backend-credentials]'),
+ deleteBtn: clickable('[data-test-confirm-action-trigger]'),
+ confirmBtn: clickable('[data-test-confirm-button]'),
+ deleteRole() {
+ return this.deleteBtn().confirmBtn();
+ },
});