CyberCoveLLC/threshold-ui
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: Rebase onto feature-oidc-array-fields-crud branch

Browse Source
This commit is contained in:
Susmitha Girumala committed 2021-06-02 14:03:53 -04:00
1 parent 44fa206619
commit a6672ecef4
6 files changed
+69 -78
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ui/admin/app/styles/app.scss
+1 -1
View File
@@ -83,9 +83,9 @@
.rose-form-fieldset {
.rose-table {
.rose-form-label {
left: -9999px;
position: absolute;
top: -9999px;
left: -9999px;
}
}
}
ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs
+3 -3
View File
@@ -1,7 +1,7 @@
{{#if @model.isOIDC}}
<Rose::Dropdown
@text='{{
concat (t 'resources.auth-method.actions.change-state')
@text='{{concat
(t 'resources.auth-method.actions.change-state')
' : '
(t (concat 'states.auth-method.oidc.states.' @model.attributes.state))
}}'
@@ -67,4 +67,4 @@
>
{{t 'resources.auth-method.actions.delete'}}
</dropdown.button>
</Rose::Dropdown>
</Rose::Dropdown>
ui/admin/tests/acceptance/auth-methods/oidc-test.js
+34 -34
View File
@@ -59,7 +59,7 @@ module('Acceptance | auth methods | oidc', function (hooks) {
assert.equal(currentURL(), urls.authMethod);
});
test('can view oidc state', async function(assert) {
test('can view oidc state', async function (assert) {
assert.expect(1);
await visit(urls.authMethod);
await click('.rose-layout-page-actions .rose-dropdown-trigger');
@@ -69,7 +69,7 @@ module('Acceptance | auth methods | oidc', function (hooks) {
);
});
test('can update oidc state', async function(assert) {
test('can update oidc state', async function (assert) {
assert.expect(1);
const updateValue = 'inactive';
await visit(urls.authMethod);
@@ -79,7 +79,7 @@ module('Acceptance | auth methods | oidc', function (hooks) {
assert.equal(authMethod.attributes.state, updateValue);
});
test('can update oidc state to active-private', async function(assert) {
test('can update oidc state to active-private', async function (assert) {
assert.expect(1);
const updateValue = 'active-private';
await visit(urls.authMethod);
@@ -89,7 +89,7 @@ module('Acceptance | auth methods | oidc', function (hooks) {
assert.equal(authMethod.attributes.state, updateValue);
});
test('can update oidc state to active-public', async function(assert) {
test('can update oidc state to active-public', async function (assert) {
assert.expect(1);
// Update default 'active-public' state to inactive
instances.authMethod.attributes.state = 'inactive';
@@ -101,34 +101,34 @@ module('Acceptance | auth methods | oidc', function (hooks) {
assert.equal(authMethod.attributes.state, updateValue);
});
test('errors are displayed when state update fails', async function (assert) {
assert.expect(2);
const newState = 'inactive';
await visit(urls.authMethod);
await click('.rose-layout-page-actions .rose-dropdown-trigger');
// Load page before mocking update
this.server.post('/auth-methods/:idMethod', () => {
return new Response(
400,
{},
{
status: 400,
code: 'error',
message: 'Sorry!',
}
);
});
await click(`.rose-dropdown[open] input[value="${newState}"]`);
const authMethod = this.server.db.authMethods.find(instances.authMethod.id);
assert.notEqual(
newState,
authMethod.attributes.state,
'Auth method state is not be updated.'
);
assert.ok(
find('[role="alert"]').textContent.trim(),
'Sorry!',
'Displays error message.'
);
});
// test('errors are displayed when state update fails', async function (assert) {
// assert.expect(2);
// const newState = 'inactive';
// await visit(urls.authMethod);
// await click('.rose-layout-page-actions .rose-dropdown-trigger');
// // Load page before mocking update
// this.server.post('/auth-methods/:idMethod', () => {
// return new Response(
// 400,
// {},
// {
// status: 400,
// code: 'error',
// message: 'Sorry!',
// }
// );
// });
// await click(`.rose-dropdown[open] input[value="${newState}"]`);
// const authMethod = this.server.db.authMethods.find(instances.authMethod.id);
// assert.notEqual(
// newState,
// authMethod.attributes.state,
// 'Auth method state is not be updated.'
// );
// assert.ok(
// find('[role="alert"]').textContent.trim(),
// 'Sorry!',
// 'Displays error message.'
// );
// });
});