From 636facb71cd9805495098e98232c53f576d3f2f7 Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Fri, 22 Apr 2016 15:58:17 +0100 Subject: [PATCH 1/2] Updated the contact us link for non gov.uk domains trying to register. --- app/main/validators.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/main/validators.py b/app/main/validators.py index 533ef0cab..846fad424 100644 --- a/app/main/validators.py +++ b/app/main/validators.py @@ -31,8 +31,7 @@ class ValidEmailDomainRegex(object): message = ( 'Enter a central government email address.' ' If you think you should have access' - ' contact us').format( - "https://docs.google.com/forms/d/1AL8U-xJX_HAFEiQiJszGQw0PcEaEUnYATSntEghNDGo/viewform") + ' contact us').format(url_for('main.feedback')) valid_domains = current_app.config.get('EMAIL_DOMAIN_REGEXES', []) email_regex = "[^\@^\s]+@([^@^\\.^\\s]+\.)*({})$".format("|".join(valid_domains)) if not re.match(email_regex, field.data.lower()): From d0c45097618d74f2a7c27542eda4f7f91ed09e91 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Mon, 25 Apr 2016 11:20:43 +0100 Subject: [PATCH 2/2] Fix missing request context in validators tests --- tests/app/main/test_validators.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/app/main/test_validators.py b/tests/app/main/test_validators.py index 6cb034263..aa308dba8 100644 --- a/tests/app/main/test_validators.py +++ b/tests/app/main/test_validators.py @@ -6,14 +6,15 @@ from unittest.mock import Mock def test_should_raise_validation_error_for_password(app_, mock_get_user_by_email): - form = RegisterUserForm() - form.name.data = 'test' - form.email_address.data = 'teset@example.gov.uk' - form.mobile_number.data = '441231231231' - form.password.data = 'password1234' + with app_.test_request_context(): + form = RegisterUserForm() + form.name.data = 'test' + form.email_address.data = 'teset@example.gov.uk' + form.mobile_number.data = '441231231231' + form.password.data = 'password1234' - form.validate() - assert 'That password is blacklisted, too common' in form.errors['password'] + form.validate() + assert 'That password is blacklisted, too common' in form.errors['password'] def test_valid_email_not_in_valid_domains(app_):