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

Merge branch 'master' into email-templates

Browse Source 
Conflicts:
	app/user/rest.py
This commit is contained in:
Martyn Inglis
2016-02-19 17:33:28 +00:00
parent 98314485d3 9ea2acfdae
commit cc720b137f
14 changed files with 196 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/app/conftest.py
View File

@@ -210,3 +210,18 @@ def sample_notification(notify_db,
notification = Notification(**data)
save_notification(notification)
return notification
@pytest.fixture(scope='function')
def mock_celery_send_sms_code(mocker):
return mocker.patch('app.celery.tasks.send_sms_code.apply_async')
@pytest.fixture(scope='function')
def mock_celery_send_email_code(mocker):
return mocker.patch('app.celery.tasks.send_email_code.apply_async')
@pytest.fixture(scope='function')
def mock_encryption(mocker):
return mocker.patch('app.encryption.encrypt', return_value="something_encrypted")