diff --git a/app/config.py b/app/config.py index d05be8647..4f48121ce 100644 --- a/app/config.py +++ b/app/config.py @@ -86,6 +86,7 @@ class Config(object): r"cjsm\.net", r"cqc\.org\.uk", r"bl\.uk", + r"stfc\.ac\.uk", ] LOGO_UPLOAD_BUCKET_NAME = 'public-logos-local' diff --git a/app/main/validators.py b/app/main/validators.py index 42cd29c8d..e183f3d89 100644 --- a/app/main/validators.py +++ b/app/main/validators.py @@ -36,7 +36,7 @@ class ValidGovEmail: def __call__(self, form, field): from flask import url_for message = ( - 'Enter a central government email address.' + 'Enter a government email address.' ' If you think you should have access' ' contact us').format(url_for('main.support')) if not is_gov_user(field.data.lower()): diff --git a/app/templates/views/register.html b/app/templates/views/register.html index 682e517f4..540307e74 100644 --- a/app/templates/views/register.html +++ b/app/templates/views/register.html @@ -13,7 +13,7 @@ Create an account

Create an account

{{ 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.password, hint="At least 8 characters", width='3-4') }} diff --git a/requirements.txt b/requirements.txt index db12cedcd..da227e796 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ py-gfm==0.1.3 blinker==1.4 lxml==3.8.0 pyexcel==0.5.3 -pyexcel-io==0.4.3 +pyexcel-io==0.4.4 pyexcel-xls==0.4.0 pyexcel-xlsx==0.4.1 pyexcel-ods3==0.4.0 diff --git a/requirements_for_test.txt b/requirements_for_test.txt index f6733c8eb..393bacdf4 100644 --- a/requirements_for_test.txt +++ b/requirements_for_test.txt @@ -3,7 +3,7 @@ pycodestyle==2.3.1 pytest==3.2.1 pytest-mock==1.6.2 pytest-cov==2.5.1 -pytest-xdist==1.19.0 +pytest-xdist==1.19.1 coveralls==1.1 moto==1.0.1 httpretty==0.8.14 diff --git a/tests/app/main/test_validators.py b/tests/app/main/test_validators.py index 5f17ec2d3..8ed83a8d8 100644 --- a/tests/app/main/test_validators.py +++ b/tests/app/main/test_validators.py @@ -28,7 +28,7 @@ def test_valid_email_not_in_valid_domains( ): form = RegisterUserForm(email_address="test@test.com", mobile_number='441231231231') 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( @@ -94,6 +94,7 @@ def _gen_mock_field(x): 'test@cqc.org.uk', 'test@digital.cqc.org.uk', 'test@bl.uk', + 'test@stfc.ac.uk', ]) def test_valid_list_of_white_list_email_domains( client, diff --git a/tests/app/main/views/test_register.py b/tests/app/main/views/test_register.py index 0c339e24d..e2f9c7aa3 100644 --- a/tests/app/main/views/test_register.py +++ b/tests/app/main/views/test_register.py @@ -96,7 +96,7 @@ def test_should_return_200_when_email_is_not_gov_uk( 'password': 'validPassword!'}) 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(