Failed login count set to zero with password reset.

This commit is contained in:
Nicholas Staples
2016-04-26 11:51:34 +01:00
parent a554d06c1d
commit 3122500ce0
4 changed files with 53 additions and 6 deletions

View File

@@ -406,14 +406,22 @@ def mock_register_user(mocker, api_user_pending):
@pytest.fixture(scope='function')
def mock_get_user(mocker, api_user_active):
def mock_get_user(mocker, user=None):
if user is None:
user = api_user_active(fake_uuid())
def _get_user(id_):
api_user_active.id = id_
return api_user_active
user.id = id_
return user
return mocker.patch(
'app.user_api_client.get_user', side_effect=_get_user)
@pytest.fixture(scope='function')
def mock_get_locked_user(mocker, api_user_locked):
return mock_get_user(mocker, user=api_user_locked)
@pytest.fixture(scope='function')
def mock_get_user_locked(mocker, api_user_locked):
return mocker.patch(
@@ -427,14 +435,21 @@ def mock_get_user_pending(mocker, api_user_pending):
@pytest.fixture(scope='function')
def mock_get_user_by_email(mocker, api_user_active):
def mock_get_user_by_email(mocker, user=None):
if user is None:
user = api_user_active(fake_uuid())
def _get_user(email_address):
api_user_active._email_address = email_address
return api_user_active
user._email_address = email_address
return user
return mocker.patch('app.user_api_client.get_user_by_email', side_effect=_get_user)
@pytest.fixture(scope='function')
def mock_get_locked_user_by_email(mocker, api_user_locked):
return mock_get_user_by_email(mocker, user=api_user_locked)
@pytest.fixture(scope='function')
def mock_get_user_with_permissions(mocker, api_user_active):
def _get_user(id):