Merge branch 'master' into inbound_number_admin

This commit is contained in:
Rebecca Law
2017-08-15 15:08:58 +01:00
7 changed files with 8 additions and 6 deletions

View File

@@ -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,

View File

@@ -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(