darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-11 10:28:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed some mocks in test

Browse Source
This commit is contained in:
Adam Shimali
2016-01-20 16:36:06 +00:00
parent fcedae5fe1
commit 7af53761d9
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/app/main/views/test_verify.py
+8 -7
View File
@@ -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) " 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_, def test_should_redirect_to_add_service_when_code_are_correct(app_,
db_, db_,
db_session, 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_request_context():
with app_.test_client() as client: with app_.test_client() as client:
with client.session_transaction() as session: 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' 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_request_context():
with app_.test_client() as client: with app_.test_client() as client:
with client.session_transaction() as session: with client.session_transaction() as session:
user = create_test_api_user('pending') session['user_details'] = {'email_address': mock_api_user.email_address, 'id': mock_api_user.id}
session['user_details'] = {'email_address': user.email_address, 'id': 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=user.id, code='23345', code_type='sms') verify_codes_dao.add_code(user_id=mock_api_user.id, code='98456', code_type='email')
verify_codes_dao.add_code(user_id=user.id, code='98456', code_type='email')
response = client.post(url_for('main.verify'), response = client.post(url_for('main.verify'),
data={'sms_code': '12345', data={'sms_code': '12345',
'email_code': '23456'}) 'email_code': '23456'})
tests/conftest.py
+1 -1
View File
@@ -241,7 +241,7 @@ def mock_activate_user(mocker, mock_api_user):
@pytest.fixture(scope='function') @pytest.fixture(scope='function')
def mock_user_dao_get_user(mocker): 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 mock_class.return_value = mock_api_user
return mock_class return mock_class