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

Only show nhs radios if user has nhs domain email

Browse Source 
Also split local NHS into two groups following designer advice
on readability.
This commit is contained in:
Pea Tyczynska
2019-07-16 15:37:27 +01:00
parent 77d281f44f
commit c8ed608c9a
9 changed files with 67 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,6 +92,7 @@ def test_page_to_create_new_organisation(
('radio', 'organisation_type', 'local'),
('radio', 'organisation_type', 'nhs_central'),
('radio', 'organisation_type', 'nhs_local'),
('radio', 'organisation_type', 'nhs_local'),
('radio', 'organisation_type', 'emergency_service'),
('radio', 'organisation_type', 'school_or_college'),
('radio', 'organisation_type', 'other'),
@@ -280,7 +281,8 @@ def test_organisation_settings_for_platform_admin(
('central', 'Central government'),
('local', 'Local government'),
('nhs_central', 'NHS – central government agency or public body'),
('nhs_local', 'NHS Trust, GP surgery or Clinical Commissioning Group'),
('nhs_local', 'NHS Trust or Clinical Commissioning Group'),
('nhs_local', 'GP practice'),
('emergency_service', 'Emergency service'),
('school_or_college', 'School or college'),
('other', 'Other'),

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

@@ -42,7 +42,8 @@ def test_get_should_render_add_service_template(
'Central government',
'Local government',
'NHS – central government agency or public body',
'NHS Trust, GP surgery or Clinical Commissioning Group',
'NHS Trust or Clinical Commissioning Group',
'GP practice',
'Emergency service',
'School or college',
'Other',
@@ -54,6 +55,7 @@ def test_get_should_render_add_service_template(
'local',
'nhs_central',
'nhs_local',
'nhs_local',
'emergency_service',
'school_or_college',
'other',
@@ -175,20 +177,11 @@ def test_add_service_has_to_choose_org_type(
'test@nhs.uk',
'test@example.NhS.uK',
'test@EXAMPLE.NHS.NET',
pytest.param(
'test@not-nhs.uk',
marks=pytest.mark.xfail(raises=AssertionError)
)
))
def test_add_service_guesses_org_type_for_unknown_nhs_orgs(
mocker,
def test_get_should_only_show_nhs_org_types_radios_if_user_has_nhs_email(
client_request,
mock_create_service,
mock_create_service_template,
mock_get_services_with_no_services,
mocker,
api_user_active,
mock_create_or_update_free_sms_fragment_limit,
mock_get_all_email_branding,
email_address,
):
api_user_active['email_address'] = email_address
@@ -197,11 +190,23 @@ def test_add_service_guesses_org_type_for_unknown_nhs_orgs(
'app.organisations_client.get_organisation_by_domain',
return_value=None,
)
client_request.post(
'main.add_service',
_data={'name': 'example'},
)
assert mock_create_service.call_args[1]['organisation_type'] == 'nhs_local'
page = client_request.get('main.add_service')
assert page.select_one('h1').text.strip() == 'About your service'
assert page.select_one('input[name=name]')['value'] == ''
assert [
label.text.strip() for label in page.select('.multiple-choice label')
] == [
'NHS – central government agency or public body',
'NHS Trust or Clinical Commissioning Group',
'GP practice',
]
assert [
radio['value'] for radio in page.select('.multiple-choice input')
] == [
'nhs_central',
'nhs_local',
'nhs_local',
]
@pytest.mark.parametrize('organisation_type, free_allowance', [

2
tests/app/main/views/test_service_settings.py
View File

@@ -955,7 +955,7 @@ def test_should_not_show_go_live_button_if_checklist_not_complete(
),
(
None,
'nhs',
'nhs_local',
1,
[{'is_default': True, 'sms_sender': 'KUVOG'}],
'Change your text message sender name Completed',