From c0550d2c611131dc0b40b22b3af355614a3d0ccc Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Fri, 11 Dec 2015 14:50:03 +0000 Subject: [PATCH 1/3] Refactor unit tests --- app/main/forms.py | 3 +- tests/app/main/test_verify_form.py | 99 ++++++++++++++++++ tests/app/main/views/test_two_factor.py | 2 +- tests/app/main/views/test_verify.py | 133 ++---------------------- 4 files changed, 112 insertions(+), 125 deletions(-) create mode 100644 tests/app/main/test_verify_form.py diff --git a/app/main/forms.py b/app/main/forms.py index 76634c5ae..202134a7b 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -23,7 +23,7 @@ class LoginForm(Form): gov_uk_email = "(^[^@^\\s]+@[^@^\\.^\\s]+(\\.[^@^\\.^\\s]*)*.gov.uk)" mobile_number = "^\\+44[\\d]{10}$" -verify_code = "[\\d]{5}$" +verify_code = '^\d{5}$' class RegisterUserForm(Form): @@ -62,6 +62,7 @@ class VerifyForm(Form): Regexp(regex=verify_code, message='Code must be 5 digits')]) def validate_email_code(self, a): + print('validating the email_code') code = verify_codes_dao.get_code(session['user_id'], 'email') validate_code(self.email_code, code) diff --git a/tests/app/main/test_verify_form.py b/tests/app/main/test_verify_form.py new file mode 100644 index 000000000..bafd04465 --- /dev/null +++ b/tests/app/main/test_verify_form.py @@ -0,0 +1,99 @@ +from datetime import datetime, timedelta + +from app.main.dao import verify_codes_dao +from app.main.forms import VerifyForm +from tests.app.main import create_test_user + + +def test_form_should_have_error_when_code_is_not_valid(notifications_admin, notifications_admin_db, notify_db_session): + with notifications_admin.test_request_context(method='POST', + data={'sms_code': '12345aa', 'email_code': 'abcde'}) as req: + user = set_up_test_data() + req.session['user_id']= user.id + form = VerifyForm(req.request.form) + assert form.validate() is False + errors = form.errors + assert len(errors) == 2 + expected = set({'email_code': ['Code must be 5 digits', 'Code does not match'], + 'sms_code': ['Code does not match', 'Code must be 5 digits']}) + assert 'sms_code' in errors + assert set(errors) == expected + + +def test_should_return_errors_when_code_missing(notifications_admin, notifications_admin_db, notify_db_session): + with notifications_admin.test_request_context(method='POST', + data={}) as req: + user = set_up_test_data() + req.session['user_id']= user.id + form = VerifyForm(req.request.form) + assert form.validate() is False + errors = form.errors + expected = set({'sms_code': ['SMS code can not be empty'], + 'email_code': ['Email code can not be empty']}) + assert len(errors) == 2 + assert set(errors) == expected + + +def test_should_return_errors_when_code_is_too_short(notifications_admin, notifications_admin_db, notify_db_session): + with notifications_admin.test_request_context(method='POST', + data={'sms_code':'123', 'email_code':'123'}) as req: + user = set_up_test_data() + req.session['user_id']= user.id + form = VerifyForm(req.request.form) + assert form.validate() is False + errors = form.errors + expected = set({'sms_code': ['Code must be 5 digits', 'Code does not match'], + 'email_code': ['Code must be 5 digits', 'Code does not match']}) + assert len(errors) == 2 + assert set(errors) == expected + + +def test_should_return_errors_when_code_does_not_match(notifications_admin, notifications_admin_db, notify_db_session): + with notifications_admin.test_request_context(method='POST', + data={'sms_code': '23456', 'email_code': '23456'}) as req: + user = set_up_test_data() + req.session['user_id']= user.id + form = VerifyForm(req.request.form) + assert form.validate() is False + errors = form.errors + expected = set({'sms_code': ['Code does not match'], + 'email_code': ['Code does not match']}) + assert len(errors) == 2 + assert set(errors) == expected + + +def test_should_return_errors_when_code_is_expired(notifications_admin, notifications_admin_db, notify_db_session): + with notifications_admin.test_request_context(method='POST', + data={'sms_code': '23456', 'email_code': '23456'}) as req: + user = create_test_user() + verify_codes_dao.add_code_with_expiry(user_id=user.id, + code='23456', + code_type='email', + expiry=datetime.now() + timedelta(hours=-1)) + verify_codes_dao.add_code_with_expiry(user_id=user.id, + code='23456', + code_type='sms', + expiry=datetime.now() + timedelta(hours=-2)) + req.session['user_id']= user.id + form = VerifyForm(req.request.form) + assert form.validate() is False + errors = form.errors + expected = {'sms_code': ['Code has expired'], + 'email_code': ['Code has expired']} + assert len(errors) == 2 + assert 'sms_code' in errors + assert errors['sms_code'] == expected['sms_code'] + assert 'email_code' in errors + assert errors['email_code'] == expected['email_code'] + + + + + +def set_up_test_data(): + user = create_test_user() + verify_codes_dao.add_code(user_id=user.id, code='12345', code_type='email') + verify_codes_dao.add_code(user_id=user.id, code='12345', code_type='sms') + return user + + diff --git a/tests/app/main/views/test_two_factor.py b/tests/app/main/views/test_two_factor.py index 8865219df..1d8d7ea69 100644 --- a/tests/app/main/views/test_two_factor.py +++ b/tests/app/main/views/test_two_factor.py @@ -59,4 +59,4 @@ def test_should_return_400_when_sms_code_is_too_short(notifications_admin, notif data = json.loads(response.get_data(as_text=True)) assert len(data.keys()) == 1 assert 'sms_code' in data - assert data['sms_code'].sort() == ['Code must be 5 digits', 'Code does not match'].sort() + assert set(data['sms_code']) == ['Code must be 5 digits', 'Code does not match'].sort() diff --git a/tests/app/main/views/test_verify.py b/tests/app/main/views/test_verify.py index 04636c733..cb3dad2b3 100644 --- a/tests/app/main/views/test_verify.py +++ b/tests/app/main/views/test_verify.py @@ -43,136 +43,23 @@ def test_should_activate_user_after_verify(notifications_admin, notifications_ad assert after_verify.state == 'active' -def test_should_return_400_when_sms_code_is_wrong(notifications_admin, notifications_admin_db, notify_db_session): +def test_should_return_400_when_codes_are_wrong(notifications_admin, notifications_admin_db, notify_db_session): with notifications_admin.test_client() as client: with client.session_transaction() as session: user = create_test_user() session['user_id'] = user.id - verify_codes_dao.add_code(user_id=user.id, code='12345', code_type='sms') - verify_codes_dao.add_code(user_id=user.id, code='23456', code_type='email') - response = client.post('/verify', - data={'sms_code': '98765', - 'email_code': '23456'}) - assert response.status_code == 400 - assert {'sms_code': ['Code does not match']} == json.loads(response.get_data(as_text=True)) - - -def test_should_return_400_when_email_code_is_wrong(notifications_admin, notifications_admin_db, notify_db_session): - with notifications_admin.test_client() as client: - with client.session_transaction() as session: - user = create_test_user() - session['user_id'] = user.id - verify_codes_dao.add_code(user_id=user.id, code='12345', code_type='sms') + 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') response = client.post('/verify', data={'sms_code': '12345', 'email_code': '23456'}) assert response.status_code == 400 - assert {'email_code': ['Code does not match']} == json.loads(response.get_data(as_text=True)) + expected = {'sms_code': ['Code must be 5 digits', 'Code does not match'], + 'email_code': ['Code must be 5 digits', 'Code does not match']} + errors = json.loads(response.get_data(as_text=True)) + assert len(errors) == 2 + assert 'sms_code' in errors + assert errors['sms_code'] == expected['sms_code'] + assert 'email_code' in errors + assert set(errors['email_code']) in set(expected['email_code']) - -def test_should_return_400_when_sms_code_is_missing(notifications_admin, notifications_admin_db, notify_db_session): - with notifications_admin.test_client() as client: - with client.session_transaction() as session: - user = create_test_user() - session['user_id'] = user.id - verify_codes_dao.add_code(user_id=user.id, code='12345', code_type='sms') - verify_codes_dao.add_code(user_id=user.id, code='98456', code_type='email') - response = client.post('/verify', - data={'email_code': '98456'}) - assert response.status_code == 400 - assert {'sms_code': ['SMS code can not be empty']} == json.loads(response.get_data(as_text=True)) - - -def test_should_return_400_when_email_code_is_missing(notifications_admin, notifications_admin_db, notify_db_session): - with notifications_admin.test_client() as client: - with client.session_transaction() as session: - user = create_test_user() - session['user_id'] = user.id - verify_codes_dao.add_code(user_id=user.id, code='23456', code_type='email') - verify_codes_dao.add_code(user_id=user.id, code='23456', code_type='sms') - response = client.post('/verify', - data={'sms_code': '23456'}) - assert response.status_code == 400 - assert {'email_code': ['Email code can not be empty']} == json.loads(response.get_data(as_text=True)) - - -def test_should_return_400_when_email_code_has_letter(notifications_admin, notifications_admin_db, notify_db_session): - with notifications_admin.test_client() as client: - with client.session_transaction() as session: - user = create_test_user() - session['user_id'] = user.id - verify_codes_dao.add_code(user_id=user.id, code='23456', code_type='email') - verify_codes_dao.add_code(user_id=user.id, code='23456', code_type='sms') - response = client.post('/verify', - data={'sms_code': '23456', - 'email_code': 'abcde'}) - assert response.status_code == 400 - data = json.loads(response.get_data(as_text=True)) - expected = {'email_code': ['Code does not match', 'Code must be 5 digits']} - assert len(data.keys()) == 1 - assert 'email_code' in data - assert data['email_code'].sort() == expected['email_code'].sort() - - -def test_should_return_400_when_sms_code_is_too_short(notifications_admin, notifications_admin_db, notify_db_session): - with notifications_admin.test_client() as client: - with client.session_transaction() as session: - user = create_test_user() - session['user_id'] = user.id - verify_codes_dao.add_code(user_id=user.id, code='23456', code_type='email') - verify_codes_dao.add_code(user_id=user.id, code='23456', code_type='sms') - response = client.post('/verify', - data={'sms_code': '2345', - 'email_code': '23456'}) - assert response.status_code == 400 - data = json.loads(response.get_data(as_text=True)) - expected = {'sms_code': ['Code must be 5 digits', 'Code does not match']} - assert len(data.keys()) == 1 - assert 'sms_code' in data - assert data['sms_code'].sort() == expected['sms_code'].sort() - - -def test_should_return_302_when_email_code_starts_with_zero(notifications_admin, - notifications_admin_db, - notify_db_session): - with notifications_admin.test_client() as client: - with client.session_transaction() as session: - user = create_test_user() - session['user_id'] = user.id - verify_codes_dao.add_code(user_id=user.id, code='23456', code_type='sms') - verify_codes_dao.add_code(user_id=user.id, code='09765', code_type='email') - response = client.post('/verify', - data={'sms_code': '23456', - 'email_code': '09765'}) - assert response.status_code == 302 - assert response.location == 'http://localhost/add-service' - - -def test_should_return_400_when_verify_code_has_expired(notifications_admin, - notifications_admin_db, - notify_db_session): - with notifications_admin.test_client() as client: - with client.session_transaction() as session: - user = create_test_user() - session['user_id'] = user.id - verify_codes_dao.add_code_with_expiry(user_id=user.id, - code='23456', - code_type='email', - expiry=datetime.now() + timedelta(hours=-2)) - verify_codes_dao.add_code_with_expiry(user_id=user.id, - code='23456', - code_type='sms', - expiry=datetime.now() + timedelta(hours=-2)) - response = client.post('/verify', - data={'sms_code': '23456', - 'email_code': '23456'}) - assert response.status_code == 400 - data = json.loads(response.get_data(as_text=True)) - expected = {'sms_code': ['Code has expired'], - 'email_code': ['Code has expired']} - assert len(data.keys()) == 2 - assert 'sms_code' in data - assert data['sms_code'].sort() == expected['sms_code'].sort() - assert 'email_code' in data - assert data['email_code'].sort() == expected['email_code'].sort() From 295dbeb7d1345c6e76218cab6de94be9cfae0ff5 Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Mon, 14 Dec 2015 10:52:00 +0000 Subject: [PATCH 2/3] Create unit tests that test the forms. --- app/main/forms.py | 3 +- app/main/views/verify.py | 1 - tests/app/main/test_two_factor_form.py | 71 ++++++++++++ tests/app/main/test_verify_form.py | 138 ++++++++++++------------ tests/app/main/views/test_two_factor.py | 3 +- tests/app/main/views/test_verify.py | 11 +- 6 files changed, 141 insertions(+), 86 deletions(-) create mode 100644 tests/app/main/test_two_factor_form.py diff --git a/app/main/forms.py b/app/main/forms.py index 202134a7b..c4ee1c995 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -62,7 +62,6 @@ class VerifyForm(Form): Regexp(regex=verify_code, message='Code must be 5 digits')]) def validate_email_code(self, a): - print('validating the email_code') code = verify_codes_dao.get_code(session['user_id'], 'email') validate_code(self.email_code, code) @@ -72,7 +71,7 @@ class VerifyForm(Form): def validate_code(field, code): - if code.expiry_datetime < datetime.now(): + if code.expiry_datetime > datetime.now(): field.errors.append('Code has expired') return False if field.data is not None: diff --git a/app/main/views/verify.py b/app/main/views/verify.py index 1cbfa63ce..d54e46d43 100644 --- a/app/main/views/verify.py +++ b/app/main/views/verify.py @@ -20,5 +20,4 @@ def process_verify(): login_user(user) return redirect('/add-service') else: - print(form.errors) return jsonify(form.errors), 400 diff --git a/tests/app/main/test_two_factor_form.py b/tests/app/main/test_two_factor_form.py new file mode 100644 index 000000000..7b6bec243 --- /dev/null +++ b/tests/app/main/test_two_factor_form.py @@ -0,0 +1,71 @@ +from datetime import datetime, timedelta + +from app.main.dao import verify_codes_dao +from app.main.forms import TwoFactorForm +from tests.app.main import create_test_user + + +def test_form_is_valid_returns_no_errors(notifications_admin, notifications_admin_db, notify_db_session): + with notifications_admin.test_request_context(method='POST', + data={'sms_code': '12345'}) as req: + user = set_up_test_data() + req.session['user_id'] = user.id + form = TwoFactorForm(req.request.form) + assert form.validate() is True + assert len(form.errors) == 0 + + +def test_returns_errors_when_code_is_too_short(notifications_admin, notifications_admin_db, notify_db_session): + with notifications_admin.test_request_context(method='POST', + data={'sms_code': '145'}) as req: + user = set_up_test_data() + req.session['user_id'] = user.id + form = TwoFactorForm(req.request.form) + assert form.validate() is False + assert len(form.errors) == 1 + assert set(form.errors) == set({'sms_code': ['Code must be 5 digits', 'Code does not match']}) + + +def test_returns_errors_when_code_is_missing(notifications_admin, notifications_admin_db, notify_db_session): + with notifications_admin.test_request_context(method='POST', + data={}) as req: + user = set_up_test_data() + req.session['user_id'] = user.id + form = TwoFactorForm(req.request.form) + assert form.validate() is False + assert len(form.errors) == 1 + assert set(form.errors) == set({'sms_code': ['Code must not be empty']}) + + +def test_returns_errors_when_code_contains_letters(notifications_admin, notifications_admin_db, notify_db_session): + with notifications_admin.test_request_context(method='POST', + data={'sms_code': 'asdfg'}) as req: + user = set_up_test_data() + req.session['user_id'] = user.id + form = TwoFactorForm(req.request.form) + assert form.validate() is False + assert len(form.errors) == 1 + assert set(form.errors) == set({'sms_code': ['Code must be 5 digits', 'Code does not match']}) + + +def test_should_return_errors_when_code_is_expired(notifications_admin, notifications_admin_db, notify_db_session): + with notifications_admin.test_request_context(method='POST', + data={'sms_code': '12345'}) as req: + user = set_up_test_data() + req.session['user_id'] = user.id + verify_codes_dao.add_code_with_expiry(user_id=user.id, + code='12345', + code_type='sms', + expiry=datetime.now() + timedelta(hours=-2)) + req.session['user_id'] = user.id + form = TwoFactorForm(req.request.form) + assert form.validate() is False + errors = form.errors + assert len(errors) == 1 + assert errors == {'sms_code': ['Code has expired']} + + +def set_up_test_data(): + user = create_test_user() + verify_codes_dao.add_code(user_id=user.id, code='12345', code_type='sms') + return user diff --git a/tests/app/main/test_verify_form.py b/tests/app/main/test_verify_form.py index bafd04465..7cd33c676 100644 --- a/tests/app/main/test_verify_form.py +++ b/tests/app/main/test_verify_form.py @@ -1,93 +1,89 @@ from datetime import datetime, timedelta - from app.main.dao import verify_codes_dao from app.main.forms import VerifyForm from tests.app.main import create_test_user def test_form_should_have_error_when_code_is_not_valid(notifications_admin, notifications_admin_db, notify_db_session): - with notifications_admin.test_request_context(method='POST', - data={'sms_code': '12345aa', 'email_code': 'abcde'}) as req: - user = set_up_test_data() - req.session['user_id']= user.id - form = VerifyForm(req.request.form) - assert form.validate() is False - errors = form.errors - assert len(errors) == 2 - expected = set({'email_code': ['Code must be 5 digits', 'Code does not match'], - 'sms_code': ['Code does not match', 'Code must be 5 digits']}) - assert 'sms_code' in errors - assert set(errors) == expected + with notifications_admin.test_request_context(method='POST', + data={'sms_code': '12345aa', 'email_code': 'abcde'}) as req: + user = set_up_test_data() + req.session['user_id'] = user.id + form = VerifyForm(req.request.form) + assert form.validate() is False + errors = form.errors + assert len(errors) == 2 + expected = {'email_code': ['Code must be 5 digits', 'Code does not match'], + 'sms_code': ['Code does not match', 'Code must be 5 digits']} + assert 'sms_code' in errors + assert set(errors) == set(expected) def test_should_return_errors_when_code_missing(notifications_admin, notifications_admin_db, notify_db_session): - with notifications_admin.test_request_context(method='POST', - data={}) as req: - user = set_up_test_data() - req.session['user_id']= user.id - form = VerifyForm(req.request.form) - assert form.validate() is False - errors = form.errors - expected = set({'sms_code': ['SMS code can not be empty'], - 'email_code': ['Email code can not be empty']}) - assert len(errors) == 2 - assert set(errors) == expected + with notifications_admin.test_request_context(method='POST', + data={}) as req: + user = set_up_test_data() + req.session['user_id'] = user.id + form = VerifyForm(req.request.form) + assert form.validate() is False + errors = form.errors + expected = {'sms_code': ['SMS code can not be empty'], + 'email_code': ['Email code can not be empty']} + assert len(errors) == 2 + assert set(errors) == set(expected) def test_should_return_errors_when_code_is_too_short(notifications_admin, notifications_admin_db, notify_db_session): - with notifications_admin.test_request_context(method='POST', - data={'sms_code':'123', 'email_code':'123'}) as req: - user = set_up_test_data() - req.session['user_id']= user.id - form = VerifyForm(req.request.form) - assert form.validate() is False - errors = form.errors - expected = set({'sms_code': ['Code must be 5 digits', 'Code does not match'], - 'email_code': ['Code must be 5 digits', 'Code does not match']}) - assert len(errors) == 2 - assert set(errors) == expected + with notifications_admin.test_request_context(method='POST', + data={'sms_code': '123', 'email_code': '123'}) as req: + user = set_up_test_data() + req.session['user_id'] = user.id + form = VerifyForm(req.request.form) + assert form.validate() is False + errors = form.errors + expected = {'sms_code': ['Code must be 5 digits', 'Code does not match'], + 'email_code': ['Code must be 5 digits', 'Code does not match']} + assert len(errors) == 2 + assert set(errors) == set(expected) def test_should_return_errors_when_code_does_not_match(notifications_admin, notifications_admin_db, notify_db_session): - with notifications_admin.test_request_context(method='POST', - data={'sms_code': '23456', 'email_code': '23456'}) as req: - user = set_up_test_data() - req.session['user_id']= user.id - form = VerifyForm(req.request.form) - assert form.validate() is False - errors = form.errors - expected = set({'sms_code': ['Code does not match'], - 'email_code': ['Code does not match']}) - assert len(errors) == 2 - assert set(errors) == expected + with notifications_admin.test_request_context(method='POST', + data={'sms_code': '23456', 'email_code': '23456'}) as req: + user = set_up_test_data() + req.session['user_id'] = user.id + form = VerifyForm(req.request.form) + assert form.validate() is False + errors = form.errors + expected = {'sms_code': ['Code does not match'], + 'email_code': ['Code does not match']} + assert len(errors) == 2 + assert set(errors) == set(expected) def test_should_return_errors_when_code_is_expired(notifications_admin, notifications_admin_db, notify_db_session): - with notifications_admin.test_request_context(method='POST', - data={'sms_code': '23456', 'email_code': '23456'}) as req: - user = create_test_user() - verify_codes_dao.add_code_with_expiry(user_id=user.id, - code='23456', - code_type='email', - expiry=datetime.now() + timedelta(hours=-1)) - verify_codes_dao.add_code_with_expiry(user_id=user.id, - code='23456', - code_type='sms', - expiry=datetime.now() + timedelta(hours=-2)) - req.session['user_id']= user.id - form = VerifyForm(req.request.form) - assert form.validate() is False - errors = form.errors - expected = {'sms_code': ['Code has expired'], - 'email_code': ['Code has expired']} - assert len(errors) == 2 - assert 'sms_code' in errors - assert errors['sms_code'] == expected['sms_code'] - assert 'email_code' in errors - assert errors['email_code'] == expected['email_code'] - - + with notifications_admin.test_request_context(method='POST', + data={'sms_code': '23456', + 'email_code': '23456'}) as req: + user = set_up_test_data() + req.session['user_id'] = user.id + verify_codes_dao.add_code_with_expiry(user_id=user.id, + code='23456', + code_type='sms', + expiry=datetime.now() + timedelta(hours=-2)) + verify_codes_dao.add_code_with_expiry(user_id=user.id, + code='23456', + code_type='email', + expiry=datetime.now() + timedelta(hours=-2)) + req.session['user_id'] = user.id + form = VerifyForm(req.request.form) + assert form.validate() is False + errors = form.errors + expected = set({'sms_code': ['Code has expired'], + 'email_code': ['Code has exprired']}) + assert len(errors) == 2 + assert set(errors) == expected def set_up_test_data(): @@ -95,5 +91,3 @@ def set_up_test_data(): verify_codes_dao.add_code(user_id=user.id, code='12345', code_type='email') verify_codes_dao.add_code(user_id=user.id, code='12345', code_type='sms') return user - - diff --git a/tests/app/main/views/test_two_factor.py b/tests/app/main/views/test_two_factor.py index 1d8d7ea69..893408a3b 100644 --- a/tests/app/main/views/test_two_factor.py +++ b/tests/app/main/views/test_two_factor.py @@ -58,5 +58,4 @@ def test_should_return_400_when_sms_code_is_too_short(notifications_admin, notif assert response.status_code == 400 data = json.loads(response.get_data(as_text=True)) assert len(data.keys()) == 1 - assert 'sms_code' in data - assert set(data['sms_code']) == ['Code must be 5 digits', 'Code does not match'].sort() + assert set(data) == set({'sms_code': ['Code must be 5 digits', 'Code does not match']}) diff --git a/tests/app/main/views/test_verify.py b/tests/app/main/views/test_verify.py index cb3dad2b3..13bb17382 100644 --- a/tests/app/main/views/test_verify.py +++ b/tests/app/main/views/test_verify.py @@ -1,7 +1,4 @@ -from datetime import datetime, timedelta - from flask import json - from app.main.dao import users_dao, verify_codes_dao from tests.app.main import create_test_user @@ -55,11 +52,7 @@ def test_should_return_400_when_codes_are_wrong(notifications_admin, notificatio 'email_code': '23456'}) assert response.status_code == 400 expected = {'sms_code': ['Code must be 5 digits', 'Code does not match'], - 'email_code': ['Code must be 5 digits', 'Code does not match']} + 'email_code': ['Code must be 5 digits', 'Code does not match']} errors = json.loads(response.get_data(as_text=True)) assert len(errors) == 2 - assert 'sms_code' in errors - assert errors['sms_code'] == expected['sms_code'] - assert 'email_code' in errors - assert set(errors['email_code']) in set(expected['email_code']) - + assert set(errors) == set(expected) From caabda92e0242676ed7b1ad13134d57af14388df Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Mon, 14 Dec 2015 14:09:29 +0000 Subject: [PATCH 3/3] Test for VerifyForm and TwoFactorForm --- app/main/forms.py | 2 +- tests/app/main/test_two_factor_form.py | 6 +++--- tests/app/main/test_verify_form.py | 10 +++++----- tests/app/main/views/test_two_factor.py | 24 ------------------------ 4 files changed, 9 insertions(+), 33 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index c4ee1c995..edfbebbbf 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -71,7 +71,7 @@ class VerifyForm(Form): def validate_code(field, code): - if code.expiry_datetime > datetime.now(): + if code.expiry_datetime <= datetime.now(): field.errors.append('Code has expired') return False if field.data is not None: diff --git a/tests/app/main/test_two_factor_form.py b/tests/app/main/test_two_factor_form.py index 7b6bec243..107f7757c 100644 --- a/tests/app/main/test_two_factor_form.py +++ b/tests/app/main/test_two_factor_form.py @@ -50,11 +50,11 @@ def test_returns_errors_when_code_contains_letters(notifications_admin, notifica def test_should_return_errors_when_code_is_expired(notifications_admin, notifications_admin_db, notify_db_session): with notifications_admin.test_request_context(method='POST', - data={'sms_code': '12345'}) as req: - user = set_up_test_data() + data={'sms_code': '23456'}) as req: + user = create_test_user() req.session['user_id'] = user.id verify_codes_dao.add_code_with_expiry(user_id=user.id, - code='12345', + code='23456', code_type='sms', expiry=datetime.now() + timedelta(hours=-2)) req.session['user_id'] = user.id diff --git a/tests/app/main/test_verify_form.py b/tests/app/main/test_verify_form.py index 7cd33c676..9c4b7dedd 100644 --- a/tests/app/main/test_verify_form.py +++ b/tests/app/main/test_verify_form.py @@ -49,7 +49,7 @@ def test_should_return_errors_when_code_is_too_short(notifications_admin, notifi def test_should_return_errors_when_code_does_not_match(notifications_admin, notifications_admin_db, notify_db_session): with notifications_admin.test_request_context(method='POST', - data={'sms_code': '23456', 'email_code': '23456'}) as req: + data={'sms_code': '34567', 'email_code': '34567'}) as req: user = set_up_test_data() req.session['user_id'] = user.id form = VerifyForm(req.request.form) @@ -65,7 +65,7 @@ def test_should_return_errors_when_code_is_expired(notifications_admin, notifica with notifications_admin.test_request_context(method='POST', data={'sms_code': '23456', 'email_code': '23456'}) as req: - user = set_up_test_data() + user = create_test_user() req.session['user_id'] = user.id verify_codes_dao.add_code_with_expiry(user_id=user.id, code='23456', @@ -80,10 +80,10 @@ def test_should_return_errors_when_code_is_expired(notifications_admin, notifica form = VerifyForm(req.request.form) assert form.validate() is False errors = form.errors - expected = set({'sms_code': ['Code has expired'], - 'email_code': ['Code has exprired']}) + expected = {'sms_code': ['Code has expired'], + 'email_code': ['Code has expired']} assert len(errors) == 2 - assert set(errors) == expected + assert set(errors) == set(expected) def set_up_test_data(): diff --git a/tests/app/main/views/test_two_factor.py b/tests/app/main/views/test_two_factor.py index 893408a3b..18992f0d9 100644 --- a/tests/app/main/views/test_two_factor.py +++ b/tests/app/main/views/test_two_factor.py @@ -35,27 +35,3 @@ def test_should_return_400_with_sms_code_error_when_sms_code_is_wrong(notificati data={'sms_code': '23456'}) assert response.status_code == 400 assert {'sms_code': ['Code does not match']} == json.loads(response.get_data(as_text=True)) - - -def test_should_return_400_when_sms_code_is_empty(notifications_admin, notifications_admin_db, notify_db_session): - with notifications_admin.test_client() as client: - with client.session_transaction() as session: - user = create_test_user() - session['user_id'] = user.id - verify_codes_dao.add_code(user_id=user.id, code='12345', code_type='sms') - response = client.post('/two-factor') - assert response.status_code == 400 - assert {'sms_code': ['Please enter your code']} == json.loads(response.get_data(as_text=True)) - - -def test_should_return_400_when_sms_code_is_too_short(notifications_admin, notifications_admin_db, notify_db_session): - with notifications_admin.test_client() as client: - with client.session_transaction() as session: - user = create_test_user() - session['user_id'] = user.id - verify_codes_dao.add_code(user_id=user.id, code='23467', code_type='sms') - response = client.post('/two-factor', data={'sms_code': '2346'}) - assert response.status_code == 400 - data = json.loads(response.get_data(as_text=True)) - assert len(data.keys()) == 1 - assert set(data) == set({'sms_code': ['Code must be 5 digits', 'Code does not match']})