From 7478aa8f096310467a8a93d39cd4600d2adbe82a Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 19 Aug 2021 17:25:46 -0400 Subject: [PATCH 1/7] feature(capabilities): add base collection ability class --- addons/api/addon/abilities/collection.js | 36 ++++++++++++++++++ addons/api/app/abilities/collection.js | 1 + .../tests/unit/abilities/collection-test.js | 38 +++++++++++++++++++ 3 files changed, 75 insertions(+) create mode 100644 addons/api/addon/abilities/collection.js create mode 100644 addons/api/app/abilities/collection.js create mode 100644 addons/api/tests/unit/abilities/collection-test.js diff --git a/addons/api/addon/abilities/collection.js b/addons/api/addon/abilities/collection.js new file mode 100644 index 000000000..8cb3ca2d7 --- /dev/null +++ b/addons/api/addon/abilities/collection.js @@ -0,0 +1,36 @@ +import { Ability } from 'ember-can'; + +/** + * Generic ability provides abilities common to all models in the API. + */ +export default class ModelAbility extends Ability { + // =permissions + + /** + * @type {boolean} + */ + get canList() { + return this.hasAuthorizedCollectionAction('list'); + } + + /** + * @type {boolean} + */ + get canCreate() { + return this.hasAuthorizedCollectionAction('create'); + } + + // =methods + + /** + * Returns true if the given action is contained in the ability model's + * `authorized_collection_actions` array. + * @param {string} action + * @return {boolean} + */ + hasAuthorizedCollectionAction(action) { + const { authorized_collection_actions } = this.model; + const collection = this.collection || {}; + return authorized_collection_actions[collection]?.includes(action); + } +} diff --git a/addons/api/app/abilities/collection.js b/addons/api/app/abilities/collection.js new file mode 100644 index 000000000..041825d2d --- /dev/null +++ b/addons/api/app/abilities/collection.js @@ -0,0 +1 @@ +export { default } from 'api/abilities/collection'; diff --git a/addons/api/tests/unit/abilities/collection-test.js b/addons/api/tests/unit/abilities/collection-test.js new file mode 100644 index 000000000..dd9037ee6 --- /dev/null +++ b/addons/api/tests/unit/abilities/collection-test.js @@ -0,0 +1,38 @@ +import { module, test } from 'qunit'; +import { setupTest } from 'ember-qunit'; + +module('Unit | Abilities | Model', function (hooks) { + setupTest(hooks); + + test('it reflects when a resource may be listed based on authorized_collection_actions', function (assert) { + assert.expect(2); + const service = this.owner.lookup('service:can'); + const model = { + authorized_collection_actions: { + foobars: ['list'], + }, + }; + assert.ok(service.can('list collection', model, { collection: 'foobars' })); + model.authorized_collection_actions = []; + assert.notOk( + service.can('list collection', model, { collection: 'foobars' }) + ); + }); + + test('it reflects when a resource may be created based on authorized_collection_actions', function (assert) { + assert.expect(2); + const service = this.owner.lookup('service:can'); + const model = { + authorized_collection_actions: { + foobars: ['create'], + }, + }; + assert.ok( + service.can('create collection', model, { collection: 'foobars' }) + ); + model.authorized_collection_actions = []; + assert.notOk( + service.can('create collection', model, { collection: 'foobars' }) + ); + }); +}); From 7fd7613c300281e1aa361f73dd1aebb1f38f0755 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 19 Aug 2021 17:33:52 -0400 Subject: [PATCH 2/7] test: correct collection test --- addons/api/tests/unit/abilities/collection-test.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/api/tests/unit/abilities/collection-test.js b/addons/api/tests/unit/abilities/collection-test.js index dd9037ee6..b810e6939 100644 --- a/addons/api/tests/unit/abilities/collection-test.js +++ b/addons/api/tests/unit/abilities/collection-test.js @@ -1,7 +1,7 @@ import { module, test } from 'qunit'; import { setupTest } from 'ember-qunit'; -module('Unit | Abilities | Model', function (hooks) { +module('Unit | Abilities | Collection', function (hooks) { setupTest(hooks); test('it reflects when a resource may be listed based on authorized_collection_actions', function (assert) { @@ -13,7 +13,7 @@ module('Unit | Abilities | Model', function (hooks) { }, }; assert.ok(service.can('list collection', model, { collection: 'foobars' })); - model.authorized_collection_actions = []; + model.authorized_collection_actions.foobars = []; assert.notOk( service.can('list collection', model, { collection: 'foobars' }) ); @@ -30,7 +30,7 @@ module('Unit | Abilities | Model', function (hooks) { assert.ok( service.can('create collection', model, { collection: 'foobars' }) ); - model.authorized_collection_actions = []; + model.authorized_collection_actions.foobars = []; assert.notOk( service.can('create collection', model, { collection: 'foobars' }) ); From 4659b54e9e33905dbdb9d3e6c988767585e534c6 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 19 Aug 2021 17:52:27 -0400 Subject: [PATCH 3/7] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20add=20ui-level=20nav?= =?UTF-8?q?igation=20ability?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/admin/app/abilities/collection.js | 30 +++++++++++++++++++ .../tests/unit/abilities/collection-test.js | 29 ++++++++++++++++++ ui/desktop/app/abilities/collection.js | 30 +++++++++++++++++++ .../tests/unit/abilities/collection-test.js | 29 ++++++++++++++++++ 4 files changed, 118 insertions(+) create mode 100644 ui/admin/app/abilities/collection.js create mode 100644 ui/admin/tests/unit/abilities/collection-test.js create mode 100644 ui/desktop/app/abilities/collection.js create mode 100644 ui/desktop/tests/unit/abilities/collection-test.js diff --git a/ui/admin/app/abilities/collection.js b/ui/admin/app/abilities/collection.js new file mode 100644 index 000000000..c40786021 --- /dev/null +++ b/ui/admin/app/abilities/collection.js @@ -0,0 +1,30 @@ +import CollectionAbility from 'api/abilities/collection'; +import { inject as service } from '@ember/service'; + +export default class OverrideModelAbility extends CollectionAbility { + // =services + + @service features; + + // =permissions + + /** + * Navigating to a resource is allowed if either list or create grants + * are present. + * @type {boolean} + */ + get canNavigate() { + return this.canList || this.canCreate; + } + + // =methods + + /** + * If the capabilities feature flag is disabled, actions are always + * authorized. This mimics pre-capabilities behavior. + */ + hasAuthorizedCollectionAction() { + if (!this.features.isEnabled('capabilities')) return true; + return super.hasAuthorizedCollectionAction(...arguments); + } +} diff --git a/ui/admin/tests/unit/abilities/collection-test.js b/ui/admin/tests/unit/abilities/collection-test.js new file mode 100644 index 000000000..586eb52b4 --- /dev/null +++ b/ui/admin/tests/unit/abilities/collection-test.js @@ -0,0 +1,29 @@ +import { module, test } from 'qunit'; +import { setupTest } from 'ember-qunit'; + +module('Unit | Abilities | Collection', function (hooks) { + setupTest(hooks); + + test('it reflects when a resource may be navigated to based on list and create actions', function (assert) { + assert.expect(4); + const service = this.owner.lookup('service:can'); + const model = { + authorized_collection_actions: { foobars: [] }, + }; + assert.notOk( + service.can('navigate collection', model, { collection: 'foobars' }) + ); + model.authorized_collection_actions.foobars = ['list']; + assert.ok( + service.can('navigate collection', model, { collection: 'foobars' }) + ); + model.authorized_collection_actions.foobars = ['create']; + assert.ok( + service.can('navigate collection', model, { collection: 'foobars' }) + ); + model.authorized_collection_actions.foobars = ['list', 'create']; + assert.ok( + service.can('navigate collection', model, { collection: 'foobars' }) + ); + }); +}); diff --git a/ui/desktop/app/abilities/collection.js b/ui/desktop/app/abilities/collection.js new file mode 100644 index 000000000..c40786021 --- /dev/null +++ b/ui/desktop/app/abilities/collection.js @@ -0,0 +1,30 @@ +import CollectionAbility from 'api/abilities/collection'; +import { inject as service } from '@ember/service'; + +export default class OverrideModelAbility extends CollectionAbility { + // =services + + @service features; + + // =permissions + + /** + * Navigating to a resource is allowed if either list or create grants + * are present. + * @type {boolean} + */ + get canNavigate() { + return this.canList || this.canCreate; + } + + // =methods + + /** + * If the capabilities feature flag is disabled, actions are always + * authorized. This mimics pre-capabilities behavior. + */ + hasAuthorizedCollectionAction() { + if (!this.features.isEnabled('capabilities')) return true; + return super.hasAuthorizedCollectionAction(...arguments); + } +} diff --git a/ui/desktop/tests/unit/abilities/collection-test.js b/ui/desktop/tests/unit/abilities/collection-test.js new file mode 100644 index 000000000..586eb52b4 --- /dev/null +++ b/ui/desktop/tests/unit/abilities/collection-test.js @@ -0,0 +1,29 @@ +import { module, test } from 'qunit'; +import { setupTest } from 'ember-qunit'; + +module('Unit | Abilities | Collection', function (hooks) { + setupTest(hooks); + + test('it reflects when a resource may be navigated to based on list and create actions', function (assert) { + assert.expect(4); + const service = this.owner.lookup('service:can'); + const model = { + authorized_collection_actions: { foobars: [] }, + }; + assert.notOk( + service.can('navigate collection', model, { collection: 'foobars' }) + ); + model.authorized_collection_actions.foobars = ['list']; + assert.ok( + service.can('navigate collection', model, { collection: 'foobars' }) + ); + model.authorized_collection_actions.foobars = ['create']; + assert.ok( + service.can('navigate collection', model, { collection: 'foobars' }) + ); + model.authorized_collection_actions.foobars = ['list', 'create']; + assert.ok( + service.can('navigate collection', model, { collection: 'foobars' }) + ); + }); +}); From 6cbde9c982e20307ccc02ab7bf78be175a10610e Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 19 Aug 2021 17:54:12 -0400 Subject: [PATCH 4/7] Update collection.js --- addons/api/addon/abilities/collection.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/api/addon/abilities/collection.js b/addons/api/addon/abilities/collection.js index 8cb3ca2d7..ad52afd18 100644 --- a/addons/api/addon/abilities/collection.js +++ b/addons/api/addon/abilities/collection.js @@ -3,7 +3,7 @@ import { Ability } from 'ember-can'; /** * Generic ability provides abilities common to all models in the API. */ -export default class ModelAbility extends Ability { +export default class CollectionAbility extends Ability { // =permissions /** From 4256c7e552b8bbe8cd7843e75df05c1b0a13a9cb Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 19 Aug 2021 17:54:35 -0400 Subject: [PATCH 5/7] Update collection.js --- ui/desktop/app/abilities/collection.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/desktop/app/abilities/collection.js b/ui/desktop/app/abilities/collection.js index c40786021..1da414d43 100644 --- a/ui/desktop/app/abilities/collection.js +++ b/ui/desktop/app/abilities/collection.js @@ -1,7 +1,7 @@ import CollectionAbility from 'api/abilities/collection'; import { inject as service } from '@ember/service'; -export default class OverrideModelAbility extends CollectionAbility { +export default class OverrideCollectionAbility extends CollectionAbility { // =services @service features; From 3c83375d84c3986abbd8ad06f3d20f7f7fcff0b9 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 19 Aug 2021 17:55:05 -0400 Subject: [PATCH 6/7] Update collection.js --- ui/admin/app/abilities/collection.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/admin/app/abilities/collection.js b/ui/admin/app/abilities/collection.js index c40786021..1da414d43 100644 --- a/ui/admin/app/abilities/collection.js +++ b/ui/admin/app/abilities/collection.js @@ -1,7 +1,7 @@ import CollectionAbility from 'api/abilities/collection'; import { inject as service } from '@ember/service'; -export default class OverrideModelAbility extends CollectionAbility { +export default class OverrideCollectionAbility extends CollectionAbility { // =services @service features; From 876fc0c71fe1246153b7e9b3bb2df10ec0d755f4 Mon Sep 17 00:00:00 2001 From: dharini Date: Mon, 23 Aug 2021 15:55:20 -0700 Subject: [PATCH 7/7] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20cred=20store=20capab?= =?UTF-8?q?ilities?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/mirage/factories/credential-store.js | 8 + .../form/credential-store/index.hbs | 15 +- .../credential-store/-actions.hbs | 18 +- .../scopes/scope/credential-stores/index.hbs | 14 +- .../credential-store/delete-test.js | 124 ++++++++++++ .../acceptance/credential-store/read-test.js | 84 ++++++++ .../credential-store/update-test.js | 170 +++++++++++++++++ .../acceptance/credential-stores-test.js | 179 ------------------ 8 files changed, 413 insertions(+), 199 deletions(-) create mode 100644 ui/admin/tests/acceptance/credential-store/delete-test.js create mode 100644 ui/admin/tests/acceptance/credential-store/read-test.js create mode 100644 ui/admin/tests/acceptance/credential-store/update-test.js diff --git a/addons/api/mirage/factories/credential-store.js b/addons/api/mirage/factories/credential-store.js index d1b037c7d..15ac2b200 100644 --- a/addons/api/mirage/factories/credential-store.js +++ b/addons/api/mirage/factories/credential-store.js @@ -1,10 +1,18 @@ import factory from '../generated/factories/credential-store'; import { random, internet, datatype } from 'faker'; import { trait } from 'ember-cli-mirage'; +import permissions from '../helpers/permissions'; const types = ['vault']; export default factory.extend({ + authorized_actions: () => + permissions.authorizedActionsFor('credential-store') || [ + 'no-op', + 'read', + 'update', + 'delete', + ], id: (i) => `credential-store-id-${i}`, type: (i) => types[i % types.length], diff --git a/ui/admin/app/components/form/credential-store/index.hbs b/ui/admin/app/components/form/credential-store/index.hbs index c77bfb410..4da5e3ad3 100644 --- a/ui/admin/app/components/form/credential-store/index.hbs +++ b/ui/admin/app/components/form/credential-store/index.hbs @@ -233,11 +233,12 @@ {{/if}} - - + {{#if (can 'save model' @model)}} + + {{/if}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-actions.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-actions.hbs index c08355da6..bf81de1ab 100644 --- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-actions.hbs @@ -9,12 +9,14 @@ > {{t 'resources.credential-library.actions.create'}} - - - {{t 'resources.credential-store.actions.delete'}} - + {{#if (can 'delete model' @model)}} + + + {{t 'resources.credential-store.actions.delete'}} + + {{/if}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs index e614dd097..faa489b0b 100644 --- a/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs +++ b/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs @@ -39,12 +39,16 @@ {{#each @model as |credentialStore|}} - + {{#if (can 'read model' credentialStore)}} + + {{credentialStore.displayName}} + + {{else}} {{credentialStore.displayName}} - + {{/if}}

{{credentialStore.description}}

 diff --git a/ui/admin/tests/acceptance/credential-store/delete-test.js b/ui/admin/tests/acceptance/credential-store/delete-test.js new file mode 100644 index 000000000..67f689357 --- /dev/null +++ b/ui/admin/tests/acceptance/credential-store/delete-test.js @@ -0,0 +1,124 @@ +import { module, test } from 'qunit'; +import { visit, find, click } from '@ember/test-helpers'; +import { setupApplicationTest } from 'ember-qunit'; +import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; +import { authenticateSession } from 'ember-simple-auth/test-support'; +import { Response } from 'miragejs'; +import { resolve, reject } from 'rsvp'; +import sinon from 'sinon'; + +module('Acceptance | credential-stores | delete', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + let getCredentialStoresCount; + + const instances = { + scopes: { + global: null, + org: null, + project: null, + }, + }; + + const urls = { + globalScope: null, + orgScope: null, + projectScope: null, + credentialStores: null, + credentialStore: null, + unknownCredentialStore: null, + newCredentialStore: null, + }; + + hooks.beforeEach(function () { + // Generate resources + instances.scopes.global = this.server.create('scope', { id: 'global' }); + instances.scopes.org = this.server.create('scope', { + type: 'org', + scope: { id: 'global', type: 'global' }, + }); + instances.scopes.project = this.server.create('scope', { + type: 'project', + scope: { id: instances.scopes.org.id, type: 'org' }, + }); + instances.credentialStore = this.server.create('credential-store', { + scope: instances.scopes.project, + }); + // Generate route URLs for resources + urls.globalScope = `/scopes/global/scopes`; + urls.orgScope = `/scopes/${instances.scopes.org.id}/scopes`; + urls.projectScope = `/scopes/${instances.scopes.project.id}`; + urls.credentialStores = `${urls.projectScope}/credential-stores`; + urls.credentialStore = `${urls.credentialStores}/${instances.credentialStore.id}`; + urls.unknownCredentialStore = `${urls.credentialStores}/foo`; + urls.newCredentialStore = `${urls.credentialStores}/new`; + // Generate resource counter + getCredentialStoresCount = () => { + return this.server.schema.credentialStores.all().models.length; + }; + authenticateSession({}); + }); + + test('can delete credential store', async function (assert) { + assert.expect(1); + const count = getCredentialStoresCount(); + await visit(urls.credentialStore); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.equal(getCredentialStoresCount(), count - 1); + }); + + test('cannot delete a credential store without proper authorization', async function (assert) { + assert.expect(1); + instances.credentialStore.authorized_actions = + instances.credentialStore.authorized_actions.filter( + (item) => item !== 'delete' + ); + await visit(urls.credentialStores); + assert.notOk( + find('.rose-layout-page-actions .rose-dropdown-button-danger') + ); + }); + + test('can accept delete credential store via dialog', async function (assert) { + assert.expect(2); + const confirmService = this.owner.lookup('service:confirm'); + confirmService.enabled = true; + confirmService.confirm = sinon.fake.returns(resolve()); + const count = getCredentialStoresCount(); + await visit(urls.credentialStore); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.equal(getCredentialStoresCount(), count - 1); + assert.ok(confirmService.confirm.calledOnce); + }); + + test('cannot cancel delete credential store via dialog', async function (assert) { + assert.expect(2); + const confirmService = this.owner.lookup('service:confirm'); + confirmService.enabled = true; + confirmService.confirm = sinon.fake.returns(reject()); + const count = getCredentialStoresCount(); + await visit(urls.credentialStore); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.equal(getCredentialStoresCount(), count); + assert.ok(confirmService.confirm.calledOnce); + }); + + test('deleting a credential store which errors displays error messages', async function (assert) { + assert.expect(1); + this.server.del('/credential-stores/:id', () => { + return new Response( + 490, + {}, + { + status: 490, + code: 'error', + message: 'Oops.', + } + ); + }); + await visit(urls.credentialStore); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.ok(find('[role="alert"]').textContent.trim(), 'Oops.'); + }); +}); diff --git a/ui/admin/tests/acceptance/credential-store/read-test.js b/ui/admin/tests/acceptance/credential-store/read-test.js new file mode 100644 index 000000000..dd204b41d --- /dev/null +++ b/ui/admin/tests/acceptance/credential-store/read-test.js @@ -0,0 +1,84 @@ +import { module, test } from 'qunit'; +import { visit, currentURL, find } from '@ember/test-helpers'; +import { setupApplicationTest } from 'ember-qunit'; +import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; +import a11yAudit from 'ember-a11y-testing/test-support/audit'; +import { authenticateSession } from 'ember-simple-auth/test-support'; + +module('Acceptance | credential-stores | read', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + project: null, + }, + }; + + const urls = { + globalScope: null, + orgScope: null, + projectScope: null, + credentialStores: null, + credentialStore: null, + unknownCredentialStore: null, + newCredentialStore: null, + }; + + hooks.beforeEach(function () { + // Generate resources + instances.scopes.global = this.server.create('scope', { id: 'global' }); + instances.scopes.org = this.server.create('scope', { + type: 'org', + scope: { id: 'global', type: 'global' }, + }); + instances.scopes.project = this.server.create('scope', { + type: 'project', + scope: { id: instances.scopes.org.id, type: 'org' }, + }); + instances.credentialStore = this.server.create('credential-store', { + scope: instances.scopes.project, + }); + // Generate route URLs for resources + urls.globalScope = `/scopes/global/scopes`; + urls.orgScope = `/scopes/${instances.scopes.org.id}/scopes`; + urls.projectScope = `/scopes/${instances.scopes.project.id}`; + urls.credentialStores = `${urls.projectScope}/credential-stores`; + urls.credentialStore = `${urls.credentialStores}/${instances.credentialStore.id}`; + urls.unknownCredentialStore = `${urls.credentialStores}/foo`; + urls.newCredentialStore = `${urls.credentialStores}/new`; + authenticateSession({}); + }); + + test('visiting /credential-stores', async function (assert) { + assert.expect(2); + await visit(urls.credentialStores); + await a11yAudit(); + assert.equal(currentURL(), urls.credentialStores); + await visit(urls.credentialStore); + await a11yAudit(); + assert.equal(currentURL(), urls.credentialStore); + }); + + test('cannot navigate to a credential store form without proper authorization', async function (assert) { + assert.expect(1); + instances.credentialStore.authorized_actions = + instances.credentialStore.authorized_actions.filter( + (item) => item !== 'read' + ); + await visit(urls.credentialStores); + assert.notOk(find('main tbody .rose-table-header-cell:nth-child(1) a')); + }); + + test('visiting an unknown credential store display 404 message', async function (assert) { + assert.expect(1); + await visit(urls.unknownCredentialStore); + await a11yAudit(); + assert.equal( + find('.rose-message-subtitle').textContent.trim(), + 'Error 404' + ); + }); +}); diff --git a/ui/admin/tests/acceptance/credential-store/update-test.js b/ui/admin/tests/acceptance/credential-store/update-test.js new file mode 100644 index 000000000..25f694cdb --- /dev/null +++ b/ui/admin/tests/acceptance/credential-store/update-test.js @@ -0,0 +1,170 @@ +import { module, test } from 'qunit'; +import { visit, currentURL, find, click, fillIn } from '@ember/test-helpers'; +import { setupApplicationTest } from 'ember-qunit'; +import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; +import { authenticateSession } from 'ember-simple-auth/test-support'; +import { Response } from 'miragejs'; + +module('Acceptance | credential-stores | update', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + project: null, + }, + }; + + const urls = { + globalScope: null, + orgScope: null, + projectScope: null, + credentialStores: null, + credentialStore: null, + unknownCredentialStore: null, + newCredentialStore: null, + }; + + hooks.beforeEach(function () { + // Generate resources + instances.scopes.global = this.server.create('scope', { id: 'global' }); + instances.scopes.org = this.server.create('scope', { + type: 'org', + scope: { id: 'global', type: 'global' }, + }); + instances.scopes.project = this.server.create('scope', { + type: 'project', + scope: { id: instances.scopes.org.id, type: 'org' }, + }); + instances.credentialStore = this.server.create('credential-store', { + scope: instances.scopes.project, + }); + // Generate route URLs for resources + urls.globalScope = `/scopes/global/scopes`; + urls.orgScope = `/scopes/${instances.scopes.org.id}/scopes`; + urls.projectScope = `/scopes/${instances.scopes.project.id}`; + urls.credentialStores = `${urls.projectScope}/credential-stores`; + urls.credentialStore = `${urls.credentialStores}/${instances.credentialStore.id}`; + urls.unknownCredentialStore = `${urls.credentialStores}/foo`; + urls.newCredentialStore = `${urls.credentialStores}/new`; + authenticateSession({}); + }); + + test('can save changes to existing credential store', async function (assert) { + assert.expect(3); + assert.notEqual(instances.credentialStore.name, 'random string'); + await visit(urls.credentialStore); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'random string'); + await click('.rose-form-actions [type="submit"]'); + assert.equal(currentURL(), urls.credentialStore); + assert.equal( + this.server.schema.credentialStores.all().models[0].name, + 'random string' + ); + }); + + test('cannot make changes to an existing credential store without proper authorization', async function (assert) { + assert.expect(1); + instances.credentialStore.authorized_actions = + instances.credentialStore.authorized_actions.filter( + (item) => item !== 'update' + ); + await visit(urls.credentialStore); + assert.notOk(find('.rose-layout-page-actions .rose-button-secondary')); + }); + + test('can cancel changes to existing credential store', async function (assert) { + assert.expect(2); + await visit(urls.credentialStore); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'random string'); + await click('.rose-form-actions [type="button"]'); + assert.notEqual(instances.credentialStore.name, 'random string'); + assert.equal(find('[name="name"]').value, instances.credentialStore.name); + }); + + test('saving an existing credential store with invalid fields displays error messages', async function (assert) { + assert.expect(2); + this.server.patch('/credential-stores/:id', () => { + return new Response( + 400, + {}, + { + status: 400, + code: 'invalid_argument', + message: 'The request was invalid.', + details: { + request_fields: [ + { + name: 'name', + description: 'Name is required.', + }, + ], + }, + } + ); + }); + await visit(urls.credentialStore); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'random string'); + await click('[type="submit"]'); + assert.ok( + find('[role="alert"]').textContent.trim(), + 'The request was invalid.' + ); + assert.ok( + find('.rose-form-error-message').textContent.trim(), + 'Name is required.' + ); + }); + + test('can discard unsaved credential store changes via dialog', async function (assert) { + assert.expect(5); + const confirmService = this.owner.lookup('service:confirm'); + confirmService.enabled = true; + assert.notEqual(instances.credentialStore.name, 'random string'); + + await visit(urls.credentialStore); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'random string'); + assert.equal(currentURL(), urls.credentialStore); + + try { + await visit(urls.credentialStores); + } catch (e) { + assert.ok(find('.rose-dialog')); + await click('.rose-dialog-footer button:first-child', 'Click Discard'); + assert.equal(currentURL(), urls.credentialStores); + assert.notEqual( + this.server.schema.credentialStores.all().models[0].name, + 'random string' + ); + } + }); + + test('can cancel discard unsaved credential store via dialog', async function (assert) { + assert.expect(5); + const confirmService = this.owner.lookup('service:confirm'); + confirmService.enabled = true; + assert.notEqual(instances.credentialStore.name, 'random string'); + await visit(urls.credentialStore); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'random string'); + assert.equal(currentURL(), urls.credentialStore); + + try { + await visit(urls.credentialStores); + } catch (e) { + assert.ok(find('.rose-dialog')); + await click('.rose-dialog-footer button:last-child'); + assert.equal(currentURL(), urls.credentialStore); + assert.notEqual( + this.server.schema.credentialStores.all().models[0].name, + 'random string' + ); + } + }); +}); diff --git a/ui/admin/tests/acceptance/credential-stores-test.js b/ui/admin/tests/acceptance/credential-stores-test.js index 3979f664e..54764b5a3 100644 --- a/ui/admin/tests/acceptance/credential-stores-test.js +++ b/ui/admin/tests/acceptance/credential-stores-test.js @@ -2,11 +2,8 @@ import { module, test } from 'qunit'; import { visit, currentURL, find, click, fillIn } from '@ember/test-helpers'; import { setupApplicationTest } from 'ember-qunit'; import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; -import a11yAudit from 'ember-a11y-testing/test-support/audit'; import { authenticateSession } from 'ember-simple-auth/test-support'; import { Response } from 'miragejs'; -import { resolve, reject } from 'rsvp'; -import sinon from 'sinon'; module('Acceptance | credential-stores', function (hooks) { setupApplicationTest(hooks); @@ -61,26 +58,6 @@ module('Acceptance | credential-stores', function (hooks) { authenticateSession({}); }); - test('visiting /credential-stores', async function (assert) { - assert.expect(2); - await visit(urls.credentialStores); - await a11yAudit(); - assert.equal(currentURL(), urls.credentialStores); - await visit(urls.credentialStore); - await a11yAudit(); - assert.equal(currentURL(), urls.credentialStore); - }); - - test('visiting an unknown credential store display 404 message', async function (assert) { - assert.expect(1); - await visit(urls.unknownCredentialStore); - await a11yAudit(); - assert.equal( - find('.rose-message-subtitle').textContent.trim(), - 'Error 404' - ); - }); - test('can create a new credential stores', async function (assert) { assert.expect(1); const count = getCredentialStoresCount(); @@ -132,160 +109,4 @@ module('Acceptance | credential-stores', function (hooks) { 'Name is required.' ); }); - - test('can save changes to existing credential store', async function (assert) { - assert.expect(3); - assert.notEqual(instances.credentialStore.name, 'random string'); - await visit(urls.credentialStore); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'random string'); - await click('.rose-form-actions [type="submit"]'); - assert.equal(currentURL(), urls.credentialStore); - assert.equal( - this.server.schema.credentialStores.all().models[0].name, - 'random string' - ); - }); - - test('can cancel changes to existing credential store', async function (assert) { - assert.expect(2); - await visit(urls.credentialStore); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'random string'); - await click('.rose-form-actions [type="button"]'); - assert.notEqual(instances.credentialStore.name, 'random string'); - assert.equal(find('[name="name"]').value, instances.credentialStore.name); - }); - - test('saving an existing credential store with invalid fields displays error messages', async function (assert) { - assert.expect(2); - this.server.patch('/credential-stores/:id', () => { - return new Response( - 400, - {}, - { - status: 400, - code: 'invalid_argument', - message: 'The request was invalid.', - details: { - request_fields: [ - { - name: 'name', - description: 'Name is required.', - }, - ], - }, - } - ); - }); - await visit(urls.credentialStore); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'random string'); - await click('[type="submit"]'); - assert.ok( - find('[role="alert"]').textContent.trim(), - 'The request was invalid.' - ); - assert.ok( - find('.rose-form-error-message').textContent.trim(), - 'Name is required.' - ); - }); - - test('can discard unsaved credential store changes via dialog', async function (assert) { - assert.expect(5); - const confirmService = this.owner.lookup('service:confirm'); - confirmService.enabled = true; - assert.notEqual(instances.credentialStore.name, 'random string'); - - await visit(urls.credentialStore); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'random string'); - assert.equal(currentURL(), urls.credentialStore); - - try { - await visit(urls.credentialStores); - } catch (e) { - assert.ok(find('.rose-dialog')); - await click('.rose-dialog-footer button:first-child', 'Click Discard'); - assert.equal(currentURL(), urls.credentialStores); - assert.notEqual( - this.server.schema.credentialStores.all().models[0].name, - 'random string' - ); - } - }); - - test('can cancel discard unsaved credential store via dialog', async function (assert) { - assert.expect(5); - const confirmService = this.owner.lookup('service:confirm'); - confirmService.enabled = true; - assert.notEqual(instances.credentialStore.name, 'random string'); - await visit(urls.credentialStore); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'random string'); - assert.equal(currentURL(), urls.credentialStore); - - try { - await visit(urls.credentialStores); - } catch (e) { - assert.ok(find('.rose-dialog')); - await click('.rose-dialog-footer button:last-child'); - assert.equal(currentURL(), urls.credentialStore); - assert.notEqual( - this.server.schema.credentialStores.all().models[0].name, - 'random string' - ); - } - }); - - test('can delete credential store', async function (assert) { - assert.expect(1); - const count = getCredentialStoresCount(); - await visit(urls.credentialStore); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.equal(getCredentialStoresCount(), count - 1); - }); - - test('can accept delete credential store via dialog', async function (assert) { - assert.expect(2); - const confirmService = this.owner.lookup('service:confirm'); - confirmService.enabled = true; - confirmService.confirm = sinon.fake.returns(resolve()); - const count = getCredentialStoresCount(); - await visit(urls.credentialStore); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.equal(getCredentialStoresCount(), count - 1); - assert.ok(confirmService.confirm.calledOnce); - }); - - test('cannot cancel delete credential store via dialog', async function (assert) { - assert.expect(2); - const confirmService = this.owner.lookup('service:confirm'); - confirmService.enabled = true; - confirmService.confirm = sinon.fake.returns(reject()); - const count = getCredentialStoresCount(); - await visit(urls.credentialStore); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.equal(getCredentialStoresCount(), count); - assert.ok(confirmService.confirm.calledOnce); - }); - - test('deleting a credential store which errors displays error messages', async function (assert) { - assert.expect(1); - this.server.del('/credential-stores/:id', () => { - return new Response( - 490, - {}, - { - status: 490, - code: 'error', - message: 'Oops.', - } - ); - }); - await visit(urls.credentialStore); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.ok(find('[role="alert"]').textContent.trim(), 'Oops.'); - }); });