Merge pull request #490 from alphagov/contact-link-signup

Updated the contact us link for non gov.uk domains trying to register.

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'
-            ' <a href="{}">contact us</a>').format(
-                "https://docs.google.com/forms/d/1AL8U-xJX_HAFEiQiJszGQw0PcEaEUnYATSntEghNDGo/viewform")
+            ' <a href="{}">contact us</a>').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()):

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_):