diff --git a/addons/api/mirage/factories/host-catalog.js b/addons/api/mirage/factories/host-catalog.js index cd033f7f3..c08d2786a 100644 --- a/addons/api/mirage/factories/host-catalog.js +++ b/addons/api/mirage/factories/host-catalog.js @@ -10,6 +10,12 @@ export default factory.extend({ 'update', 'delete', ], + authorized_collection_actions: () => { + return { + hosts: ['create', 'list'], + 'host-sets': ['create', 'list'], + }; + }, withChildren: trait({ afterCreate(hostCatalog, server) { const { scope } = hostCatalog; diff --git a/addons/api/mirage/factories/scope.js b/addons/api/mirage/factories/scope.js index 186d40205..edd0aeb11 100644 --- a/addons/api/mirage/factories/scope.js +++ b/addons/api/mirage/factories/scope.js @@ -1,9 +1,18 @@ import factory from '../generated/factories/scope'; import { trait } from 'ember-cli-mirage'; +import permissions from '../helpers/permissions'; export default factory.extend({ type: 'global', + authorized_actions: () => + permissions.authorizedActionsFor('scope') || [ + 'no-op', + 'read', + 'update', + 'delete', + ], + authorized_collection_actions: () => { return { users: ['create', 'list'], diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml index 52bd07d03..4d373e26d 100644 --- a/addons/core/translations/resources/en-us.yaml +++ b/addons/core/translations/resources/en-us.yaml @@ -346,3 +346,8 @@ credential-library: help: The body of the HTTP request the library sends to Vault when requesting credentials. Only allowed when HTTP method is set to POST. types: vault: Vault +scope: + title: Scope + title_plural: Scopes + messages: + cannot_read: While you do not have permission to read this scope, you may have permission to view resources within it. diff --git a/ui/admin/app/components/form/scope/index.hbs b/ui/admin/app/components/form/scope/index.hbs index a0c3230ef..d86d409b3 100644 --- a/ui/admin/app/components/form/scope/index.hbs +++ b/ui/admin/app/components/form/scope/index.hbs @@ -46,11 +46,13 @@ {{/if}} - + {{#if (can 'save model' @model)}} + + {{/if}} \ No newline at end of file diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets.js index beb0aa93a..36d341bc4 100644 --- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets.js +++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets.js @@ -10,7 +10,7 @@ export default class ScopesScopeHostCatalogsHostCatalogHostSetsRoute extends Rou @service intl; @service notify; - + @service can; // =methods /** @@ -18,10 +18,18 @@ export default class ScopesScopeHostCatalogsHostCatalogHostSetsRoute extends Rou * @return {Promise{[HostSetModel]}} */ model() { - const { id: host_catalog_id } = this.modelFor( + const hostCatalog = this.modelFor( 'scopes.scope.host-catalogs.host-catalog' ); - return this.store.query('host-set', { host_catalog_id }); + + const { id: host_catalog_id } = hostCatalog; + if ( + this.can.can('list collection', hostCatalog, { + collection: 'host-sets', + }) + ) { + return this.store.query('host-set', { host_catalog_id }); + } } // =actions diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/index.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/index.js index e62c9f95e..1f49ad3af 100644 --- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/index.js +++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/index.js @@ -1,3 +1,11 @@ import Route from '@ember/routing/route'; - -export default class ScopesScopeHostCatalogsHostCatalogHostSetsIndexRoute extends Route {} +export default class ScopesScopeHostCatalogsHostCatalogHostSetsIndexRoute extends Route { + // =methods + setupController(controller) { + const hostCatalog = this.modelFor( + 'scopes.scope.host-catalogs.host-catalog' + ); + super.setupController(...arguments); + controller.setProperties({ hostCatalog }); + } +} diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts.js index a41073688..5969a8b67 100644 --- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts.js +++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts.js @@ -10,7 +10,7 @@ export default class ScopesScopeHostCatalogsHostCatalogHostsRoute extends Route @service intl; @service notify; - + @service can; // =methods /** @@ -18,10 +18,17 @@ export default class ScopesScopeHostCatalogsHostCatalogHostsRoute extends Route * @return {Promise{[HostModel]}} */ model() { - const { id: host_catalog_id } = this.modelFor( + const hostCatalog = this.modelFor( 'scopes.scope.host-catalogs.host-catalog' ); - return this.store.query('host', { host_catalog_id }); + const { id: host_catalog_id } = hostCatalog; + if ( + this.can.can('list collection', hostCatalog, { + collection: 'hosts', + }) + ) { + return this.store.query('host', { host_catalog_id }); + } } // =actions diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts/index.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts/index.js index c219c570f..617551d99 100644 --- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts/index.js +++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts/index.js @@ -1,3 +1,11 @@ import Route from '@ember/routing/route'; -export default class ScopesScopeHostCatalogsHostCatalogHostsIndexRoute extends Route {} +export default class ScopesScopeHostCatalogsHostCatalogHostsIndexRoute extends Route { + setupController(controller) { + const hostCatalog = this.modelFor( + 'scopes.scope.host-catalogs.host-catalog' + ); + super.setupController(...arguments); + controller.setProperties({ hostCatalog }); + } +} diff --git a/ui/admin/app/templates/scopes/scope/edit.hbs b/ui/admin/app/templates/scopes/scope/edit.hbs index 9e3898e0f..d8f6dc683 100644 --- a/ui/admin/app/templates/scopes/scope/edit.hbs +++ b/ui/admin/app/templates/scopes/scope/edit.hbs @@ -28,40 +28,54 @@ - - - - {{t 'titles.details'}} - - - + {{#if (can 'read model' @model)}} + + + + {{t 'titles.details'}} + + + + {{/if}} - - - + - {{#if @model.isOrg}} - {{t 'resources.org.actions.delete'}} - {{else}} - {{t 'resources.project.actions.delete'}} - {{/if}} - - - + + {{#if @model.isOrg}} + {{t 'resources.org.actions.delete'}} + {{else}} + {{t 'resources.project.actions.delete'}} + {{/if}} + + + + {{/if}} - + {{#if (can 'read model' @model)}} + + {{else}} + + + + {{t 'resources.scope.messages.cannot_read'}} + + + + {{/if}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-actions.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-actions.hbs index bf5fe452e..696c9e35e 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-actions.hbs @@ -3,18 +3,22 @@ @dropdownRight={{true}} as |dropdown| > - - {{t 'resources.host.actions.create'}} - - - {{t 'resources.host-set.actions.create'}} - + {{#if (can 'create collection' @model collection='hosts')}} + + {{t 'resources.host.actions.create'}} + + {{/if}} + {{#if (can 'create collection' @model collection='host-sets')}} + + {{t 'resources.host-set.actions.create'}} + + {{/if}} {{#if (can 'delete model' @model)}} {{t 'titles.details'}} - - {{t 'resources.host.title_plural'}} - - - {{t 'resources.host-set.title_plural'}} - + {{#if (can 'navigate collection' @model collection='hosts')}} + + {{t 'resources.host.title_plural'}} + + {{/if}} + {{#if (can 'navigate collection' @model collection='host-sets')}} + + {{t 'resources.host-set.title_plural'}} + + {{/if}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs index 1b0a18cb8..c814c749e 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs @@ -51,14 +51,36 @@ as |message| > - {{t 'resources.host-set.description'}} + + {{#if (can 'list collection' this.hostCatalog collection='host-sets')}} + {{! can list (at least): show default welcome message}} + {{t 'resources.host-set.description'}} + + {{else if (can + 'create collection' this.hostCatalog collection='host-sets' + )}} + {{! can create (only): show create-but-not-list welcome message}} + {{t + 'descriptions.create-but-not-list' + resource=(t 'resources.host-set.title_plural') + }} + {{else}} + {{! can neither list nor create }} + {{t + 'descriptions.neither-list-nor-create' + resource=(t 'resources.host-set.title_plural') + }} + {{/if}} - - - {{t 'titles.new'}} - + + {{#if (can 'create collection' this.hostCatalog collection='host-sets')}} + + + {{t 'titles.new'}} + + {{/if}} diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs index 6687cbf76..117689f14 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs @@ -55,12 +55,37 @@ as |message| > - {{t 'resources.host.description'}} + + {{#if (can 'list collection' this.hostCatalog collection='hosts')}} + {{! can list (at least): show default welcome message}} + {{t 'resources.host.description'}} + + {{else if (can + 'create collection' this.hostCatalog collection='hosts' + )}} + {{! can create (only): show create-but-not-list welcome message}} + {{t + 'descriptions.create-but-not-list' + resource=(t 'resources.host.title_plural') + }} + {{else}} + {{! can neither list nor create }} + {{t + 'descriptions.neither-list-nor-create' + resource=(t 'resources.host.title_plural') + }} + {{/if}} - - - {{t 'titles.new'}} - + + {{#if (can 'create collection' this.hostCatalog collection='hosts')}} + + + + {{t 'titles.new'}} + + {{/if}} diff --git a/ui/admin/tests/acceptance/host-catalogs/host-sets-test.js b/ui/admin/tests/acceptance/host-catalogs/host-sets/create-test.js similarity index 78% rename from ui/admin/tests/acceptance/host-catalogs/host-sets-test.js rename to ui/admin/tests/acceptance/host-catalogs/host-sets/create-test.js index 33465e7ce..a7ede23ed 100644 --- a/ui/admin/tests/acceptance/host-catalogs/host-sets-test.js +++ b/ui/admin/tests/acceptance/host-catalogs/host-sets/create-test.js @@ -10,7 +10,7 @@ import { //invalidateSession, } from 'ember-simple-auth/test-support'; -module('Acceptance | host-catalogs | host sets', function (hooks) { +module('Acceptance | host-catalogs | host sets | create', function (hooks) { setupApplicationTest(hooks); setupMirage(hooks); @@ -70,7 +70,7 @@ module('Acceptance | host-catalogs | host sets', function (hooks) { authenticateSession({}); }); - test('can create new host', async function (assert) { + test('can create new host sets', async function (assert) { assert.expect(1); const count = getHostSetCount(); await visit(urls.newHostSet); @@ -79,6 +79,30 @@ module('Acceptance | host-catalogs | host sets', function (hooks) { assert.equal(getHostSetCount(), count + 1); }); + test('Users cannot create a new host set without proper authorization', async function (assert) { + assert.expect(2); + instances.hostCatalog.authorized_collection_actions['host-sets'] = []; + await visit(urls.hostCatalog); + assert.notOk( + instances.hostCatalog.authorized_collection_actions['host-sets'].includes( + 'create' + ) + ); + assert.notOk(find(`.rose-layout-page-actions [href="${urls.newHostSet}"]`)); + }); + + test('Users cannot navigate to new host sets route without proper authorization', async function (assert) { + assert.expect(2); + instances.hostCatalog.authorized_collection_actions['host-sets'] = []; + await visit(urls.hostCatalog); + assert.notOk( + instances.hostCatalog.authorized_collection_actions['host-sets'].includes( + 'create' + ) + ); + assert.notOk(find(`[href="${urls.hostSets}"]`)); + }); + test('can cancel create new host', async function (assert) { assert.expect(2); const count = getHostSetCount(); diff --git a/ui/admin/tests/acceptance/host-catalogs/host-sets/list-test.js b/ui/admin/tests/acceptance/host-catalogs/host-sets/list-test.js new file mode 100644 index 000000000..6e092398b --- /dev/null +++ b/ui/admin/tests/acceptance/host-catalogs/host-sets/list-test.js @@ -0,0 +1,98 @@ +import { module, test } from 'qunit'; +import { visit, find } from '@ember/test-helpers'; +import { setupApplicationTest } from 'ember-qunit'; +import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; +import { + authenticateSession, + // These are left here intentionally for future reference. + //currentSession, + //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | host-catalogs | host sets | list', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + project: null, + hostCatalog: null, + host: null, + }, + }; + const urls = { + globalScope: null, + orgScope: null, + projectScope: null, + hostCatalogs: null, + hostCatalog: null, + hostSets: null, + hostSet: null, + newHostSet: 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.hostCatalog = this.server.create('host-catalog', { + scope: instances.scopes.project, + }); + instances.hostSet = this.server.create('host-set', { + scope: instances.scopes.project, + hostCatalog: instances.hostCatalog, + }); + // 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.hostCatalogs = `${urls.projectScope}/host-catalogs`; + urls.hostCatalog = `${urls.hostCatalogs}/${instances.hostCatalog.id}`; + urls.hostSets = `${urls.hostCatalog}/host-sets`; + urls.hostSet = `${urls.hostSets}/${instances.hostSet.id}`; + urls.newHostSet = `${urls.hostSets}/new`; + authenticateSession({}); + }); + + test('Users can navigate to host-sets with proper authorization', async function (assert) { + assert.expect(2); + await visit(urls.hostCatalog); + assert.ok( + instances.hostCatalog.authorized_collection_actions['host-sets'].includes( + 'list' + ) + ); + assert.ok(find(`[href="${urls.hostSets}"]`)); + }); + + test('Users cannot navigate to index without either list or create actions', async function (assert) { + assert.expect(2); + instances.hostCatalog.authorized_collection_actions['host-sets'] = []; + await visit(urls.hostCatalog); + assert.notOk( + instances.hostCatalog.authorized_collection_actions['host-sets'].includes( + 'list' + ) + ); + assert.notOk(find(`[href="${urls.hostSets}"]`)); + }); + + test('Users can navigate to index with only create action', async function (assert) { + assert.expect(2); + instances.hostCatalog.authorized_collection_actions['host-sets'] = [ + 'create', + ]; + await visit(urls.hostCatalog); + assert.ok(find(`[href="${urls.hostSets}"]`)); + assert.ok(find(`.rose-layout-page-actions [href="${urls.newHostSet}"]`)); + }); +}); diff --git a/ui/admin/tests/acceptance/host-catalogs/hosts-test.js b/ui/admin/tests/acceptance/host-catalogs/hosts/create-test.js similarity index 74% rename from ui/admin/tests/acceptance/host-catalogs/hosts-test.js rename to ui/admin/tests/acceptance/host-catalogs/hosts/create-test.js index a4ab70a60..1b50b301b 100644 --- a/ui/admin/tests/acceptance/host-catalogs/hosts-test.js +++ b/ui/admin/tests/acceptance/host-catalogs/hosts/create-test.js @@ -10,7 +10,7 @@ import { //invalidateSession, } from 'ember-simple-auth/test-support'; -module('Acceptance | host-catalogs | hosts', function (hooks) { +module('Acceptance | host-catalogs | hosts | create', function (hooks) { setupApplicationTest(hooks); setupMirage(hooks); @@ -79,6 +79,40 @@ module('Acceptance | host-catalogs | hosts', function (hooks) { assert.equal(getHostCount(), count + 1); }); + test('Users cannot create a new host without proper authorization', async function (assert) { + assert.expect(2); + instances.hostCatalog.authorized_collection_actions.hosts = []; + await visit(urls.hostCatalog); + assert.notOk( + instances.hostCatalog.authorized_collection_actions.hosts.includes( + 'create' + ) + ); + assert.notOk(find(`.rose-layout-page-actions [href="${urls.newHost}"]`)); + }); + test('Users can navigate to new host catalogs route with proper authorization', async function (assert) { + assert.expect(2); + await visit(urls.hostCatalog); + assert.ok( + instances.hostCatalog.authorized_collection_actions.hosts.includes( + 'create' + ) + ); + assert.ok(find(`[href="${urls.hosts}"]`)); + }); + + test('Users cannot navigate to new host catalogs route without proper authorization', async function (assert) { + assert.expect(2); + instances.hostCatalog.authorized_collection_actions.hosts = []; + await visit(urls.hostCatalog); + assert.notOk( + instances.hostCatalog.authorized_collection_actions.hosts.includes( + 'create' + ) + ); + assert.notOk(find(`[href="${urls.hosts}"]`)); + }); + test('can cancel create new host', async function (assert) { assert.expect(2); const count = getHostCount(); diff --git a/ui/admin/tests/acceptance/host-catalogs/hosts/list-test.js b/ui/admin/tests/acceptance/host-catalogs/hosts/list-test.js new file mode 100644 index 000000000..c5f3e4735 --- /dev/null +++ b/ui/admin/tests/acceptance/host-catalogs/hosts/list-test.js @@ -0,0 +1,93 @@ +import { module, test } from 'qunit'; +import { visit, find } from '@ember/test-helpers'; +import { setupApplicationTest } from 'ember-qunit'; +import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; +import { + authenticateSession, + // These are left here intentionally for future reference. + //currentSession, + //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | host-catalogs | hosts | list', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + project: null, + hostCatalog: null, + host: null, + }, + }; + const urls = { + globalScope: null, + orgScope: null, + projectScope: null, + hostCatalogs: null, + hostCatalog: null, + hosts: null, + host: null, + unknownHost: null, + newHost: 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.hostCatalog = this.server.create('host-catalog', { + scope: instances.scopes.project, + }); + instances.host = this.server.create('host', { + scope: instances.scopes.project, + hostCatalog: instances.hostCatalog, + }); + // 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.hostCatalogs = `${urls.projectScope}/host-catalogs`; + urls.hostCatalog = `${urls.hostCatalogs}/${instances.hostCatalog.id}`; + urls.hosts = `${urls.hostCatalog}/hosts`; + urls.host = `${urls.hosts}/${instances.host.id}`; + urls.unknownHost = `${urls.hosts}/foo`; + urls.newHost = `${urls.hosts}/new`; + authenticateSession({}); + }); + test('Users can navigate to hosts with proper authorization', async function (assert) { + assert.expect(2); + await visit(urls.hostCatalog); + assert.ok( + instances.hostCatalog.authorized_collection_actions.hosts.includes('list') + ); + assert.ok(find(`[href="${urls.hosts}"]`)); + }); + + test('User cannot navigate to index without either list or create actions', async function (assert) { + assert.expect(2); + instances.hostCatalog.authorized_collection_actions.hosts = []; + await visit(urls.hostCatalog); + assert.notOk( + instances.hostCatalog.authorized_collection_actions.hosts.includes('list') + ); + assert.notOk(find(`[href="${urls.hosts}"]`)); + }); + + test('User can navigate to index with only create action', async function (assert) { + assert.expect(2); + instances.hostCatalog.authorized_collection_actions.hosts = ['create']; + await visit(urls.hostCatalog); + assert.ok(find(`[href="${urls.hosts}"]`)); + assert.ok(find(`.rose-layout-page-actions [href="${urls.newHost}"]`)); + }); +}); diff --git a/ui/admin/tests/acceptance/scopes-test.js b/ui/admin/tests/acceptance/scopes-test.js index df294416b..87a2e5656 100644 --- a/ui/admin/tests/acceptance/scopes-test.js +++ b/ui/admin/tests/acceptance/scopes-test.js @@ -4,8 +4,6 @@ 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 { resolve, reject } from 'rsvp'; -import sinon from 'sinon'; import { authenticateSession, // These are left here intentionally for future reference. @@ -202,157 +200,4 @@ module('Acceptance | scopes', function (hooks) { 'Name is required.' ); }); - - test('can save changes to existing scope', async function (assert) { - assert.expect(3); - assert.notEqual(instances.scopes.org.name, 'random string'); - await visit(urls.orgScopeEdit); - 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.orgScopeEdit); - assert.equal( - this.server.schema.scopes.where({ type: 'org' }).models[0].name, - 'random string' - ); - }); - - test('can cancel changes to existing scope', async function (assert) { - assert.expect(2); - await visit(urls.orgScopeEdit); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'random string'); - await click('.rose-form-actions [type="button"]'); - assert.notEqual(instances.scopes.org.name, 'random string'); - assert.equal(find('[name="name"]').value, instances.scopes.org.name); - }); - - test('saving an existing scope with invalid fields displays error messages', async function (assert) { - assert.expect(2); - this.server.patch('/scopes/: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.orgScopeEdit); - 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 scope changes via dialog', async function (assert) { - assert.expect(5); - const confirmService = this.owner.lookup('service:confirm'); - confirmService.enabled = true; - assert.notEqual(instances.scopes.org.name, 'random string'); - await visit(urls.orgScopeEdit); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'random string'); - assert.equal(currentURL(), urls.orgScopeEdit); - try { - await visit(urls.globalScope); - } catch (e) { - assert.ok(find('.rose-dialog')); - await click('.rose-dialog-footer button:first-child'); - assert.equal(currentURL(), urls.globalScope); - assert.notEqual( - this.server.schema.scopes.where({ type: 'org' }).models[0].name, - 'random string' - ); - } - }); - - test('can cancel discard unsaved scope changes via dialog', async function (assert) { - assert.expect(5); - const confirmService = this.owner.lookup('service:confirm'); - confirmService.enabled = true; - assert.notEqual(instances.scopes.org.name, 'random string'); - await visit(urls.orgScopeEdit); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'random string'); - assert.equal(currentURL(), urls.orgScopeEdit); - try { - await visit(urls.globalScope); - } catch (e) { - assert.ok(find('.rose-dialog')); - await click('.rose-dialog-footer button:last-child'); - assert.equal(currentURL(), urls.orgScopeEdit); - assert.notEqual( - this.server.schema.scopes.where({ type: 'org' }).models[0].name, - 'random string' - ); - } - }); - - test('can delete scope', async function (assert) { - assert.expect(1); - const orgScopeCount = getScopeCount('org'); - await visit(urls.orgScopeEdit); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.equal(getScopeCount('org'), orgScopeCount - 1); - }); - - test('can accept delete scope 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 orgScopeCount = getScopeCount('org'); - await visit(urls.orgScopeEdit); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.equal(getScopeCount('org'), orgScopeCount - 1); - assert.ok(confirmService.confirm.calledOnce); - }); - - test('cannot cancel delete scope 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 orgScopeCount = getScopeCount('org'); - await visit(urls.orgScopeEdit); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.equal(getScopeCount('org'), orgScopeCount); - assert.ok(confirmService.confirm.calledOnce); - }); - - test('deleting a scope which errors displays error messages', async function (assert) { - assert.expect(1); - this.server.del('/scopes/:id', () => { - return new Response( - 490, - {}, - { - status: 490, - code: 'error', - message: 'Oops.', - } - ); - }); - await visit(urls.orgScopeEdit); - 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/scopes/delete-test.js b/ui/admin/tests/acceptance/scopes/delete-test.js new file mode 100644 index 000000000..6b35ae24d --- /dev/null +++ b/ui/admin/tests/acceptance/scopes/delete-test.js @@ -0,0 +1,136 @@ +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 { Response } from 'miragejs'; +import { resolve, reject } from 'rsvp'; +import sinon from 'sinon'; +import { + authenticateSession, + // These are left here intentionally for future reference. + //currentSession, + //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | scopes | delete', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + let getScopeCount; + + const instances = { + scopes: { + global: null, + org: null, + org2: null, + project: null, + project2: null, + }, + }; + const urls = { + globalScope: null, + orgScope: null, + org2Scope: null, + orgScopeEdit: null, + org2ScopeEdit: null, + projectScope: null, + project2Scope: null, + projectScopeEdit: null, + project2ScopeEdit: 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.org2 = 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.scopes.project2 = this.server.create('scope', { + type: 'project', + scope: { id: instances.scopes.org.id, type: 'org' }, + }); + // Generate route URLs for resources + urls.globalScope = `/scopes/global/scopes`; + urls.newOrgScope = `/scopes/global/new`; + urls.orgScope = `/scopes/${instances.scopes.org.id}/scopes`; + urls.org2Scope = `/scopes/${instances.scopes.org2.id}/scopes`; + urls.orgScopeEdit = `/scopes/${instances.scopes.org.id}/edit`; + urls.org2ScopeEdit = `/scopes/${instances.scopes.org2.id}/edit`; + urls.newProjectScope = `/scopes/${instances.scopes.org.id}/new`; + urls.projectScope = `/scopes/${instances.scopes.project.id}`; + urls.project2Scope = `/scopes/${instances.scopes.project2.id}`; + urls.projectScopeEdit = `/scopes/${instances.scopes.project.id}/edit`; + urls.project2ScopeEdit = `/scopes/${instances.scopes.project2.id}/edit`; + // Generate resource couner + getScopeCount = (type) => this.server.schema.scopes.where({ type }).length; + authenticateSession({}); + }); + + test('can delete scope', async function (assert) { + assert.expect(1); + const orgScopeCount = getScopeCount('org'); + await visit(urls.orgScopeEdit); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.equal(getScopeCount('org'), orgScopeCount - 1); + }); + + test('cannot delete scope without proper authorization', async function (assert) { + assert.expect(1); + instances.scopes.org.update({ authorized_actions: [] }); + await visit(urls.orgScopeEdit); + assert.notOk( + find('.rose-layout-page-actions .rose-dropdown-button-danger') + ); + }); + + test('can accept delete scope 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 orgScopeCount = getScopeCount('org'); + await visit(urls.orgScopeEdit); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.equal(getScopeCount('org'), orgScopeCount - 1); + assert.ok(confirmService.confirm.calledOnce); + }); + + test('cannot cancel delete scope 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 orgScopeCount = getScopeCount('org'); + await visit(urls.orgScopeEdit); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.equal(getScopeCount('org'), orgScopeCount); + assert.ok(confirmService.confirm.calledOnce); + }); + + test('deleting a scope which errors displays error messages', async function (assert) { + assert.expect(1); + this.server.del('/scopes/:id', () => { + return new Response( + 490, + {}, + { + status: 490, + code: 'error', + message: 'Oops.', + } + ); + }); + await visit(urls.orgScopeEdit); + 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/scopes/read-test.js b/ui/admin/tests/acceptance/scopes/read-test.js new file mode 100644 index 000000000..1ddd1e5a4 --- /dev/null +++ b/ui/admin/tests/acceptance/scopes/read-test.js @@ -0,0 +1,55 @@ +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, + // These are left here intentionally for future reference. + //currentSession, + //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | scopes | read', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + }, + }; + const urls = { + orgScopeEdit: 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' }, + }); + // Generate route URLs for resources + urls.orgScopeEdit = `/scopes/${instances.scopes.org.id}/edit`; + // Generate resource couner + authenticateSession({}); + }); + + test('visiting org scope edit', async function (assert) { + assert.expect(2); + await visit(urls.orgScopeEdit); + await a11yAudit(); + assert.equal(currentURL(), urls.orgScopeEdit); + assert.ok(find('main .rose-form')); + }); + + test('visiting org scope edit without read permission results in no form displayed', async function (assert) { + assert.expect(2); + instances.scopes.org.update({ authorized_actions: [] }); + await visit(urls.orgScopeEdit); + assert.equal(currentURL(), urls.orgScopeEdit); + assert.notOk(find('main .rose-form')); + }); +}); diff --git a/ui/admin/tests/acceptance/scopes/update-test.js b/ui/admin/tests/acceptance/scopes/update-test.js new file mode 100644 index 000000000..4ddb8085d --- /dev/null +++ b/ui/admin/tests/acceptance/scopes/update-test.js @@ -0,0 +1,181 @@ +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 { Response } from 'miragejs'; +import { + authenticateSession, + // These are left here intentionally for future reference. + //currentSession, + //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | scopes | update', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + org2: null, + project: null, + project2: null, + }, + }; + const urls = { + globalScope: null, + orgScope: null, + org2Scope: null, + orgScopeEdit: null, + org2ScopeEdit: null, + projectScope: null, + project2Scope: null, + projectScopeEdit: null, + project2ScopeEdit: 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.org2 = 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.scopes.project2 = this.server.create('scope', { + type: 'project', + scope: { id: instances.scopes.org.id, type: 'org' }, + }); + // Generate route URLs for resources + urls.globalScope = `/scopes/global/scopes`; + urls.newOrgScope = `/scopes/global/new`; + urls.orgScope = `/scopes/${instances.scopes.org.id}/scopes`; + urls.org2Scope = `/scopes/${instances.scopes.org2.id}/scopes`; + urls.orgScopeEdit = `/scopes/${instances.scopes.org.id}/edit`; + urls.org2ScopeEdit = `/scopes/${instances.scopes.org2.id}/edit`; + urls.newProjectScope = `/scopes/${instances.scopes.org.id}/new`; + urls.projectScope = `/scopes/${instances.scopes.project.id}`; + urls.project2Scope = `/scopes/${instances.scopes.project2.id}`; + urls.projectScopeEdit = `/scopes/${instances.scopes.project.id}/edit`; + urls.project2ScopeEdit = `/scopes/${instances.scopes.project2.id}/edit`; + authenticateSession({}); + }); + + test('can save changes to existing scope', async function (assert) { + assert.expect(3); + assert.notEqual(instances.scopes.org.name, 'random string'); + await visit(urls.orgScopeEdit); + 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.orgScopeEdit); + assert.equal( + this.server.schema.scopes.where({ type: 'org' }).models[0].name, + 'random string' + ); + }); + + test('cannot save changes to without proper authorization', async function (assert) { + assert.expect(1); + instances.scopes.org.update({ authorized_actions: [] }); + await visit(urls.orgScopeEdit); + assert.notOk(find('form [type="button"]')); + }); + + test('can cancel changes to existing scope', async function (assert) { + assert.expect(2); + await visit(urls.orgScopeEdit); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'random string'); + await click('.rose-form-actions [type="button"]'); + assert.notEqual(instances.scopes.org.name, 'random string'); + assert.equal(find('[name="name"]').value, instances.scopes.org.name); + }); + + test('saving an existing scope with invalid fields displays error messages', async function (assert) { + assert.expect(2); + this.server.patch('/scopes/: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.orgScopeEdit); + 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 scope changes via dialog', async function (assert) { + assert.expect(5); + const confirmService = this.owner.lookup('service:confirm'); + confirmService.enabled = true; + assert.notEqual(instances.scopes.org.name, 'random string'); + await visit(urls.orgScopeEdit); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'random string'); + assert.equal(currentURL(), urls.orgScopeEdit); + try { + await visit(urls.globalScope); + } catch (e) { + assert.ok(find('.rose-dialog')); + await click('.rose-dialog-footer button:first-child'); + assert.equal(currentURL(), urls.globalScope); + assert.notEqual( + this.server.schema.scopes.where({ type: 'org' }).models[0].name, + 'random string' + ); + } + }); + + test('can cancel discard unsaved scope changes via dialog', async function (assert) { + assert.expect(5); + const confirmService = this.owner.lookup('service:confirm'); + confirmService.enabled = true; + assert.notEqual(instances.scopes.org.name, 'random string'); + await visit(urls.orgScopeEdit); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'random string'); + assert.equal(currentURL(), urls.orgScopeEdit); + try { + await visit(urls.globalScope); + } catch (e) { + assert.ok(find('.rose-dialog')); + await click('.rose-dialog-footer button:last-child'); + assert.equal(currentURL(), urls.orgScopeEdit); + assert.notEqual( + this.server.schema.scopes.where({ type: 'org' }).models[0].name, + 'random string' + ); + } + }); +}); diff --git a/ui/admin/tests/acceptance/users/create-test.js b/ui/admin/tests/acceptance/users/create-test.js index 99b715b9b..b69a1f3df 100644 --- a/ui/admin/tests/acceptance/users/create-test.js +++ b/ui/admin/tests/acceptance/users/create-test.js @@ -20,6 +20,7 @@ module('Acceptance | users | create', function (hooks) { let newUserURL; hooks.beforeEach(function () { + this.server.create('scope', { id: 'global' }); orgScope = this.server.create( 'scope', { diff --git a/ui/admin/tests/acceptance/users/list-test.js b/ui/admin/tests/acceptance/users/list-test.js index d453e5b04..ccf1bcf2e 100644 --- a/ui/admin/tests/acceptance/users/list-test.js +++ b/ui/admin/tests/acceptance/users/list-test.js @@ -19,7 +19,6 @@ module('Acceptance | users | list', function (hooks) { global: null, org: null, }, - orgScope: null, }; const urls = {