Don’t treat letters as a special case

This conditional comes from before we launched the letters feature.
Since we were only giving the letters permission to teams that we were
inviting, we didn’t want to confuse new users by mentioning letters.

Nowadays all new services will have the letters permission, so this
check is redundant.
This commit is contained in:
Chris Hill-Scott
2020-07-14 14:54:55 +01:00
parent 008e4befb4
commit 9dfa48cfdd
2 changed files with 6 additions and 14 deletions

View File

@@ -31,12 +31,7 @@
{% if current_service.has_permission('broadcast') %}
prepare a broadcast
{%- else %}
send
{% if 'letter' in current_service.permissions %}
emails, text messages or letters
{%- else -%}
emails or text messages
{%- endif %}
send emails, text messages or letters
{%- endif %}.
</p>

View File

@@ -29,15 +29,12 @@ from tests.conftest import (
@pytest.mark.parametrize('permissions, expected_message', (
(['email'], (
'You need a template before you can send emails or text messages.'
)),
(['sms'], (
'You need a template before you can send emails or text messages.'
)),
(['letter'], (
'You need a template before you can send emails, text messages or letters.'
)),
(['sms', 'letter'], (
(['sms'], (
'You need a template before you can send emails, text messages or letters.'
)),
(['letter'], (
'You need a template before you can send emails, text messages or letters.'
)),
(['email', 'sms', 'letter'], (
@@ -88,7 +85,7 @@ def test_should_show_add_template_form_if_service_has_folder_permission(
'Templates'
)
assert normalize_spaces(page.select_one('main p').text) == (
'You need a template before you can send emails or text messages.'
'You need a template before you can send emails, text messages or letters.'
)
assert [
(item['name'], item['value']) for item in page.select('[type=radio]')