diff --git a/addons/api/mirage/factories/auth-method.js b/addons/api/mirage/factories/auth-method.js index fd8e705fd..9e14a9e99 100644 --- a/addons/api/mirage/factories/auth-method.js +++ b/addons/api/mirage/factories/auth-method.js @@ -1,9 +1,17 @@ import factory from '../generated/factories/auth-method'; import { trait } from 'ember-cli-mirage'; +import permissions from '../helpers/permissions'; const types = ['password', 'oidc']; export default factory.extend({ + authorized_actions: () => + permissions.authorizedActionsFor('auth-method') || [ + 'no-op', + 'read', + 'update', + 'delete', + ], id: (i) => `auth-method-id-${i}`, // Cycle through available types diff --git a/addons/api/mirage/factories/role.js b/addons/api/mirage/factories/role.js index 103a3725b..a057fc29f 100644 --- a/addons/api/mirage/factories/role.js +++ b/addons/api/mirage/factories/role.js @@ -1,7 +1,15 @@ import factory from '../generated/factories/role'; import { trait } from 'ember-cli-mirage'; +import permissions from '../helpers/permissions'; export default factory.extend({ + authorized_actions: () => + permissions.authorizedActionsFor('role') || [ + 'no-op', + 'read', + 'update', + 'delete', + ], // eslint-disable-next-line ember/avoid-leaking-state-in-ember-objects grant_strings: () => [ 'id=*;action=*', diff --git a/ui/admin/app/components/form/auth-method/oidc/index.hbs b/ui/admin/app/components/form/auth-method/oidc/index.hbs index 7d43d2e67..08c5e87de 100644 --- a/ui/admin/app/components/form/auth-method/oidc/index.hbs +++ b/ui/admin/app/components/form/auth-method/oidc/index.hbs @@ -6,7 +6,6 @@ @showEditToggle={{if @model.isNew false true}} as |form| > - {{/unless}} - - + {{#if (can 'save model' @model)}} + + {{/if}} \ No newline at end of file diff --git a/ui/admin/app/components/form/auth-method/password/index.hbs b/ui/admin/app/components/form/auth-method/password/index.hbs index 57cbc1af0..d7005538f 100644 --- a/ui/admin/app/components/form/auth-method/password/index.hbs +++ b/ui/admin/app/components/form/auth-method/password/index.hbs @@ -51,11 +51,12 @@ {{/if}} - - + {{#if (can 'save model' @model)}} + + {{/if}} \ No newline at end of file diff --git a/ui/admin/app/components/form/role/index.hbs b/ui/admin/app/components/form/role/index.hbs index 169621362..725cdc0bf 100644 --- a/ui/admin/app/components/form/role/index.hbs +++ b/ui/admin/app/components/form/role/index.hbs @@ -119,12 +119,12 @@ {{/unless}} - - - + {{#if (can 'save model' @model)}} + + {{/if}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs index 2d6e7d9a9..cef459d7f 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs @@ -59,12 +59,14 @@ > {{t 'resources.account.actions.create'}} - - - {{t 'resources.auth-method.actions.delete'}} - + {{#if (can 'delete model' @model)}} + + + {{t 'resources.auth-method.actions.delete'}} + + {{/if}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs index 6d4460c1e..4bd1bd2a4 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs @@ -76,6 +76,19 @@ }} {{#if authMethod.isOIDC}} {{#if (feature-flag 'oidc-crud')}} + {{#if (can 'read model' authMethod)}} + + {{authMethod.displayName}} + + {{else}} + {{authMethod.displayName}} + {{/if}} + {{/if}} + {{else}} + {{#if (can 'read model' authMethod)}} - {{authMethod.displayName}} - {{/if}}

{{authMethod.description}}

diff --git a/ui/admin/app/templates/scopes/scope/roles/index.hbs b/ui/admin/app/templates/scopes/scope/roles/index.hbs index 7fb62530c..d69351c8e 100644 --- a/ui/admin/app/templates/scopes/scope/roles/index.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/index.hbs @@ -37,9 +37,13 @@ {{#each @model as |role|}} - + {{#if (can 'read model' role)}} + + {{role.displayName}} + + {{else}} {{role.displayName}} - + {{/if}}

{{role.description}}

 diff --git a/ui/admin/app/templates/scopes/scope/roles/role/-actions.hbs b/ui/admin/app/templates/scopes/scope/roles/role/-actions.hbs index e330566ad..88add065c 100644 --- a/ui/admin/app/templates/scopes/scope/roles/role/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/role/-actions.hbs @@ -6,12 +6,14 @@ {{t 'resources.role.principal.actions.add-principals'}} - - - {{t 'resources.role.actions.delete'}} - + {{#if (can 'delete model' @model)}} + + + {{t 'resources.role.actions.delete'}} + + {{/if}} \ No newline at end of file diff --git a/ui/admin/jsconfig.json b/ui/admin/jsconfig.json deleted file mode 100644 index f408cac8c..000000000 --- a/ui/admin/jsconfig.json +++ /dev/null @@ -1 +0,0 @@ -{"compilerOptions":{"target":"es6","experimentalDecorators":true},"exclude":["node_modules","bower_components","tmp","vendor",".git","dist"]} \ No newline at end of file diff --git a/ui/admin/tests/acceptance/auth-methods-test.js b/ui/admin/tests/acceptance/auth-methods-test.js index 5c46e1353..61d8071a3 100644 --- a/ui/admin/tests/acceptance/auth-methods-test.js +++ b/ui/admin/tests/acceptance/auth-methods-test.js @@ -103,175 +103,6 @@ module('Acceptance | auth methods', function (hooks) { assert.equal(currentURL(), urls.authMethods); }); - test('can delete an auth method', async function (assert) { - assert.expect(1); - const authMethodsCount = this.server.db.authMethods.length; - await visit(urls.authMethod); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.equal(this.server.db.authMethods.length, authMethodsCount - 1); - }); - - test('saving a new auth method with invalid fields displays error messages', async function (assert) { - assert.expect(2); - this.server.post('/auth-methods', () => { - 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.newAuthMethod); - await fillIn('[name="name"]', 'new auth method'); - await click('form [type="submit"]'); - await a11yAudit(); - assert.ok( - find('[role="alert"]').textContent.trim(), - 'The request was invalid.', - 'Displays primary error message.' - ); - assert.ok( - find('.rose-form-error-message').textContent.trim(), - 'Name is required.', - 'Displays field-level errors.' - ); - }); - - test('errors are displayed when save on auth method fails', async function (assert) { - assert.expect(1); - this.server.patch('/auth-methods/:id', () => { - return new Response( - 490, - {}, - { - status: 490, - code: 'error', - message: 'Oops.', - } - ); - }); - await visit(urls.authMethod); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'save auth method'); - await click('form [type="submit"]'); - await a11yAudit(); - assert.ok( - find('[role="alert"]').textContent.trim(), - 'Oops.', - 'Displays primary error message.' - ); - }); - - test('errors are displayed when delete on an auth method fails', async function (assert) { - assert.expect(1); - this.server.del('/auth-methods/:id', () => { - return new Response( - 490, - {}, - { - status: 490, - code: 'error', - message: 'Oops.', - } - ); - }); - await visit(urls.authMethod); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - await a11yAudit(); - assert.ok( - find('[role="alert"]').textContent.trim(), - 'Oops.', - 'Displays primary error message.' - ); - }); - - test('saving an existing auth method with invalid fields displays error messages', async function (assert) { - assert.expect(2); - this.server.patch('/auth-methods/: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.authMethod); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'existing auth method'); - await click('form [type="submit"]'); - await a11yAudit(); - assert.ok( - find('[role="alert"]').textContent.trim(), - 'The request was invalid.', - 'Displays primary error message.' - ); - assert.ok( - find('.rose-form-error-message').textContent.trim(), - 'Name is required.', - 'Displays field-level errors.' - ); - }); - - test('saving an existing auth method with invalid fields displays error messages', async function (assert) { - assert.expect(2); - this.server.patch('/auth-methods/: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.authMethod); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'existing auth method'); - await click('form [type="submit"]'); - await a11yAudit(); - assert.ok( - find('[role="alert"]').textContent.trim(), - 'The request was invalid.', - 'Displays primary error message.' - ); - assert.ok( - find('.rose-form-error-message').textContent.trim(), - 'Name is required.', - 'Displays field-level errors.' - ); - }); - test('user can make primary an auth method', async function (assert) { assert.expect(2); assert.notOk( diff --git a/ui/admin/tests/acceptance/auth-methods/delete-test.js b/ui/admin/tests/acceptance/auth-methods/delete-test.js new file mode 100644 index 000000000..f80721f37 --- /dev/null +++ b/ui/admin/tests/acceptance/auth-methods/delete-test.js @@ -0,0 +1,93 @@ +import { module, test } from 'qunit'; +import { visit, click, 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 { Response } from 'miragejs'; +import { + authenticateSession, + // // These are left here intentionally for future reference. + // //currentSession, + // //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | auth methods | delete', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + }, + authMethod: null, + }; + const urls = { + orgScope: null, + authMethods: null, + newAuthMethod: null, + authMethod: null, + }; + + hooks.beforeEach(function () { + // Setup Mirage mock resources for this test + authenticateSession({}); + instances.scopes.global = this.server.create('scope', { id: 'global' }); + instances.scopes.org = this.server.create('scope', { + type: 'org', + scope: { id: 'global', type: 'global' }, + }); + instances.authMethod = this.server.create('auth-method', { + scope: instances.scopes.org, + }); + + // Generate route URLs for resources + urls.orgScope = `/scopes/${instances.scopes.org.id}`; + urls.authMethods = `${urls.orgScope}/auth-methods`; + urls.newAuthMethod = `${urls.authMethods}/new?type=password`; + urls.authMethod = `${urls.authMethods}/${instances.authMethod.id}`; + }); + + test('can delete an auth method', async function (assert) { + assert.expect(1); + const authMethodsCount = this.server.db.authMethods.length; + await visit(urls.authMethod); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.equal(this.server.db.authMethods.length, authMethodsCount - 1); + }); + + test('errors are displayed when delete on an auth method fails', async function (assert) { + assert.expect(1); + this.server.del('/auth-methods/:id', () => { + return new Response( + 490, + {}, + { + status: 490, + code: 'error', + message: 'Oops.', + } + ); + }); + await visit(urls.authMethod); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + await a11yAudit(); + assert.ok( + find('[role="alert"]').textContent.trim(), + 'Oops.', + 'Displays primary error message.' + ); + }); + + test('cannot delete an auth method without proper authorization', async function (assert) { + assert.expect(1); + instances.authMethod.authorized_actions = + instances.authMethod.authorized_actions.filter( + (item) => item !== 'delete' + ); + await visit(urls.authMethod); + assert.notOk( + find('.rose-layout-page-actions .rose-dropdown-button-danger') + ); + }); +}); diff --git a/ui/admin/tests/acceptance/auth-methods/read-test.js b/ui/admin/tests/acceptance/auth-methods/read-test.js new file mode 100644 index 000000000..93da8e83a --- /dev/null +++ b/ui/admin/tests/acceptance/auth-methods/read-test.js @@ -0,0 +1,72 @@ +import { module, test } from 'qunit'; +import { visit, currentURL, click, 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, + // // These are left here intentionally for future reference. + // //currentSession, + // //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | auth methods | read', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + }, + authMethod: null, + }; + const urls = { + orgScope: null, + authMethods: null, + newAuthMethod: null, + authMethod: null, + }; + + hooks.beforeEach(function () { + // Setup Mirage mock resources for this test + authenticateSession({}); + instances.scopes.global = this.server.create('scope', { id: 'global' }); + instances.scopes.org = this.server.create('scope', { + type: 'org', + scope: { id: 'global', type: 'global' }, + }); + instances.authMethod = this.server.create('auth-method', { + scope: instances.scopes.org, + }); + + // Generate route URLs for resources + urls.orgScope = `/scopes/${instances.scopes.org.id}`; + urls.authMethods = `${urls.orgScope}/auth-methods`; + urls.newAuthMethod = `${urls.authMethods}/new?type=password`; + urls.authMethod = `${urls.authMethods}/${instances.authMethod.id}`; + }); + + test('visiting auth methods', async function (assert) { + assert.expect(1); + await visit(urls.authMethods); + await a11yAudit(); + assert.equal(currentURL(), urls.authMethods); + }); + + test('can navigate to an auth method form', async function (assert) { + assert.expect(1); + await visit(urls.authMethods); + await click('main tbody .rose-table-header-cell:nth-child(1) a'); + await a11yAudit(); + assert.equal(currentURL(), urls.authMethod); + }); + + test('cannot navigate to an auth method form without proper authorization', async function (assert) { + assert.expect(1); + instances.authMethod.authorized_actions = + instances.authMethod.authorized_actions.filter((item) => item !== 'read'); + await visit(urls.authMethod); + assert.notOk(find('main tbody .rose-table-header-cell:nth-child(1) a')); + }); +}); diff --git a/ui/admin/tests/acceptance/auth-methods/update-test.js b/ui/admin/tests/acceptance/auth-methods/update-test.js new file mode 100644 index 000000000..8060e4382 --- /dev/null +++ b/ui/admin/tests/acceptance/auth-methods/update-test.js @@ -0,0 +1,154 @@ +import { module, test } from 'qunit'; +import { visit, click, find, 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 { Response } from 'miragejs'; +import { + authenticateSession, + // // These are left here intentionally for future reference. + // //currentSession, + // //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | auth methods | update', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + }, + authMethod: null, + }; + const urls = { + orgScope: null, + authMethods: null, + newAuthMethod: null, + authMethod: null, + }; + + hooks.beforeEach(function () { + // Setup Mirage mock resources for this test + authenticateSession({}); + instances.scopes.global = this.server.create('scope', { id: 'global' }); + instances.scopes.org = this.server.create('scope', { + type: 'org', + scope: { id: 'global', type: 'global' }, + }); + instances.authMethod = this.server.create('auth-method', { + scope: instances.scopes.org, + }); + + // Generate route URLs for resources + urls.orgScope = `/scopes/${instances.scopes.org.id}`; + urls.authMethods = `${urls.orgScope}/auth-methods`; + urls.newAuthMethod = `${urls.authMethods}/new?type=password`; + urls.authMethod = `${urls.authMethods}/${instances.authMethod.id}`; + }); + + test('can update an auth method and save changes', async function (assert) { + assert.expect(1); + await visit(urls.authMethod); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'update name'); + await click('form [type="submit"]:not(:disabled)'); + assert.equal(this.server.db.authMethods[0].name, 'update name'); + }); + + test('can update an auth method and cancel changes', async function (assert) { + assert.expect(1); + await visit(urls.authMethod); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'update name'); + await click('form button:not([type="submit"])'); + assert.notEqual(this.server.db.authMethods[0].name, 'update name'); + }); + + test('cannot make changes to an existing auth method without proper authorization', async function (assert) { + assert.expect(1); + instances.authMethod.authorized_actions = + instances.authMethod.authorized_actions.filter( + (item) => item !== 'update' + ); + await visit(urls.authMethod); + assert.notOk(find('.rose-layout-page-actions .rose-button-secondary')); + }); + + test('saving an existing auth method with invalid fields displays error messages', async function (assert) { + assert.expect(2); + this.server.patch('/auth-methods/: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.authMethod); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'existing auth method'); + await click('form [type="submit"]'); + await a11yAudit(); + assert.ok( + find('[role="alert"]').textContent.trim(), + 'The request was invalid.', + 'Displays primary error message.' + ); + assert.ok( + find('.rose-form-error-message').textContent.trim(), + 'Name is required.', + 'Displays field-level errors.' + ); + }); + + test('saving an existing auth method with invalid fields displays error messages', async function (assert) { + assert.expect(2); + this.server.patch('/auth-methods/: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.authMethod); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'existing auth method'); + await click('form [type="submit"]'); + await a11yAudit(); + assert.ok( + find('[role="alert"]').textContent.trim(), + 'The request was invalid.', + 'Displays primary error message.' + ); + assert.ok( + find('.rose-form-error-message').textContent.trim(), + 'Name is required.', + 'Displays field-level errors.' + ); + }); +}); diff --git a/ui/admin/tests/acceptance/roles-test.js b/ui/admin/tests/acceptance/roles-test.js index 449580a1c..77b971f46 100644 --- a/ui/admin/tests/acceptance/roles-test.js +++ b/ui/admin/tests/acceptance/roles-test.js @@ -56,40 +56,6 @@ module('Acceptance | roles', function (hooks) { urls.newRole = `${urls.roles}/new`; }); - test('visiting roles', async function (assert) { - assert.expect(1); - await visit(urls.roles); - await a11yAudit(); - assert.equal(currentURL(), urls.roles); - }); - - test('can navigate to a role form', async function (assert) { - assert.expect(1); - await visit(urls.roles); - await click('main tbody .rose-table-header-cell:nth-child(1) a'); - await a11yAudit(); - assert.equal(currentURL(), urls.role); - }); - - test('can save changes to an existing role', async function (assert) { - assert.expect(2); - await visit(urls.role); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'Updated admin role'); - await click('.rose-form-actions [type="submit"]'); - assert.equal(currentURL(), urls.role); - assert.equal(this.server.db.roles[0].name, 'Updated admin role'); - }); - - test('can cancel changes to an existing role', async function (assert) { - assert.expect(1); - await visit(urls.role); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'Updated admin role'); - await click('.rose-form-actions [type="button"]'); - assert.notEqual(find('[name="name"]').value, 'Updated admin role'); - }); - test('can create new role', async function (assert) { assert.expect(1); const rolesCount = this.server.db.roles.length; @@ -109,14 +75,6 @@ module('Acceptance | roles', function (hooks) { assert.equal(this.server.db.roles.length, rolesCount); }); - test('can delete a role', async function (assert) { - assert.expect(1); - const rolesCount = this.server.db.roles.length; - await visit(urls.role); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.equal(this.server.db.roles.length, rolesCount - 1); - }); - test('saving a new role with invalid fields displays error messages', async function (assert) { assert.expect(2); this.server.post('/roles', () => { @@ -145,63 +103,4 @@ module('Acceptance | roles', function (hooks) { assert.ok(find('[role="alert"]')); assert.ok(find('.rose-form-error-message')); }); - - test('saving an existing role with invalid fields displays error messages', async function (assert) { - assert.expect(2); - this.server.patch('/roles/: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.role); - 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.', - 'Displays primary error message.' - ); - assert.ok( - find('.rose-form-error-message').textContent.trim(), - 'Name is required.', - 'Displays field-level errors.' - ); - }); - - test('errors are displayed when delete project fails', async function (assert) { - assert.expect(1); - this.server.del('/roles/:id', () => { - return new Response( - 490, - {}, - { - status: 490, - code: 'error', - message: 'Oops.', - } - ); - }); - await visit(urls.role); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.ok( - find('[role="alert"]').textContent.trim(), - 'Oops.', - 'Displays primary error message.' - ); - }); }); diff --git a/ui/admin/tests/acceptance/roles/delete-test.js b/ui/admin/tests/acceptance/roles/delete-test.js new file mode 100644 index 000000000..a965ff63a --- /dev/null +++ b/ui/admin/tests/acceptance/roles/delete-test.js @@ -0,0 +1,97 @@ +import { module, test } from 'qunit'; +import { visit, click, find } from '@ember/test-helpers'; +import { setupApplicationTest } from 'ember-qunit'; +import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; +import { Response } from 'miragejs'; +import { + authenticateSession, + // These are left here intentionally for future reference. + //currentSession, + //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | roles | delete', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + project: null, + }, + role: null, + }; + const urls = { + orgScope: null, + roles: null, + role: null, + newRole: null, + }; + + hooks.beforeEach(function () { + authenticateSession({}); + instances.scopes.global = this.server.create('scope', { id: 'global' }); + instances.scopes.org = this.server.create('scope', { + type: 'org', + scope: { id: 'global', type: 'global' }, + }); + // The project scope is not yet used for role tests (though it will be + // in the future). This is created simply to test the grant scope loading + // mechanism. + instances.scopes.project = this.server.create('scope', { + type: 'project', + scope: { id: instances.scopes.org.id, type: instances.scopes.org.type }, + }); + instances.role = this.server.create( + 'role', + { + scope: instances.scopes.org, + }, + 'withPrincipals' + ); + urls.roles = `/scopes/${instances.scopes.org.id}/roles`; + urls.role = `${urls.roles}/${instances.role.id}`; + urls.newRole = `${urls.roles}/new`; + }); + + test('can delete a role', async function (assert) { + assert.expect(1); + const rolesCount = this.server.db.roles.length; + await visit(urls.role); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.equal(this.server.db.roles.length, rolesCount - 1); + }); + + test('cannot delete a role without proper authorization', async function (assert) { + assert.expect(1); + instances.role.authorized_actions = + instances.role.authorized_actions.filter((item) => item !== 'delete'); + await visit(urls.role); + assert.notOk( + find('.rose-layout-page-actions .rose-dropdown-button-danger') + ); + }); + + test('errors are displayed when delete project fails', async function (assert) { + assert.expect(1); + this.server.del('/roles/:id', () => { + return new Response( + 490, + {}, + { + status: 490, + code: 'error', + message: 'Oops.', + } + ); + }); + await visit(urls.role); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.ok( + find('[role="alert"]').textContent.trim(), + 'Oops.', + 'Displays primary error message.' + ); + }); +}); diff --git a/ui/admin/tests/acceptance/roles/read-test.js b/ui/admin/tests/acceptance/roles/read-test.js new file mode 100644 index 000000000..97f717085 --- /dev/null +++ b/ui/admin/tests/acceptance/roles/read-test.js @@ -0,0 +1,80 @@ +import { module, test } from 'qunit'; +import { visit, currentURL, click, 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, + // These are left here intentionally for future reference. + //currentSession, + //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | roles | read', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + project: null, + }, + role: null, + }; + const urls = { + orgScope: null, + roles: null, + role: null, + newRole: null, + }; + + hooks.beforeEach(function () { + authenticateSession({}); + instances.scopes.global = this.server.create('scope', { id: 'global' }); + instances.scopes.org = this.server.create('scope', { + type: 'org', + scope: { id: 'global', type: 'global' }, + }); + // The project scope is not yet used for role tests (though it will be + // in the future). This is created simply to test the grant scope loading + // mechanism. + instances.scopes.project = this.server.create('scope', { + type: 'project', + scope: { id: instances.scopes.org.id, type: instances.scopes.org.type }, + }); + instances.role = this.server.create( + 'role', + { + scope: instances.scopes.org, + }, + 'withPrincipals' + ); + urls.roles = `/scopes/${instances.scopes.org.id}/roles`; + urls.role = `${urls.roles}/${instances.role.id}`; + urls.newRole = `${urls.roles}/new`; + }); + + test('visiting roles', async function (assert) { + assert.expect(1); + await visit(urls.roles); + await a11yAudit(); + assert.equal(currentURL(), urls.roles); + }); + + test('can navigate to a role form', async function (assert) { + assert.expect(1); + await visit(urls.roles); + await click('main tbody .rose-table-header-cell:nth-child(1) a'); + await a11yAudit(); + assert.equal(currentURL(), urls.role); + }); + + test('cannot navigate to a role form without proper authorization', async function (assert) { + assert.expect(1); + instances.role.authorized_actions = + instances.role.authorized_actions.filter((item) => item !== 'read'); + await visit(urls.roles); + assert.notOk(find('main tbody .rose-table-header-cell:nth-child(1) a')); + }); +}); diff --git a/ui/admin/tests/acceptance/roles/update-test.js b/ui/admin/tests/acceptance/roles/update-test.js new file mode 100644 index 000000000..21737c705 --- /dev/null +++ b/ui/admin/tests/acceptance/roles/update-test.js @@ -0,0 +1,121 @@ +import { module, test } from 'qunit'; +import { visit, currentURL, click, fillIn, find } from '@ember/test-helpers'; +import { setupApplicationTest } from 'ember-qunit'; +import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; +import { Response } from 'miragejs'; +import { + authenticateSession, + // These are left here intentionally for future reference. + //currentSession, + //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | roles | update', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + project: null, + }, + role: null, + }; + const urls = { + orgScope: null, + roles: null, + role: null, + newRole: null, + }; + + hooks.beforeEach(function () { + authenticateSession({}); + instances.scopes.global = this.server.create('scope', { id: 'global' }); + instances.scopes.org = this.server.create('scope', { + type: 'org', + scope: { id: 'global', type: 'global' }, + }); + // The project scope is not yet used for role tests (though it will be + // in the future). This is created simply to test the grant scope loading + // mechanism. + instances.scopes.project = this.server.create('scope', { + type: 'project', + scope: { id: instances.scopes.org.id, type: instances.scopes.org.type }, + }); + instances.role = this.server.create( + 'role', + { + scope: instances.scopes.org, + }, + 'withPrincipals' + ); + urls.roles = `/scopes/${instances.scopes.org.id}/roles`; + urls.role = `${urls.roles}/${instances.role.id}`; + urls.newRole = `${urls.roles}/new`; + }); + + test('can save changes to an existing role', async function (assert) { + assert.expect(2); + await visit(urls.role); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'Updated admin role'); + await click('.rose-form-actions [type="submit"]'); + assert.equal(currentURL(), urls.role); + assert.equal(this.server.db.roles[0].name, 'Updated admin role'); + }); + + test('cannot make changes to an existing role without proper authorization', async function (assert) { + assert.expect(1); + instances.role.authorized_actions = + instances.role.authorized_actions.filter((item) => item !== 'update'); + await visit(urls.role); + assert.notOk(find('.rose-layout-page-actions .rose-button-secondary')); + }); + + test('can cancel changes to an existing role', async function (assert) { + assert.expect(1); + await visit(urls.role); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'Updated admin role'); + await click('.rose-form-actions [type="button"]'); + assert.notEqual(find('[name="name"]').value, 'Updated admin role'); + }); + + test('saving an existing role with invalid fields displays error messages', async function (assert) { + assert.expect(2); + this.server.patch('/roles/: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.role); + 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.', + 'Displays primary error message.' + ); + assert.ok( + find('.rose-form-error-message').textContent.trim(), + 'Name is required.', + 'Displays field-level errors.' + ); + }); +}); diff --git a/ui/desktop/jsconfig.json b/ui/desktop/jsconfig.json deleted file mode 100644 index f408cac8c..000000000 --- a/ui/desktop/jsconfig.json +++ /dev/null @@ -1 +0,0 @@ -{"compilerOptions":{"target":"es6","experimentalDecorators":true},"exclude":["node_modules","bower_components","tmp","vendor",".git","dist"]} \ No newline at end of file