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

Fixed some tests.

Browse Source
This commit is contained in:
Nicholas Staples
2016-02-29 18:32:25 +00:00
parent 5aa2243e81
commit 47ac0b8a98
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/dao/permissions_dao.py
View File

@@ -8,8 +8,16 @@ manage_service = 'manage_service'
send_messages = 'send_messages' send_messages = 'send_messages'
manage_api_keys = 'manage_api_keys' manage_api_keys = 'manage_api_keys'
manage_templates = 'manage_templates' manage_templates = 'manage_templates'
manage_team = 'manage_team'
view_activity = 'view_activity'
# Default permissions for a service # Default permissions for a service
default_service_permissions = [manage_service, send_messages, manage_api_keys, manage_templates] default_service_permissions = [
manage_service,
send_messages,
manage_api_keys,
manage_templates,
manage_team,
view_activity]
class PermissionDAO(DAOClass): class PermissionDAO(DAOClass):

12
tests/app/user/test_rest.py
View File

@@ -31,7 +31,8 @@ def test_get_user_list(notify_api, notify_db, notify_db_session, sample_user, sa
"failed_login_count": 0, "failed_login_count": 0,
"permissions": { "permissions": {
str(sample_admin_service_id): [ str(sample_admin_service_id): [
'manage_service', 'send_messages', 'manage_api_keys', 'manage_templates']} 'manage_service', 'send_messages', 'manage_api_keys', 'manage_templates',
'manage_team', 'view_activity']}
} }
print(json_resp['data']) print(json_resp['data'])
assert expected in json_resp['data'] assert expected in json_resp['data']
@@ -62,7 +63,8 @@ def test_get_user(notify_api, notify_db, notify_db_session, sample_user, sample_
"failed_login_count": 0, "failed_login_count": 0,
"permissions": { "permissions": {
str(sample_admin_service_id): [ str(sample_admin_service_id): [
'manage_service', 'send_messages', 'manage_api_keys', 'manage_templates']} 'manage_service', 'send_messages', 'manage_api_keys', 'manage_templates',
'manage_team', 'view_activity']}
} }
assert json_resp['data'] == expected assert json_resp['data'] == expected
@@ -203,7 +205,8 @@ def test_put_user(notify_api, notify_db, notify_db_session, sample_user, sample_
"failed_login_count": 0, "failed_login_count": 0,
"permissions": { "permissions": {
str(sample_admin_service_id): [ str(sample_admin_service_id): [
'manage_service', 'send_messages', 'manage_api_keys', 'manage_templates']} 'manage_service', 'send_messages', 'manage_api_keys', 'manage_templates',
'manage_team', 'view_activity']}
} }
assert json_resp['data'] == expected assert json_resp['data'] == expected
assert json_resp['data']['email_address'] == new_email assert json_resp['data']['email_address'] == new_email
@@ -303,7 +306,8 @@ def test_get_user_by_email(notify_api, notify_db, notify_db_session, sample_user
"failed_login_count": 0, "failed_login_count": 0,
"permissions": { "permissions": {
str(sample_admin_service_id): [ str(sample_admin_service_id): [
'manage_service', 'send_messages', 'manage_api_keys', 'manage_templates']} 'manage_service', 'send_messages', 'manage_api_keys', 'manage_templates',
'manage_team', 'view_activity']}
} }
assert json_resp['data'] == expected assert json_resp['data'] == expected