Migrate all orgs and services onto new organisation types

Remove all mentions of generic 'nhs' organisation type.
This commit is contained in:
Pea Tyczynska
2019-07-19 14:51:06 +01:00
parent da61bb3b06
commit 5b256fa64e
5 changed files with 122 additions and 7 deletions

View File

@@ -110,8 +110,8 @@ def test_create_service(notify_db_session):
@pytest.mark.parametrize('email_address, organisation_type', (
("test@example.gov.uk", 'nhs'),
("test@nhs.net", 'nhs'),
("test@example.gov.uk", 'nhs_central'),
("test@nhs.net", 'nhs_local'),
("test@nhs.net", 'local'),
("test@nhs.net", 'central'),
("test@nhs.uk", 'central'),

View File

@@ -204,7 +204,7 @@ def test_post_create_organisation_existing_name_raises_400(admin_request, sample
'name': 'Service name',
'crown': False,
'organisation_type': 'foo',
}, 'organisation_type foo is not one of [central, local, nhs_central, nhs, nhs_local, emergency_service, school_or_college, other]'), # noqa
}, 'organisation_type foo is not one of [central, local, nhs_central, nhs_local, emergency_service, school_or_college, other]'), # noqa
))
def test_post_create_organisation_with_missing_data_gives_validation_error(
admin_request,