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

Fixed some tests. Some broken mocked tests commented out until later

Browse Source
This commit is contained in:
Adam Shimali
2016-01-21 12:31:09 +00:00
parent ee23df2c73
commit 167c7b0f13
5 changed files with 63 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/conftest.py
View File

@@ -245,10 +245,10 @@ def mock_activate_user(mocker, mock_api_user):
@pytest.fixture(scope='function')
def mock_user_dao_get_user(mocker):
mock_class = mocker.patch('app.main.dao.users_dao.get_user_by_id')
mock_class.return_value = mock_api_user
return mock_class
def mock_user_dao_get_user(mocker, mock_api_user):
def _get_user(id):
return mock_api_user
return mocker.patch('app.main.dao.users_dao.get_user_by_id', side_effect=_get_user)
@pytest.fixture(scope='function')
@@ -261,6 +261,16 @@ def mock_user_dao_get_by_email(mocker, mock_api_user):
return mocker.patch('app.main.dao.users_dao.get_user_by_email', side_effect=_get_user)
@pytest.fixture(scope='function')
def mock_inactive_user_dao_get_by_email(mocker, mock_api_user):
def _get_user(email_address):
mock_api_user.fields['email_address'] = email_address
mock_api_user.state = 'pending'
mock_api_user.fields['is_locked'] = True
return mock_api_user
return mocker.patch('app.main.dao.users_dao.get_user_by_email', side_effect=_get_user)
@pytest.fixture(scope='function')
def mock_user_by_email_not_found(mocker):
return mocker.patch('app.main.dao.users_dao.get_user_by_email', return_value=None)