Merge pull request #1162 from alphagov/fix-user-login-flow

Fix user login flow

tests/app/main/views/test_new_password.py

@@ -38,6 +38,7 @@ def test_should_redirect_to_two_factor_when_password_reset_is_successful(
     mock_get_user_by_email_request_password_reset,
     mock_login,
     mock_send_verify_code,
+    mock_reset_failed_login_count
 ):
     user = mock_get_user_by_email_request_password_reset.return_value
     data = json.dumps({'email': user.email_address, 'created_at': str(datetime.utcnow())})
@@ -54,6 +55,7 @@ def test_should_redirect_index_if_user_has_already_changed_password(
     mock_get_user_by_email_user_changed_password,
     mock_login,
     mock_send_verify_code,
+    mock_reset_failed_login_count
 ):
     user = mock_get_user_by_email_user_changed_password.return_value
     data = json.dumps({'email': user.email_address, 'created_at': str(datetime.utcnow())})

tests/app/main/views/test_two_factor.py

@@ -187,7 +187,7 @@ def test_two_factor_returns_error_when_user_is_locked(
     client,
     api_user_locked,
     mock_get_locked_user,
-    mock_check_verify_code,
+    mock_check_verify_code_code_not_found,
     mock_get_services_with_one_service
 ):
     with client.session_transaction() as session:

tests/conftest.py

@@ -1377,6 +1377,11 @@ def mock_update_whitelist(mocker):
     )
 
 
+@pytest.fixture(scope='function')
+def mock_reset_failed_login_count(mocker):
+    return mocker.patch('app.user_api_client.reset_failed_login_count')
+
+
 @pytest.fixture(scope='function')
 def client(app_):
     with app_.test_request_context(), app_.test_client() as client: