darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-05 20:28:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1418 from alphagov/local-email-address-for-local-government

Browse Source 
Tell local government folk that they can sign up
This commit is contained in:
Chris Hill-Scott
2017-08-11 16:20:06 +01:00
committed by GitHub
parent 95258488aa a10e76a9c2
commit 77452b1b25
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/validators.py
View File

@@ -36,7 +36,7 @@ class ValidGovEmail:
def __call__(self, form, field): def __call__(self, form, field):
from flask import url_for from flask import url_for
message = ( message = (
'Enter a central government email address.' 'Enter a government email address.'
' If you think you should have access' ' If you think you should have access'
' <a href="{}">contact us</a>').format(url_for('main.support')) ' <a href="{}">contact us</a>').format(url_for('main.support'))
if not is_gov_user(field.data.lower()): if not is_gov_user(field.data.lower()):

2
app/templates/views/register.html
View File

@@ -13,7 +13,7 @@ Create an account
<h1 class="heading-large">Create an account</h1> <h1 class="heading-large">Create an account</h1>
<form method="post" novalidate> <form method="post" novalidate>
{{ textbox(form.name, width='3-4') }} {{ textbox(form.name, width='3-4') }}
{{ textbox(form.email_address, hint="Must be from a central government organisation", width='3-4', safe_error_message=True) }} {{ textbox(form.email_address, hint="Must be from a government organisation", width='3-4', safe_error_message=True) }}
{{ textbox(form.mobile_number, width='3-4', hint='We’ll send you a security code by text message') }} {{ textbox(form.mobile_number, width='3-4', hint='We’ll send you a security code by text message') }}
<input class="visually-hidden" aria-hidden="true" tabindex="-1" id="defeat-chrome-autocomplete"> <input class="visually-hidden" aria-hidden="true" tabindex="-1" id="defeat-chrome-autocomplete">
{{ textbox(form.password, hint="At least 8 characters", width='3-4') }} {{ textbox(form.password, hint="At least 8 characters", width='3-4') }}

2
tests/app/main/test_validators.py
View File

@@ -28,7 +28,7 @@ def test_valid_email_not_in_valid_domains(
): ):
form = RegisterUserForm(email_address="test@test.com", mobile_number='441231231231') form = RegisterUserForm(email_address="test@test.com", mobile_number='441231231231')
assert not form.validate() assert not form.validate()
assert "Enter a central government email address" in form.errors['email_address'][0] assert "Enter a government email address" in form.errors['email_address'][0]
def test_valid_email_in_valid_domains( def test_valid_email_in_valid_domains(

2
tests/app/main/views/test_register.py
View File

@@ -96,7 +96,7 @@ def test_should_return_200_when_email_is_not_gov_uk(
'password': 'validPassword!'}) 'password': 'validPassword!'})
assert response.status_code == 200 assert response.status_code == 200
assert 'Enter a central government email address' in response.get_data(as_text=True) assert 'Enter a government email address' in response.get_data(as_text=True)
def test_should_add_user_details_to_session( def test_should_add_user_details_to_session(