darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-14 02:09:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Introduce new org types

Browse Source
This commit is contained in:
Pea Tyczynska
2019-07-15 18:03:59 +01:00
parent 42300371b0
commit 77d281f44f
7 changed files with 52 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/app/main/views/organisations/test_organisation.py
View File

@@ -90,7 +90,11 @@ def test_page_to_create_new_organisation(
('text', 'name', ''),
('radio', 'organisation_type', 'central'),
('radio', 'organisation_type', 'local'),
('radio', 'organisation_type', 'nhs'),
('radio', 'organisation_type', 'nhs_central'),
('radio', 'organisation_type', 'nhs_local'),
('radio', 'organisation_type', 'emergency_service'),
('radio', 'organisation_type', 'school_or_college'),
('radio', 'organisation_type', 'other'),
('radio', 'crown_status', 'crown'),
('radio', 'crown_status', 'non-crown'),
('hidden', 'csrf_token', ANY),
@@ -275,7 +279,11 @@ def test_organisation_settings_for_platform_admin(
(
('central', 'Central government'),
('local', 'Local government'),
('nhs', 'NHS'),
('nhs_central', 'NHS – central government agency or public body'),
('nhs_local', 'NHS Trust, GP surgery or Clinical Commissioning Group'),
('emergency_service', 'Emergency service'),
('school_or_college', 'School or college'),
('other', 'Other'),
),
None,
),
@@ -358,8 +366,8 @@ def test_view_organisation_settings(
),
(
'.edit_organisation_type',
{'organisation_type': 'nhs'},
{'organisation_type': 'nhs'},
{'organisation_type': 'nhs_local'},
{'organisation_type': 'nhs_local'},
),
(
'.edit_organisation_crown_status',

26
tests/app/main/views/test_add_service.py
View File

@@ -41,14 +41,22 @@ def test_get_should_render_add_service_template(
] == [
'Central government',
'Local government',
'NHS',
'NHS – central government agency or public body',
'NHS Trust, GP surgery or Clinical Commissioning Group',
'Emergency service',
'School or college',
'Other',
]
assert [
radio['value'] for radio in page.select('.multiple-choice input')
] == [
'central',
'local',
'nhs',
'nhs_central',
'nhs_local',
'emergency_service',
'school_or_college',
'other',
]
@@ -71,8 +79,12 @@ def test_get_should_not_render_radios_if_org_type_known(
@pytest.mark.parametrize('inherited, posted, persisted, sms_limit', (
(None, 'central', 'central', 250000),
('central', None, 'central', 250000),
('nhs', None, 'nhs', 25000),
('nhs_central', None, 'nhs_central', 250000),
('nhs_local', None, 'nhs_local', 25000),
('local', None, 'local', 25000),
('emergency_service', None, 'emergency_service', 25000),
('school_or_college', None, 'school_or_college', 25000),
('other', None, 'other', 25000),
('central', 'local', 'central', 250000),
))
def test_should_add_service_and_redirect_to_tour_when_no_services(
@@ -189,13 +201,17 @@ def test_add_service_guesses_org_type_for_unknown_nhs_orgs(
'main.add_service',
_data={'name': 'example'},
)
assert mock_create_service.call_args[1]['organisation_type'] == 'nhs'
assert mock_create_service.call_args[1]['organisation_type'] == 'nhs_local'
@pytest.mark.parametrize('organisation_type, free_allowance', [
('central', 250 * 1000),
('local', 25 * 1000),
('nhs', 25 * 1000),
('nhs_central', 250 * 1000),
('nhs_local', 25 * 1000),
('school_or_college', 25 * 1000),
('emergency_service', 25 * 1000),
('other', 25 * 1000),
])
def test_should_add_service_and_redirect_to_dashboard_when_existing_service(
app_,