Reintroduce some tests. A bit of cleanup of mocks.

User object fields made a bit clearer and simple test to
verify user added.
This commit is contained in:
Adam Shimali
2016-01-23 23:14:50 +00:00
parent ba0d0d49e1
commit 4674bd6b68
23 changed files with 493 additions and 453 deletions

View File

@@ -1,8 +1,5 @@
from flask import json, url_for
from app.main.dao import users_dao, verify_codes_dao
from tests import create_test_api_user
import pytest
from flask import url_for
from app.main.dao import verify_codes_dao
def test_should_return_verify_template(app_, db_, db_session, mock_api_user):
@@ -23,9 +20,8 @@ def test_should_redirect_to_add_service_when_code_are_correct(app_,
db_,
db_session,
mock_api_user,
mock_user_dao_get_user,
mock_activate_user,
mock_user_loader):
mock_get_user,
mock_activate_user):
with app_.test_request_context():
with app_.test_client() as client:
with client.session_transaction() as session:
@@ -39,20 +35,20 @@ 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_, db_, db_session, mock_api_user, 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': mock_api_user.email_address, 'id': mock_api_user.id}
# verify_codes_dao.add_code(user_id=mock_api_user.id, code='12345', code_type='sms')
# verify_codes_dao.add_code(user_id=mock_api_user.id, code='23456', code_type='email')
# client.post(url_for('main.verify'),
# data={'sms_code': '12345',
# 'email_code': '23456'})
# assert mock_api_user.state == 'active'
def test_should_activate_user_after_verify(app_, db_, db_session, mock_api_user, mock_activate_user, mock_get_user):
with app_.test_request_context():
with app_.test_client() as client:
with client.session_transaction() as session:
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='12345', code_type='sms')
verify_codes_dao.add_code(user_id=mock_api_user.id, code='23456', code_type='email')
client.post(url_for('main.verify'),
data={'sms_code': '12345',
'email_code': '23456'})
assert mock_api_user.state == 'active'
def test_should_return_200_when_codes_are_wrong(app_, db_, db_session, mock_api_user, mock_user_dao_get_user):
def test_should_return_200_when_codes_are_wrong(app_, db_, db_session, mock_api_user, mock_get_user):
with app_.test_request_context():
with app_.test_client() as client:
with client.session_transaction() as session:
@@ -68,23 +64,25 @@ def test_should_return_200_when_codes_are_wrong(app_, db_, db_session, mock_api_
assert resp_data.count('Code does not match') == 2
# def test_should_mark_all_codes_as_used_when_many_codes_exist(app_,
# db_,
# db_session,
# mock_api_user):
# with app_.test_request_context():
# with app_.test_client() as client:
# with client.session_transaction() as session:
# session['user_details'] = {'email_address': mock_api_user.email_address, 'id': mock_api_user.id}
# code1 = verify_codes_dao.add_code(user_id=mock_api_user.id, code='23345', code_type='sms')
# code2 = verify_codes_dao.add_code(user_id=mock_api_user.id, code='98456', code_type='email')
# code3 = verify_codes_dao.add_code(user_id=mock_api_user.id, code='12345', code_type='sms')
# code4 = verify_codes_dao.add_code(user_id=mock_api_user.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
def test_should_mark_all_codes_as_used_when_many_codes_exist(app_,
db_,
db_session,
mock_api_user,
mock_get_user,
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': mock_api_user.email_address, 'id': mock_api_user.id}
code1 = verify_codes_dao.add_code(user_id=mock_api_user.id, code='23345', code_type='sms')
code2 = verify_codes_dao.add_code(user_id=mock_api_user.id, code='98456', code_type='email')
code3 = verify_codes_dao.add_code(user_id=mock_api_user.id, code='12345', code_type='sms')
code4 = verify_codes_dao.add_code(user_id=mock_api_user.id, code='23412', code_type='email')
response = client.post(url_for('main.verify'),
data={'sms_code': '12345',
'email_code': '23412'})
assert response.status_code == 302
assert verify_codes_dao.get_code_by_id(code1.id).code_used is True
assert verify_codes_dao.get_code_by_id(code2.id).code_used is True
assert verify_codes_dao.get_code_by_id(code3.id).code_used is True
assert verify_codes_dao.get_code_by_id(code4.id).code_used is True