All tests passing and merged with master.

This commit is contained in:
Nicholas Staples
2016-01-27 16:30:33 +00:00
51 changed files with 763 additions and 892 deletions

View File

@@ -23,9 +23,8 @@ def test_should_return_verify_template(app_,
def test_should_redirect_to_add_service_when_code_are_correct(app_,
api_user_active,
mock_user_dao_get_user,
mock_activate_user,
mock_user_loader,
mock_get_user,
mock_update_user,
mock_check_verify_code):
with app_.test_request_context():
with app_.test_client() as client:
@@ -38,22 +37,25 @@ def test_should_redirect_to_add_service_when_code_are_correct(app_,
assert response.location == url_for('main.add_service', first='first', _external=True)
# def test_should_activate_user_after_verify(app_, api_user_active, mock_activate_user):
# with app_.test_request_context():
# with app_.test_client() as client:
# with client.session_transaction() as session:
# session['user_details'] = {'email_address': api_user_active.email_address, 'id': api_user_active.id}
# verify_codes_dao.add_code(user_id=api_user_active.id, code='12345', code_type='sms')
# verify_codes_dao.add_code(user_id=api_user_active.id, code='23456', code_type='email')
# client.post(url_for('main.verify'),
# data={'sms_code': '12345',
# 'email_code': '23456'})
# assert api_user_active.state == 'active'
def test_should_activate_user_after_verify(app_,
api_user_active,
mock_get_user,
mock_send_verify_code,
mock_check_verify_code,
mock_update_user):
with app_.test_request_context():
with app_.test_client() as client:
with client.session_transaction() as session:
session['user_details'] = {'email_address': api_user_active.email_address, 'id': api_user_active.id}
client.post(url_for('main.verify'),
data={'sms_code': '12345',
'email_code': '23456'})
assert mock_update_user.called
def test_should_return_200_when_codes_are_wrong(app_,
api_user_active,
mock_user_dao_get_user,
mock_get_user,
mock_check_verify_code_code_not_found):
with app_.test_request_context():
with app_.test_client() as client:
@@ -65,23 +67,3 @@ def test_should_return_200_when_codes_are_wrong(app_,
assert response.status_code == 200
resp_data = response.get_data(as_text=True)
assert resp_data.count('Code not found') == 2
# def test_should_mark_all_codes_as_used_when_many_codes_exist(app_,
# api_user_active):
# with app_.test_request_context():
# with app_.test_client() as client:
# with client.session_transaction() as session:
# session['user_details'] = {'email_address': api_user_active.email_address, 'id': api_user_active.id}
# code1 = verify_codes_dao.add_code(user_id=api_user_active.id, code='23345', code_type='sms')
# code2 = verify_codes_dao.add_code(user_id=api_user_active.id, code='98456', code_type='email')
# code3 = verify_codes_dao.add_code(user_id=api_user_active.id, code='12345', code_type='sms')
# code4 = verify_codes_dao.add_code(user_id=api_user_active.id, code='23412', code_type='email')
# response = client.post(url_for('main.verify'),
# data={'sms_code': '23345',
# 'email_code': '23412'})
# assert response.status_code == 302
# assert verify_codes_dao.get_code_by_id(code1).code_used is True
# assert verify_codes_dao.get_code_by_id(code2).code_used is True
# assert verify_codes_dao.get_code_by_id(code3).code_used is True
# assert verify_codes_dao.get_code_by_id(code4).code_used is True