From 7af53761d9d6f9c2233b03fb276e9d62c7112770 Mon Sep 17 00:00:00 2001 From: Adam Shimali Date: Wed, 20 Jan 2016 16:36:06 +0000 Subject: [PATCH] fixed some mocks in test --- tests/app/main/views/test_verify.py | 15 ++++++++------- tests/conftest.py | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tests/app/main/views/test_verify.py b/tests/app/main/views/test_verify.py index 56d41aa17..106c559bd 100644 --- a/tests/app/main/views/test_verify.py +++ b/tests/app/main/views/test_verify.py @@ -19,11 +19,13 @@ def test_should_return_verify_template(app_, db_, db_session, mock_api_user): " You need to enter both codes here.") in response.get_data(as_text=True) -@pytest.mark.xfail(reason='Activation refactor to use api not completed') def test_should_redirect_to_add_service_when_code_are_correct(app_, db_, db_session, - mock_api_user): + mock_api_user, + mock_user_dao_get_user, + mock_activate_user, + mock_user_loader): with app_.test_request_context(): with app_.test_client() as client: with client.session_transaction() as session: @@ -53,14 +55,13 @@ def test_should_activate_user_after_verify(app_, db_, db_session, mock_api_user) assert after_verify.state == 'active' -def test_should_return_200_when_codes_are_wrong(app_, db_, db_session): +def test_should_return_200_when_codes_are_wrong(app_, db_, db_session, mock_api_user): with app_.test_request_context(): with app_.test_client() as client: with client.session_transaction() as session: - user = create_test_api_user('pending') - session['user_details'] = {'email_address': user.email_address, 'id': user.id} - verify_codes_dao.add_code(user_id=user.id, code='23345', code_type='sms') - verify_codes_dao.add_code(user_id=user.id, code='98456', code_type='email') + session['user_details'] = {'email_address': mock_api_user.email_address, 'id': mock_api_user.id} + verify_codes_dao.add_code(user_id=mock_api_user.id, code='23345', code_type='sms') + verify_codes_dao.add_code(user_id=mock_api_user.id, code='98456', code_type='email') response = client.post(url_for('main.verify'), data={'sms_code': '12345', 'email_code': '23456'}) diff --git a/tests/conftest.py b/tests/conftest.py index e3b7e6f05..7c603edce 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -241,7 +241,7 @@ 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_email') + mock_class = mocker.patch('app.main.dao.users_dao.get_user_by_id') mock_class.return_value = mock_api_user return mock_class