diff --git a/ui/admin/tests/acceptance/workers/create-test.js b/ui/admin/tests/acceptance/workers/create-test.js index b84a281f8..d23093b5b 100644 --- a/ui/admin/tests/acceptance/workers/create-test.js +++ b/ui/admin/tests/acceptance/workers/create-test.js @@ -10,6 +10,7 @@ import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; import { Response } from 'miragejs'; import { authenticateSession } from 'ember-simple-auth/test-support'; import * as commonSelectors from 'admin/tests/helpers/selectors'; +import * as selectors from './selectors'; module('Acceptance | workers | create', function (hooks) { setupApplicationTest(hooks); @@ -19,6 +20,7 @@ module('Acceptance | workers | create', function (hooks) { let workersURL; let newWorkerURL; let getWorkersCount; + let featuresService; hooks.beforeEach(async function () { globalScope = this.server.create('scope', { id: 'global' }); @@ -26,6 +28,7 @@ module('Acceptance | workers | create', function (hooks) { workersURL = `/scopes/global/workers`; newWorkerURL = `${workersURL}/new`; getWorkersCount = () => this.server.schema.workers.all().length; + featuresService = this.owner.lookup('service:features'); await authenticateSession({}); }); @@ -33,33 +36,41 @@ module('Acceptance | workers | create', function (hooks) { test('can create new workers', async function (assert) { const workersCount = getWorkersCount(); await visit(newWorkerURL); - await fillIn('[name="worker_auth_registration_request"]', 'token'); - await click('[type="submit"]'); + + await fillIn( + selectors.FIELD_WORKER_AUTH_REGISTRATION, + selectors.FIELD_WORKER_AUTH_REGISTRATION_VALUE, + ); + await click(commonSelectors.SAVE_BTN); + assert.strictEqual(getWorkersCount(), workersCount + 1); }); test('cluster id input field is visible for `hcp` binary', async function (assert) { - const featuresService = this.owner.lookup('service:features'); featuresService.enable('byow-pki-hcp-cluster-id'); await visit(newWorkerURL); - const labels = findAll('.worker-create-section label.hds-form-label'); + + const labels = findAll(selectors.WORKER_CREATE_SECTION_FORM_LABEL); + assert.dom(labels[0]).hasText('Boundary Cluster ID (Optional)'); assert.dom(labels[2]).doesNotIncludeText('Initial Upstreams'); }); test('initial upstreams input field is visible for `oss` binary', async function (assert) { - const featuresService = this.owner.lookup('service:features'); await visit(newWorkerURL); - const labels = findAll('.worker-create-section label.hds-form-label'); + + const labels = findAll(selectors.WORKER_CREATE_SECTION_FORM_LABEL); + assert.false(featuresService.isEnabled('byow-pki-hcp-cluster-id')); assert.dom(labels[0]).doesNotIncludeText('Boundary Cluster ID'); assert.dom(labels[2]).hasText('Initial Upstreams (Optional)'); }); test('download and install step shows correct oss instructions', async function (assert) { - const featuresService = this.owner.lookup('service:features'); await visit(newWorkerURL); - const createSection = findAll('.worker-create-section'); + + const createSection = findAll(selectors.WORKER_CREATE_SECTION); + assert.false(featuresService.isEnabled('byow-pki-hcp-cluster-id')); assert .dom(createSection[1]) @@ -74,10 +85,11 @@ module('Acceptance | workers | create', function (hooks) { }); test('download and install step shows correct hcp instructions', async function (assert) { - const featuresService = this.owner.lookup('service:features'); featuresService.enable('byow-pki-hcp-cluster-id'); await visit(newWorkerURL); - const createSection = findAll('.worker-create-section'); + + const createSection = findAll(selectors.WORKER_CREATE_SECTION); + assert .dom(createSection[1]) .includesText( @@ -92,23 +104,25 @@ module('Acceptance | workers | create', function (hooks) { test('Users can navigate to new workers route with proper authorization', async function (assert) { await visit(workersURL); + assert.ok( globalScope.authorized_collection_actions.workers.includes( 'create:worker-led', ), ); - assert.dom(`[href="${newWorkerURL}"]`).isVisible(); + assert.dom(commonSelectors.HREF(newWorkerURL)).isVisible(); }); test('Users cannot navigate to new workers route without proper authorization', async function (assert) { globalScope.authorized_collection_actions.workers = []; await visit(workersURL); + assert.notOk( globalScope.authorized_collection_actions.users.includes( 'create:worker-led', ), ); - assert.dom(`[href="${newWorkerURL}"]`).isNotVisible(); + assert.dom(commonSelectors.HREF(newWorkerURL)).isNotVisible(); }); test('saving a new worker with invalid fields displays error messages', async function (assert) { @@ -124,8 +138,13 @@ module('Acceptance | workers | create', function (hooks) { ); }); await visit(newWorkerURL); - await fillIn('[name="worker_auth_registration_request"]', 'token'); - await click('[type="submit"]'); + + await fillIn( + selectors.FIELD_WORKER_AUTH_REGISTRATION, + selectors.FIELD_WORKER_AUTH_REGISTRATION_VALUE, + ); + await click(commonSelectors.SAVE_BTN); + assert .dom(commonSelectors.ALERT_TOAST_BODY) .hasText('rpc error: code = Unknown'); diff --git a/ui/admin/tests/acceptance/workers/delete-test.js b/ui/admin/tests/acceptance/workers/delete-test.js index 27fb38d29..ea9d23c11 100644 --- a/ui/admin/tests/acceptance/workers/delete-test.js +++ b/ui/admin/tests/acceptance/workers/delete-test.js @@ -12,16 +12,13 @@ import { resolve, reject } from 'rsvp'; import sinon from 'sinon'; import { authenticateSession } from 'ember-simple-auth/test-support'; import * as commonSelectors from 'admin/tests/helpers/selectors'; +import * as selectors from './selectors'; module('Acceptance | workers | delete', function (hooks) { setupApplicationTest(hooks); setupMirage(hooks); - const MANAGE_DROPDOWN_TOGGLE = - '[data-test-manage-worker-dropdown] button:first-child'; - const REMOVE_WORKER_BUTTON = - '[data-test-manage-worker-dropdown] div:nth-child(2) button'; - let getWorkerCount; + let getWorkerCount, confirmService; const instances = { scopes: { @@ -47,6 +44,7 @@ module('Acceptance | workers | delete', function (hooks) { urls.worker = `${urls.workers}/${instances.worker.id}`; getWorkerCount = () => this.server.schema.workers.all().models.length; + confirmService = this.owner.lookup('service:confirm'); await authenticateSession({}); }); @@ -54,31 +52,35 @@ module('Acceptance | workers | delete', function (hooks) { test('can delete a worker', async function (assert) { const count = getWorkerCount(); await visit(urls.worker); - await click(MANAGE_DROPDOWN_TOGGLE); - await click(REMOVE_WORKER_BUTTON); + + await click(selectors.MANAGE_DROPDOWN_WORKER); + await click(selectors.MANAGE_DROPDOWN_WORKER_REMOVE); + assert.strictEqual(getWorkerCount(), count - 1); }); test('can accept delete worker via dialog', async function (assert) { - const confirmService = this.owner.lookup('service:confirm'); confirmService.enabled = true; confirmService.confirm = sinon.fake.returns(resolve()); const count = getWorkerCount(); await visit(urls.worker); - await click(MANAGE_DROPDOWN_TOGGLE); - await click(REMOVE_WORKER_BUTTON); + + await click(selectors.MANAGE_DROPDOWN_WORKER); + await click(selectors.MANAGE_DROPDOWN_WORKER_REMOVE); + assert.strictEqual(getWorkerCount(), count - 1); assert.ok(confirmService.confirm.calledOnce); }); test('can cancel delete worker via dialog', async function (assert) { - const confirmService = this.owner.lookup('service:confirm'); confirmService.enabled = true; confirmService.confirm = sinon.fake.returns(reject()); const count = getWorkerCount(); await visit(urls.worker); - await click(MANAGE_DROPDOWN_TOGGLE); - await click(REMOVE_WORKER_BUTTON); + + await click(selectors.MANAGE_DROPDOWN_WORKER); + await click(selectors.MANAGE_DROPDOWN_WORKER_REMOVE); + assert.strictEqual(getWorkerCount(), count); assert.ok(confirmService.confirm.calledOnce); }); @@ -87,8 +89,10 @@ module('Acceptance | workers | delete', function (hooks) { instances.worker.authorized_actions = instances.worker.authorized_actions.filter((item) => item !== 'delete'); await visit(urls.worker); - await click(MANAGE_DROPDOWN_TOGGLE); - assert.dom(REMOVE_WORKER_BUTTON).isNotVisible(); + + await click(selectors.MANAGE_DROPDOWN_WORKER); + + assert.dom(selectors.MANAGE_DROPDOWN_WORKER_REMOVE).isNotVisible(); }); test('deleting a worker which errors displays error messages', async function (assert) { @@ -104,8 +108,10 @@ module('Acceptance | workers | delete', function (hooks) { ); }); await visit(urls.worker); - await click(MANAGE_DROPDOWN_TOGGLE); - await click(REMOVE_WORKER_BUTTON); + + await click(selectors.MANAGE_DROPDOWN_WORKER); + await click(selectors.MANAGE_DROPDOWN_WORKER_REMOVE); + assert.dom(commonSelectors.ALERT_TOAST_BODY).hasText('Oops.'); }); }); diff --git a/ui/admin/tests/acceptance/workers/read-test.js b/ui/admin/tests/acceptance/workers/read-test.js index f76dbdcb6..94eace54a 100644 --- a/ui/admin/tests/acceptance/workers/read-test.js +++ b/ui/admin/tests/acceptance/workers/read-test.js @@ -10,6 +10,7 @@ import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; import { setupIndexedDb } from 'api/test-support/helpers/indexed-db'; import a11yAudit from 'ember-a11y-testing/test-support/audit'; import { authenticateSession } from 'ember-simple-auth/test-support'; +import * as commonSelectors from 'admin/tests/helpers/selectors'; module('Acceptance | workers | read', function (hooks) { setupApplicationTest(hooks); @@ -62,7 +63,7 @@ module('Acceptance | workers | read', function (hooks) { await visit(urls.workers); await a11yAudit(); - await click(`[href="${urls.worker}"]`); + await click(commonSelectors.HREF(urls.worker)); assert.strictEqual(currentURL(), urls.worker); }); @@ -72,19 +73,17 @@ module('Acceptance | workers | read', function (hooks) { instances.worker.authorized_actions.filter((itm) => itm !== 'read'); await visit(urls.globalScope); - await click(`[href="${urls.workers}"]`); + await click(commonSelectors.HREF(urls.workers)); - assert - .dom('.hds-table__tbody .hds-table__tr:nth-child(1) a') - .isNotVisible(); + assert.dom(commonSelectors.TABLE_RESOURCE_LINK(urls.worker)).isNotVisible(); }); test('can navigate to an worker form with proper authorization', async function (assert) { await visit(urls.globalScope); - await click(`[href="${urls.workers}"]`); + await click(commonSelectors.HREF(urls.workers)); - assert.dom('.hds-table__tbody .hds-table__tr:nth-child(1) a').isVisible(); + assert.dom(commonSelectors.TABLE_RESOURCE_LINK(urls.worker)).isVisible(); }); test('users can navigate to worker and incorrect url autocorrects', async function (assert) { diff --git a/ui/admin/tests/acceptance/workers/selectors.js b/ui/admin/tests/acceptance/workers/selectors.js new file mode 100644 index 000000000..00ae77602 --- /dev/null +++ b/ui/admin/tests/acceptance/workers/selectors.js @@ -0,0 +1,17 @@ +/** + * Copyright (c) HashiCorp, Inc. + * SPDX-License-Identifier: BUSL-1.1 + */ + +export const FIELD_WORKER_AUTH_REGISTRATION = + '[name="worker_auth_registration_request"]'; +export const FIELD_WORKER_AUTH_REGISTRATION_VALUE = 'token'; + +export const WORKER_CREATE_SECTION_FORM_LABEL = + '.worker-create-section label.hds-form-label'; +export const WORKER_CREATE_SECTION = '.worker-create-section'; + +export const MANAGE_DROPDOWN_WORKER = + '[data-test-manage-worker-dropdown] button:first-child'; +export const MANAGE_DROPDOWN_WORKER_REMOVE = + '[data-test-manage-worker-dropdown] div:nth-child(2) button'; diff --git a/ui/admin/tests/acceptance/workers/update-test.js b/ui/admin/tests/acceptance/workers/update-test.js index 21553b5c6..305e320ff 100644 --- a/ui/admin/tests/acceptance/workers/update-test.js +++ b/ui/admin/tests/acceptance/workers/update-test.js @@ -4,7 +4,7 @@ */ import { module, test } from 'qunit'; -import { visit, click, find, fillIn } from '@ember/test-helpers'; +import { visit, click, fillIn } from '@ember/test-helpers'; import { setupApplicationTest } from 'admin/tests/helpers'; import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; import { Response } from 'miragejs'; @@ -42,23 +42,31 @@ module('Acceptance | workers | update', function (hooks) { test('can save changes to an existing worker', async function (assert) { await visit(urls.worker); - await click('form [type="button"]', 'Click edit mode'); - await fillIn('[name="name"]', 'Updated worker name'); - await click('.rose-form-actions [type="submit"]'); - assert.dom(`[href="${urls.worker}"]`).isVisible(); - await assert.dom('input[name="name"]').hasValue('Updated worker name'); + + await click(commonSelectors.EDIT_BTN, 'Click edit mode'); + await fillIn(commonSelectors.FIELD_NAME, commonSelectors.FIELD_NAME_VALUE); + await click(commonSelectors.SAVE_BTN); + + assert.dom(commonSelectors.HREF(urls.worker)).isVisible(); + await assert + .dom(commonSelectors.FIELD_NAME) + .hasValue(commonSelectors.FIELD_NAME_VALUE); }); test('can cancel changes to an existing worker', async function (assert) { const name = instances.worker.name; await visit(urls.worker); - await click('form [type="button"]', 'Click edit mode'); - await fillIn('[name="name"]', `Updated Worker Name`); - await click('.rose-form-actions [type="button"]'); - await assert.dom('input[name="name"]').hasValue(`${name}`); + + await click(commonSelectors.EDIT_BTN, 'Click edit mode'); + await fillIn(commonSelectors.FIELD_NAME, commonSelectors.FIELD_NAME_VALUE); + await click(commonSelectors.CANCEL_BTN); + + await assert.dom(commonSelectors.FIELD_NAME).hasValue(`${name}`); }); test('saving an existing worker with invalid fields displays error messages', async function (assert) { + const errorMessage = 'Error in provided request.'; + const errorDescription = 'Must be all lowercase.'; this.server.patch('/workers/:id', () => { return new Response( 400, @@ -66,12 +74,12 @@ module('Acceptance | workers | update', function (hooks) { { status: 400, code: 'invalid_argument', - message: 'The request was invalid.', + message: errorMessage, details: { request_fields: [ { name: 'name', - description: 'Name is required', + description: errorDescription, }, ], }, @@ -79,16 +87,12 @@ module('Acceptance | workers | update', function (hooks) { ); }); await visit(urls.worker); - await click('.rose-form-actions [type="button"]', 'Click edit mode'); - await fillIn('[name="name"]', 'Worker Name'); - await click('[type="submit"]'); - assert - .dom(commonSelectors.ALERT_TOAST_BODY) - .hasText('The request was invalid.'); - assert.strictEqual( - find('[data-test-error-message-name]').textContent.trim(), - 'Name is required', - 'Displays field-level errors.', - ); + + await click(commonSelectors.EDIT_BTN, 'Click edit mode'); + await fillIn(commonSelectors.FIELD_NAME, commonSelectors.FIELD_NAME_VALUE); + await click(commonSelectors.SAVE_BTN); + + assert.dom(commonSelectors.ALERT_TOAST_BODY).hasText(errorMessage); + assert.dom(commonSelectors.FIELD_NAME_ERROR).hasText(errorDescription); }); });