Merging conflict with two_factor.py

Fixed merge mistake with two_factor.py.

tests/__init__.py

@@ -62,13 +62,6 @@ def invite_json(id, from_user, service_id, email_address, permissions, created_a
 TEST_USER_EMAIL = 'test@user.gov.uk'
 
 
-def create_test_user(state):
-    from app.main.dao import users_dao
-    user = None
-    users_dao.insert_user(user)
-    return user
-
-
 def create_test_api_user(state, permissions={}):
     from app.notify_client.user_api_client import User
     user_data = {'id': 1,
@@ -83,18 +76,6 @@ def create_test_api_user(state, permissions={}):
     return user
 
 
-def create_another_test_user(state):
-    from app.main.dao import users_dao
-    user = None
-    users_dao.insert_user(user)
-    return user
-
-
-def get_test_user():
-    from app.main.dao import users_dao
-    return users_dao.get_user_by_email(TEST_USER_EMAIL)
-
-
 def job_json():
     import uuid
     import datetime

tests/app/main/test_two_factor_form.py

@@ -1,15 +1,14 @@
 from datetime import datetime, timedelta
 
 from app.main.forms import TwoFactorForm
-from app.main.dao import users_dao
-from tests import create_test_user
+from app import user_api_client
 
 
 def test_form_is_valid_returns_no_errors(app_, mock_check_verify_code):
     with app_.test_request_context(method='POST',
                                    data={'sms_code': '12345'}) as req:
         def _check_code(code):
-            return users_dao.check_verify_code('1', code, "sms")
+            return user_api_client.check_verify_code('1', code, "sms")
         form = TwoFactorForm(_check_code)
         assert form.validate() is True
         assert len(form.errors) == 0
@@ -19,7 +18,7 @@ def test_returns_errors_when_code_is_too_short(app_, mock_check_verify_code):
     with app_.test_request_context(method='POST',
                                    data={'sms_code': '145'}) as req:
         def _check_code(code):
-            return users_dao.check_verify_code('1', code, "sms")
+            return user_api_client.check_verify_code('1', code, "sms")
         form = TwoFactorForm(_check_code)
         assert form.validate() is False
         assert len(form.errors) == 1
@@ -30,7 +29,7 @@ def test_returns_errors_when_code_is_missing(app_, mock_check_verify_code):
     with app_.test_request_context(method='POST',
                                    data={}) as req:
         def _check_code(code):
-            return users_dao.check_verify_code('1', code, "sms")
+            return user_api_client.check_verify_code('1', code, "sms")
         form = TwoFactorForm(_check_code)
         assert form.validate() is False
         assert len(form.errors) == 1
@@ -41,7 +40,7 @@ def test_returns_errors_when_code_contains_letters(app_, mock_check_verify_code)
     with app_.test_request_context(method='POST',
                                    data={'sms_code': 'asdfg'}) as req:
         def _check_code(code):
-            return users_dao.check_verify_code('1', code, "sms")
+            return user_api_client.check_verify_code('1', code, "sms")
         form = TwoFactorForm(_check_code)
         assert form.validate() is False
         assert len(form.errors) == 1
@@ -53,7 +52,7 @@ def test_should_return_errors_when_code_is_expired(app_,
     with app_.test_request_context(method='POST',
                                    data={'sms_code': '23456'}) as req:
         def _check_code(code):
-            return users_dao.check_verify_code('1', code, "sms")
+            return user_api_client.check_verify_code('1', code, "sms")
         form = TwoFactorForm(_check_code)
         assert form.validate() is False
         errors = form.errors

tests/app/main/test_validators.py

@@ -1,4 +1,3 @@
-from app.main.dao import users_dao
 from app.main.forms import RegisterUserForm
 
 

tests/app/main/views/test_choose_services.py

@@ -1,4 +1,3 @@
-from tests import create_test_user
 from flask import url_for
 import pytest
 

tests/conftest.py

@@ -456,8 +456,15 @@ def mock_get_user_by_email_pending(mocker, api_user_pending):
 
 
 @pytest.fixture(scope='function')
-def mock_get_user_by_email_not_found(mocker):
-    return mocker.patch('app.user_api_client.get_user_by_email', return_value=None)
+def mock_get_user_by_email_not_found(mocker, api_user_active):
+    def _get_user(email):
+        json_mock = Mock(return_value={'message': "Not found", 'result': 'error'})
+        resp_mock = Mock(status_code=404, json=json_mock)
+        http_error = HTTPError(response=resp_mock, message="Default message")
+        raise http_error
+    return mocker.patch(
+        'app.user_api_client.get_user_by_email',
+        side_effect=_get_user)
 
 
 @pytest.fixture(scope='function')
@@ -489,7 +496,7 @@ def mock_is_email_not_unique(mocker):
 
 @pytest.fixture(scope='function')
 def mock_get_all_users_from_api(mocker):
-    return mocker.patch('app.main.dao.users_dao.user_api_client.get_users')
+    return mocker.patch('app.user_api_client.get_users', return_value={'data': []})
 
 
 @pytest.fixture(scope='function')