Update the service name validation in the ServiceNameForm and AddServiceForm to check the email_safe version

of the name against a list of all service email_from fields.
Update find_all_service_names to find_all_service_email_from, which returns the email_from of all services.
This commit is contained in:
Rebecca Law
2016-03-31 15:17:05 +01:00
parent 1871243cc8
commit 9a2cb60f5e
9 changed files with 53 additions and 31 deletions

View File

@@ -60,10 +60,10 @@ def mock_get_service(mocker, api_user_active):
@pytest.fixture(scope='function')
def mock_create_service(mocker):
def _create(service_name, active, limit, restricted, user_id):
def _create(service_name, active, limit, restricted, user_id, email_from):
service = service_json(
101, service_name, [user_id], limit=limit,
active=active, restricted=restricted)
active=active, restricted=restricted, email_from=email_from)
return service['id']
return mocker.patch(