@@ -89,7 +93,11 @@ Manage users
'Send messages'
) }}
{{ tick_cross(
- user.has_permissions(permissions=['manage_users', 'manage_templates', 'manage_settings']),
+ user.has_permissions(permissions=['manage_templates']),
+ 'Edit templates'
+ ) }}
+ {{ tick_cross(
+ user.has_permissions(permissions=['manage_users', 'manage_settings']),
'Manage service'
) }}
{{ tick_cross(
diff --git a/app/templates/views/manage-users/permissions.html b/app/templates/views/manage-users/permissions.html
index 42824f67d..8427a1b2e 100644
--- a/app/templates/views/manage-users/permissions.html
+++ b/app/templates/views/manage-users/permissions.html
@@ -5,6 +5,7 @@
Permissions
{{ checkbox(form.send_messages) }}
+ {{ checkbox(form.manage_templates) }}
{{ checkbox(form.manage_service) }}
{{ checkbox(form.manage_api_keys) }}
diff --git a/tests/app/main/views/test_manage_users.py b/tests/app/main/views/test_manage_users.py
index f62e81423..ce97036f0 100644
--- a/tests/app/main/views/test_manage_users.py
+++ b/tests/app/main/views/test_manage_users.py
@@ -5,32 +5,93 @@ import app
from app.notify_client.models import InvitedUser
from app.utils import is_gov_user
from tests.conftest import service_one as create_sample_service
-
-
-def test_should_show_overview_page(
- logged_in_client,
+from tests.conftest import (
+ normalize_spaces,
+ SERVICE_ONE_ID,
active_user_with_permissions,
+ active_user_view_permissions,
+ active_user_manage_template_permission,
+)
+
+
+@pytest.mark.parametrize('user, expected_text', [
+ (
+ active_user_with_permissions,
+ (
+ 'Test User (you) '
+ 'Can Send messages Can Manage templates Can Manage service Can Access API keys'
+ ),
+ ),
+ (
+ active_user_view_permissions,
+ (
+ 'Test User With Permissions (you) '
+ 'Can’t Send messages Can’t Manage templates Can’t Manage service Can’t Access API keys'
+ ),
+ ),
+ (
+ active_user_manage_template_permission,
+ (
+ 'Test User With Permissions (you) '
+ 'Can’t Send messages Can Manage templates Can’t Manage service Can’t Access API keys'
+ ),
+ ),
+])
+def test_should_show_overview_page(
+ client_request,
mocker,
mock_get_invites_for_service,
+ fake_uuid,
+ user,
+ expected_text,
):
- service = create_sample_service(active_user_with_permissions)
- mocker.patch('app.user_api_client.get_users_for_service', return_value=[active_user_with_permissions])
- response = logged_in_client.get(url_for('main.manage_users', service_id=service['id']))
+ mocker.patch('app.user_api_client.get_users_for_service', return_value=[user(fake_uuid)])
+ page = client_request.get('main.manage_users', service_id=SERVICE_ONE_ID)
- assert 'Team members' in response.get_data(as_text=True)
- assert response.status_code == 200
- app.user_api_client.get_users_for_service.assert_called_once_with(service_id=service['id'])
+ assert normalize_spaces(page.select_one('h1').text) == 'Team members'
+ assert normalize_spaces(page.select_one('.user-list-item').text) == (
+ expected_text
+ )
+ app.user_api_client.get_users_for_service.assert_called_once_with(service_id=SERVICE_ONE_ID)
+@pytest.mark.parametrize('endpoint, extra_args, expected_checkboxes', [
+ (
+ 'main.edit_user_permissions',
+ {'user_id': 0},
+ [
+ ('send_messages', True),
+ ('manage_templates', True),
+ ('manage_service', True),
+ ('manage_api_keys', True),
+ ]
+ ),
+ (
+ 'main.invite_user',
+ {},
+ [
+ ('send_messages', False),
+ ('manage_templates', False),
+ ('manage_service', False),
+ ('manage_api_keys', False),
+ ]
+ ),
+])
def test_should_show_page_for_one_user(
- logged_in_client,
- active_user_with_permissions,
- mocker,
+ client_request,
+ endpoint,
+ extra_args,
+ expected_checkboxes,
):
- service = create_sample_service(active_user_with_permissions)
- response = logged_in_client.get(url_for('main.edit_user_permissions', service_id=service['id'], user_id=0))
+ page = client_request.get(endpoint, service_id=SERVICE_ONE_ID, **extra_args)
+ checkboxes = page.select('input[type=checkbox]')
- assert response.status_code == 200
+ assert len(checkboxes) == 4
+
+ for index, expected in enumerate(expected_checkboxes):
+ expected_input_name, expected_checked = expected
+ assert checkboxes[index]['name'] == expected_input_name
+ assert checkboxes[index].has_attr('checked') == expected_checked
def test_edit_user_permissions(
@@ -45,6 +106,7 @@ def test_edit_user_permissions(
'main.edit_user_permissions', service_id=service['id'], user_id=active_user_with_permissions.id
), data={'email_address': active_user_with_permissions.email_address,
'send_messages': 'y',
+ 'manage_templates': 'y',
'manage_service': 'y',
'manage_api_keys': 'y'})
@@ -141,6 +203,7 @@ def test_invite_user(
url_for('main.invite_user', service_id=service['id']),
data={'email_address': email_address,
'send_messages': 'y',
+ 'manage_templates': 'y',
'manage_service': 'y',
'manage_api_keys': 'y'},
follow_redirects=True
@@ -177,25 +240,24 @@ def test_cancel_invited_user_cancels_user_invitations(
def test_manage_users_shows_invited_user(
- logged_in_client,
+ client_request,
mocker,
active_user_with_permissions,
sample_invite,
):
- service = create_sample_service(active_user_with_permissions)
data = [InvitedUser(**sample_invite)]
mocker.patch('app.invite_api_client.get_invites_for_service', return_value=data)
mocker.patch('app.user_api_client.get_users_for_service', return_value=[active_user_with_permissions])
- response = logged_in_client.get(url_for('main.manage_users', service_id=service['id']))
+ page = client_request.get('main.manage_users', service_id=SERVICE_ONE_ID)
- assert response.status_code == 200
- page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
assert page.h1.string.strip() == 'Team members'
- invited_users_list = page.find_all('div', {'class': 'user-list'})[1]
- assert invited_users_list.find_all('h3')[0].text.strip() == 'invited_user@test.gov.uk'
- assert invited_users_list.find_all('a')[0].text.strip() == 'Cancel invitation'
+ assert normalize_spaces(page.select('.user-list')[1].text) == (
+ 'invited_user@test.gov.uk '
+ 'Can’t Send messages Can’t Edit templates Can’t Manage service Can Access API keys '
+ 'Cancel invitation'
+ )
def test_manage_users_does_not_show_accepted_invite(
diff --git a/tests/conftest.py b/tests/conftest.py
index 1045cec03..1004022dd 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -680,6 +680,29 @@ def active_user_view_permissions(fake_uuid):
return user
+@pytest.fixture
+def active_user_manage_template_permission(fake_uuid):
+ from app.notify_client.user_api_client import User
+
+ user_data = {
+ 'id': fake_uuid,
+ 'name': 'Test User With Permissions',
+ 'password': 'somepassword',
+ 'password_changed_at': str(datetime.utcnow()),
+ 'email_address': 'test@user.gov.uk',
+ 'mobile_number': '07700 900762',
+ 'state': 'active',
+ 'failed_login_count': 0,
+ 'permissions': {SERVICE_ONE_ID: [
+ 'manage_templates',
+ 'view_activity',
+ ]},
+ 'platform_admin': False
+ }
+ user = User(user_data)
+ return user
+
+
@pytest.fixture(scope='function')
def api_user_locked(fake_uuid):
from app.notify_client.user_api_client import User