darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-02-05 19:03:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

109526520: Use Regex validator to test the code is 5 digits.

Browse Source
This commit is contained in:
Rebecca Law
2015-12-08 15:40:45 +00:00
parent 9923c14e73
commit ae19161b32
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/main/forms.py
View File

@@ -20,6 +20,7 @@ class LoginForm(Form):
gov_uk_email = "(^[^@^\\s]+@[^@^\\.^\\s]+(\\.[^@^\\.^\\s]*)*.gov.uk)"
mobile_number = "^\\+44[\\d]{10}$"
verify_code = "[\\d]{5}$"
class RegisterUserForm(Form):
@@ -43,10 +44,10 @@ class RegisterUserForm(Form):
class VerifyForm(Form):
sms_code = StringField("Text message confirmation code",
validators=[DataRequired(message='SMS code can not be empty'),
Length(min=5, max=5, message='Code must be 5 digits')])
Regexp(regex=verify_code, message='Code must be 5 digits')])
email_code = StringField("Email confirmation code",
validators=[DataRequired(message='Email code can not be empty'),
Length(min=5, max=5, message='Code must be 5 digits')])
Regexp(regex=verify_code, message='Code must be 5 digits')])
def validate_email_code(self, a):
if self.email_code.data is not None:

22
tests/app/main/views/test_verify.py
View File

@@ -107,8 +107,28 @@ def test_should_return_400_when_email_code_has_letter(notifications_admin, notif
response = client.post('/verify',
data={'sms_code': '23456',
'email_code': 'abcde'})
data = response.get_data(as_text=True)
assert response.status_code == 400
assert 'Code does not match' in response.get_data(as_text=True)
assert 'email_code' in data
assert 'Code does not match' in data
assert 'Code must be 5 digits' in data
def test_should_return_400_when_sms_code_is_too_short(notifications_admin, notifications_admin_db):
with notifications_admin.test_client() as client:
with client.session_transaction() as session:
user = _create_test_user()
session['user_id'] = user.id
session['sms_code'] = hashpw('23456')
session['email_code'] = hashpw('23456')
response = client.post('/verify',
data={'sms_code': '2345',
'email_code': '23456'})
assert response.status_code == 400
data = response.get_data(as_text=True)
assert 'sms_code' in data
assert 'Code must be 5 digits' in data
assert 'Code does not match' in data
def test_should_return_302_when_email_code_starts_with_zero(notifications_admin, notifications_admin_db):