From 87619dc9dcaf9a0053a261002839f22ea3fd52b9 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Fri, 27 Aug 2021 14:43:18 -0400 Subject: [PATCH] =?UTF-8?q?test:=20=F0=9F=92=8D=20separate=20delete=20and?= =?UTF-8?q?=20update=20tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/admin/tests/acceptance/scopes-test.js | 155 ---------------- .../tests/acceptance/scopes/delete-test.js | 127 +++++++++++++ .../tests/acceptance/scopes/update-test.js | 174 ++++++++++++++++++ 3 files changed, 301 insertions(+), 155 deletions(-) create mode 100644 ui/admin/tests/acceptance/scopes/delete-test.js create mode 100644 ui/admin/tests/acceptance/scopes/update-test.js 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..1651dd0b6 --- /dev/null +++ b/ui/admin/tests/acceptance/scopes/delete-test.js @@ -0,0 +1,127 @@ +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('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/update-test.js b/ui/admin/tests/acceptance/scopes/update-test.js new file mode 100644 index 000000000..1d7a4974b --- /dev/null +++ b/ui/admin/tests/acceptance/scopes/update-test.js @@ -0,0 +1,174 @@ +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('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' + ); + } + }); +});