darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-20 22:40:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

A few clean-up items in the Platform Admin section

Browse Source
This commit is contained in:
Jonathan Bobel
2023-08-18 11:30:30 -04:00
parent cc0e0a90f0
commit 51fde90f79
20 changed files with 40 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/app/main/views/test_manage_users.py
View File

@@ -25,6 +25,7 @@ from tests.conftest import (
create_active_user_with_permissions(),
(
'Test User (you) '
'Permissions '
'Can See dashboard '
'Can Send messages '
'Can Add and edit templates '
@@ -33,6 +34,7 @@ from tests.conftest import (
),
(
'ZZZZZZZZ zzzzzzz@example.gsa.gov '
'Permissions '
'Can See dashboard '
'Cannot Send messages '
'Cannot Add and edit templates '
@@ -45,6 +47,7 @@ from tests.conftest import (
create_active_user_empty_permissions(),
(
'Test User With Empty Permissions (you) '
'Permissions '
'Cannot See dashboard '
'Cannot Send messages '
'Cannot Add and edit templates '
@@ -53,6 +56,7 @@ from tests.conftest import (
),
(
'ZZZZZZZZ zzzzzzz@example.gsa.gov '
'Permissions '
'Can See dashboard '
'Cannot Send messages '
'Cannot Add and edit templates '
@@ -64,6 +68,7 @@ from tests.conftest import (
create_active_user_view_permissions(),
(
'Test User With Permissions (you) '
'Permissions '
'Can See dashboard '
'Cannot Send messages '
'Cannot Add and edit templates '
@@ -72,6 +77,7 @@ from tests.conftest import (
),
(
'ZZZZZZZZ zzzzzzz@example.gsa.gov '
'Permissions '
'Can See dashboard '
'Cannot Send messages '
'Cannot Add and edit templates '
@@ -83,6 +89,7 @@ from tests.conftest import (
create_active_user_manage_template_permissions(),
(
'Test User With Permissions (you) '
'Permissions '
'Can See dashboard '
'Cannot Send messages '
'Can Add and edit templates '
@@ -91,6 +98,7 @@ from tests.conftest import (
),
(
'ZZZZZZZZ zzzzzzz@example.gsa.gov '
'Permissions '
'Can See dashboard '
'Cannot Send messages '
'Cannot Add and edit templates '
@@ -102,6 +110,7 @@ from tests.conftest import (
create_active_user_manage_template_permissions(),
(
'Test User With Permissions (you) '
'Permissions '
'Can See dashboard '
'Cannot Send messages '
'Can Add and edit templates '
@@ -110,6 +119,7 @@ from tests.conftest import (
),
(
'ZZZZZZZZ zzzzzzz@example.gsa.gov '
'Permissions '
'Can See dashboard '
'Cannot Send messages '
'Cannot Add and edit templates '
@@ -267,6 +277,7 @@ def test_should_show_caseworker_on_overview_page(
assert normalize_spaces(page.select_one('h1').text) == 'Team members'
assert normalize_spaces(page.select('.user-list-item')[0].text) == (
'Test User With Permissions (you) '
'Permissions '
'Can See dashboard '
'Cannot Send messages '
'Cannot Add and edit templates '
@@ -276,6 +287,7 @@ def test_should_show_caseworker_on_overview_page(
# [1:5] are invited users
assert normalize_spaces(page.select('.user-list-item')[6].text) == (
'Test User zzzzzzz@example.gsa.gov '
'Permissions '
'Cannot See dashboard '
'Can Send messages '
'Cannot Add and edit templates '
@@ -1154,6 +1166,7 @@ def test_cancel_invited_user_doesnt_work_if_user_not_invited_to_this_service(
@pytest.mark.parametrize('invite_status, expected_text', [
('pending', (
'invited_user@test.gsa.gov (invited) '
'Permissions '
'Can See dashboard '
'Can Send messages '
'Cannot Add and edit templates '
@@ -1163,6 +1176,7 @@ def test_cancel_invited_user_doesnt_work_if_user_not_invited_to_this_service(
)),
('cancelled', (
'invited_user@test.gsa.gov (cancelled invite) '
'Permissions '
# all permissions are greyed out
'Cannot See dashboard '
'Cannot Send messages '

6
tests/javascripts/collapsibleCheckboxes.test.js
View File

@@ -41,7 +41,7 @@ describe('Collapsible fieldset', () => {
// set up DOM
document.body.innerHTML =
`<div class="selection-wrapper" data-module="collapsible-checkboxes" data-field-label="folder">
<div class="govuk-form-group">
<div class="usa-form-group">
<fieldset class="govuk-fieldset" id="folder_permissions" aria-describedby="users_with_permission-hint">
<legend class="govuk-fieldset__legend govuk-fieldset__legend--s">
Folders this team member can see
@@ -57,7 +57,7 @@ describe('Collapsible fieldset', () => {
</div>`;
wrapper = document.querySelector('.selection-wrapper');
formGroup = wrapper.querySelector('.govuk-form-group');
formGroup = wrapper.querySelector('.usa-form-group');
fieldset = formGroup.querySelector('fieldset');
checkboxesContainer = fieldset.querySelector('.govuk-checkboxes');
checkboxes = checkboxesContainer.querySelectorAll('input[type=checkbox]');
@@ -321,7 +321,7 @@ describe('Collapsible fieldset', () => {
// add a nested list of checkboxes to the first checkbox item
const nestedCheckboxes = document.createElement('div');
nestedCheckboxes.className = 'govuk-form-group govuk-form-group--nested';
nestedCheckboxes.className = 'usa-form-group usa-form-group--nested';
nestedCheckboxes.innerHTML = _checkboxes(11, 20);
checkboxesContainer.querySelector('.govuk-checkboxes__item').appendChild(nestedCheckboxes);

4
tests/javascripts/colourPreview.test.js
View File

@@ -18,14 +18,14 @@ describe('Colour preview', () => {
// set up DOM
document.body.innerHTML = `
<div class="govuk-form-group">
<div class="usa-form-group">
<label class="govuk-form-label" for="colour">
Colour
</label>
<input class="govuk-input govuk-input--width-6" id="colour" name="colour" rows="8" type="text" value="" data-module="colour-preview">
</div>`;
field = document.querySelector('.govuk-form-group');
field = document.querySelector('.usa-form-group');
textbox = document.querySelector('input[type=text]');
});

4
tests/javascripts/listEntry.test.js
View File

@@ -49,7 +49,7 @@ describe("List entry", () => {
for (let idx = 0; idx < 10; idx++) {
result += `
<div class="list-entry">
<div class="govuk-form-group">
<div class="usa-form-group">
<label for="domains-${idx + 1}" class="govuk-label govuk-input--numbered__label">
<span class="usa-sr-only">domain number </span>${idx + 1}.
</label>
@@ -62,7 +62,7 @@ describe("List entry", () => {
};
document.body.innerHTML =
`<fieldset class="govuk-form-group" aria-describedby="domains-hint">
`<fieldset class="usa-form-group" aria-describedby="domains-hint">
<legend class="govuk-fieldset__legend">
Domain names
</span>

2
tests/javascripts/support/helpers/html.js
View File

@@ -20,7 +20,7 @@ function getRadios (fields, name) {
function getRadioGroup (data) {
let radioGroup = document.createElement('div');
radioGroup.classList.add('govuk-form-group');
radioGroup.classList.add('usa-form-group');
if ('cssClasses' in data) {
data.cssClasses.forEach(cssClass => radioGroup.classList.add(cssClass));
}

4
tests/javascripts/templateFolderForm.test.js
View File

@@ -52,7 +52,7 @@ function setFixtures (hierarchy, newTemplateDataModules = "") {
</div>
<div id="move_to_new_folder_form" class="sticky-template-form" role="region" aria-label="Enter name of the new folder to move selected items to">
<div class="js-will-stick-at-bottom-when-scrolling">
<div class="govuk-form-group">
<div class="usa-form-group">
<label class="govuk-label" for="move_to_new_folder_name">
Folder name
</label>
@@ -65,7 +65,7 @@ function setFixtures (hierarchy, newTemplateDataModules = "") {
</div>
<div id="add_new_folder_form" class="sticky-template-form" role="region" aria-label="Enter name of the new folder">
<div class="js-will-stick-at-bottom-when-scrolling">
<div class="govuk-form-group">
<div class="usa-form-group">
<label class="govuk-label" for="add_new_folder_name">
Folder name
</label>