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

Merge branch 'master' into primary-provider

Browse Source 
Conflicts:
	tests/app/dao/test_provider_rates_dao.py
This commit is contained in:
Martyn Inglis
2016-05-11 14:04:15 +01:00
parent 42c42bfdc9 ba874cfd43
commit 09b3313ce3
15 changed files with 61 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/app/celery/test_tasks.py
View File

@@ -813,7 +813,7 @@ def test_email_invited_user_should_send_email(notify_api, mocker):
'service_id': '123123',
'service_name': 'Blacksmith Service',
'token': 'the-token',
'expiry_date': str(datetime.now() + timedelta(days=1))
'expiry_date': str(datetime.utcnow() + timedelta(days=1))
}
mocker.patch('app.aws_ses_client.send_email')