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

remove all instances of db style permissions

Browse Source 
lots of renaming of send_texts/emails/letters to send_messages, and
manage_settings/users to manage_service
This commit is contained in:
Leo Hemsted
2018-02-28 17:22:20 +00:00
parent 17061e0d06
commit 09824078dd
24 changed files with 108 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/app/main/test_permissions.py
View File

@@ -43,7 +43,7 @@ def test_user_has_permissions_on_endpoint_fail(
_test_permissions(
client,
user,
['send_texts'],
['send_messages'],
'',
False)
@@ -57,7 +57,7 @@ def test_user_has_permissions_success(
_test_permissions(
client,
user,
['manage_users'],
['manage_service'],
'',
True)
@@ -71,7 +71,7 @@ def test_user_has_permissions_or(
_test_permissions(
client,
user,
['send_texts', 'manage_users'],
['send_messages', 'manage_service'],
'',
True,
any_=True)
@@ -86,7 +86,7 @@ def test_user_has_permissions_multiple(
_test_permissions(
client,
user,
['manage_templates', 'manage_users'],
['manage_templates', 'manage_service'],
'',
will_succeed=True)
@@ -100,7 +100,7 @@ def test_exact_permissions(
_test_permissions(
client,
user,
['manage_users', 'manage_templates', 'manage_settings'],
['manage_service', 'manage_templates'],
'',
True)

4
tests/app/main/views/test_dashboard.py
View File

@@ -778,7 +778,7 @@ def test_menu_send_messages(
app_,
api_user_active,
service_one,
['view_activity', 'send_texts', 'send_emails', 'send_letters'])
['view_activity', 'send_messages'])
page = resp.get_data(as_text=True)
assert url_for(
'main.choose_template',
@@ -810,7 +810,7 @@ def test_menu_manage_service(
app_,
api_user_active,
service_one,
['view_activity', 'manage_users', 'manage_templates', 'manage_settings'])
['view_activity', 'manage_templates', 'manage_service'])
page = resp.get_data(as_text=True)
assert url_for(
'main.choose_template',

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

@@ -248,12 +248,9 @@ def test_edit_user_permissions(
str(active_user_with_permissions.id),
service['id'],
permissions={
'send_texts',
'send_emails',
'send_letters',
'manage_users',
'send_messages',
'manage_service',
'manage_templates',
'manage_settings',
'manage_api_keys',
'view_activity'
}
@@ -289,9 +286,7 @@ def test_edit_some_user_permissions(
str(active_user_with_permissions.id),
service_id,
permissions={
'send_texts',
'send_emails',
'send_letters',
'send_messages',
'view_activity'
}
)
@@ -330,12 +325,9 @@ def test_edit_user_permissions_including_authentication_with_email_auth_service(
str(active_user_with_permissions.id),
service_one['id'],
permissions={
'send_texts',
'send_emails',
'send_letters',
'manage_users',
'send_messages',
'manage_templates',
'manage_settings',
'manage_service',
'manage_api_keys',
'view_activity'
}
@@ -399,7 +391,7 @@ def test_invite_user(
flash_banner = page.find('div', class_='banner-default-with-tick').string.strip()
assert flash_banner == 'Invite sent to test@example.gov.uk'
expected_permissions = 'manage_api_keys,manage_settings,manage_templates,manage_users,send_emails,send_letters,send_texts,view_activity' # noqa
expected_permissions = {'manage_api_keys', 'manage_service', 'manage_templates', 'send_messages', 'view_activity'}
app.invite_api_client.create_invite.assert_called_once_with(sample_invite['from_user'],
sample_invite['service'],
@@ -451,7 +443,7 @@ def test_invite_user_with_email_auth_service(
flash_banner = page.find('div', class_='banner-default-with-tick').string.strip()
assert flash_banner == 'Invite sent to test@example.gov.uk'
expected_permissions = 'manage_api_keys,manage_settings,manage_templates,manage_users,send_emails,send_letters,send_texts,view_activity' # noqa
expected_permissions = {'manage_api_keys', 'manage_service', 'manage_templates', 'send_messages', 'view_activity'}
app.invite_api_client.create_invite.assert_called_once_with(sample_invite['from_user'],
sample_invite['service'],
@@ -479,12 +471,19 @@ def test_cancel_invited_user_cancels_user_invitations(
@pytest.mark.parametrize('invite_status, expected_text', [
('pending', (
'invited_user@test.gov.uk (invited) '
'Can’t Send messages Can’t Add and edit templates Can’t Manage service Can Access API keys '
'Can Send messages '
'Can’t Add and edit templates '
'Can Manage service '
'Can Access API keys '
'Cancel invitation'
)),
('cancelled', (
'invited_user@test.gov.uk (cancelled invite) '
'Can’t Send messages Can’t Add and edit templates Can’t Manage service Can’t Access API keys'
# all permissions are greyed out
'Can’t Send messages '
'Can’t Add and edit templates '
'Can’t Manage service '
'Can’t Access API keys'
)),
])
def test_manage_users_shows_invited_user(

4
tests/app/main/views/test_send.py
View File

@@ -1752,7 +1752,7 @@ def test_route_permissions(
service_id=service_one['id'],
template_id=fake_uuid
),
['view_activity', 'send_texts', 'send_emails', 'send_letters'],
['view_activity', 'send_messages'],
api_user_active,
service_one)
@@ -1787,7 +1787,7 @@ def test_route_permissions_send_check_notifications(
service_id=service_one['id'],
template_id=fake_uuid
),
['send_texts', 'send_emails', 'send_letters'],
['send_messages'],
api_user_active,
service_one
)

2
tests/app/main/views/test_service_settings.py
View File

@@ -571,7 +571,7 @@ def test_route_permissions(
"GET",
200,
url_for(route, service_id=service_one['id']),
['manage_settings'],
['manage_service'],
api_user_active,
service_one)

4
tests/app/main/views/test_templates.py
View File

@@ -120,11 +120,11 @@ def test_should_show_page_for_one_template(
['.edit_service_template']
),
(
['send_texts', 'send_emails', 'send_letters'],
['send_messages'],
['.send_messages', '.set_sender']
),
(
['send_texts', 'send_emails', 'send_letters', 'manage_templates'],
['send_messages', 'manage_templates'],
['.send_messages', '.set_sender', '.edit_service_template']
),
])

4
tests/app/notify_client/test_invite_client.py
View File

@@ -21,7 +21,7 @@ def test_client_creates_invite(
)
invite_api_client.create_invite(
'12345', '67890', 'test@example.com', 'send_messages', 'sms_auth'
'12345', '67890', 'test@example.com', {'send_messages'}, 'sms_auth'
)
mock_post.assert_called_once_with(
@@ -32,7 +32,7 @@ def test_client_creates_invite(
'from_user': '12345',
'service': '67890',
'created_by': ANY,
'permissions': 'send_messages',
'permissions': 'send_emails,send_letters,send_texts',
'invite_link_host': 'http://localhost:6012',
}
)

6
tests/app/notify_client/test_user_client.py
View File

@@ -40,8 +40,8 @@ def test_client_returns_count_of_users_with_manage_service(
mock_get_users = mocker.patch(
'app.notify_client.user_api_client.UserApiClient.get_users_for_service',
return_value=[
_service_one_user_with_permissions('manage_settings', 'view_activity'),
_service_one_user_with_permissions('manage_settings'),
_service_one_user_with_permissions('manage_service', 'view_activity'),
_service_one_user_with_permissions('manage_service'),
_service_one_user_with_permissions('view_activity'),
_service_one_user_with_permissions('manage_templates'),
]
@@ -54,7 +54,7 @@ def test_client_returns_count_of_users_with_manage_service(
assert user_api_client.get_count_of_users_with_permission(
SERVICE_ONE_ID,
'manage_settings'
'manage_service'
) == 2
assert user_api_client.get_count_of_users_with_permission(