darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-03 01:41:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into invitation

Browse Source 
Conflicts:
	scripts/run_celery.sh
This commit is contained in:
Rebecca Law
2016-02-29 16:14:35 +00:00
parent 9f6255ac94 4b068b9c18
commit 6f338f17ac
17 changed files with 309 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/app/invite/test_invite_rest.py
View File

@@ -19,7 +19,8 @@ def test_create_invited_user(notify_api, sample_service, mocker):
data = {
'service': str(sample_service.id),
'email_address': email_address,
'from_user': invite_from.id
'from_user': invite_from.id,
'permissions': 'send_messages,manage_service,manage_api_keys'
}
data = json.dumps(data)
@@ -41,6 +42,7 @@ def test_create_invited_user(notify_api, sample_service, mocker):
assert json_resp['data']['service'] == str(sample_service.id)
assert json_resp['data']['email_address'] == email_address
assert json_resp['data']['from_user'] == invite_from.id
assert json_resp['data']['permissions'] == 'send_messages,manage_service,manage_api_keys'
assert json_resp['data']['id']
invitation_expiration_days = notify_api.config['INVITATION_EXPIRATION_DAYS']
expiry_date = (datetime.now() + timedelta(days=invitation_expiration_days)).replace(hour=0, minute=0,
@@ -68,7 +70,8 @@ def test_create_invited_user_invalid_email(notify_api, sample_service, mocker):
data = {
'service': str(sample_service.id),
'email_address': email_address,
'from_user': invite_from.id
'from_user': invite_from.id,
'permissions': 'send_messages,manage_service,manage_api_keys'
}
data = json.dumps(data)