Merge branch 'master' into remove_email_safe

This commit is contained in:
Rebecca Law
2016-04-01 13:45:21 +01:00
9 changed files with 385 additions and 31 deletions

View File

@@ -335,6 +335,11 @@ def mock_celery_email_registration_verification(mocker):
return mocker.patch('app.celery.tasks.email_registration_verification.apply_async')
@pytest.fixture(scope='function')
def mock_celery_send_email(mocker):
return mocker.patch('app.celery.tasks.send_email.apply_async')
@pytest.fixture(scope='function')
def mock_encryption(mocker):
return mocker.patch('app.encryption.encrypt', return_value="something_encrypted")