mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-07-27 11:19:21 -04:00
Merge pull request #3672 from alphagov/no-personalisation-broadcast
Don’t allow or highlight personalisation in broadcast templates
This commit is contained in:
@@ -47,6 +47,7 @@ from app.main.validators import (
|
||||
MustContainAlphanumericCharacters,
|
||||
NoCommasInPlaceHolders,
|
||||
NoEmbeddedImagesInSVG,
|
||||
NoPlaceholders,
|
||||
OnlySMSCharacters,
|
||||
ValidEmail,
|
||||
ValidGovEmail,
|
||||
@@ -1217,6 +1218,7 @@ class SMSTemplateForm(BaseTemplateForm):
|
||||
class BroadcastTemplateForm(SMSTemplateForm):
|
||||
def validate_template_content(self, field):
|
||||
OnlySMSCharacters(template_type='broadcast')(None, field)
|
||||
NoPlaceholders()(None, field)
|
||||
|
||||
|
||||
class LetterAddressForm(StripWhitespaceForm):
|
||||
|
||||
@@ -108,6 +108,18 @@ class OnlySMSCharacters:
|
||||
)
|
||||
|
||||
|
||||
class NoPlaceholders:
|
||||
|
||||
def __init__(self, message=None):
|
||||
self.message = message or (
|
||||
'You can’t use ((double brackets)) to personalise this message'
|
||||
)
|
||||
|
||||
def __call__(self, form, field):
|
||||
if Field(field.data).placeholders:
|
||||
raise ValidationError(self.message)
|
||||
|
||||
|
||||
class LettersNumbersFullStopsAndUnderscoresOnly:
|
||||
|
||||
regex = re.compile(r'^[a-zA-Z0-9\s\._]+$')
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
}) }}
|
||||
</div>
|
||||
<div class="govuk-grid-column-two-thirds">
|
||||
{{ textbox(form.template_content, highlight_placeholders=True, width='1-1', rows=5) }}
|
||||
{{ textbox(form.template_content, highlight_placeholders=False, width='1-1', rows=5) }}
|
||||
{{ sticky_page_footer('Save') }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -399,6 +399,21 @@ def test_should_show_page_for_one_template(
|
||||
mock_get_service_template.assert_called_with(SERVICE_ONE_ID, template_id, None)
|
||||
|
||||
|
||||
def test_broadcast_template_doesnt_highlight_placeholders(
|
||||
client_request,
|
||||
service_one,
|
||||
mock_get_broadcast_template,
|
||||
fake_uuid,
|
||||
):
|
||||
service_one['permissions'] += ['broadcast']
|
||||
page = client_request.get(
|
||||
'.edit_service_template',
|
||||
service_id=SERVICE_ONE_ID,
|
||||
template_id=fake_uuid,
|
||||
)
|
||||
assert page.select_one('textarea')['data-highlight-placeholders'] == 'false'
|
||||
|
||||
|
||||
def test_caseworker_redirected_to_one_off(
|
||||
client_request,
|
||||
mock_get_service_templates,
|
||||
@@ -2389,3 +2404,40 @@ def test_set_template_sender_escapes_letter_contact_block_names(
|
||||
radio_text = page.select_one('.govuk-grid-column-three-quarters label[for="sender-1"]').decode_contents()
|
||||
assert "<script>" in radio_text
|
||||
assert "<script>" not in radio_text
|
||||
|
||||
|
||||
@pytest.mark.parametrize('template_content', (
|
||||
'This is a ((test))',
|
||||
'This ((unsure??might)) be a test',
|
||||
pytest.param('This is a test', marks=pytest.mark.xfail),
|
||||
))
|
||||
@pytest.mark.parametrize('template_type', (
|
||||
'broadcast',
|
||||
pytest.param('sms', marks=pytest.mark.xfail),
|
||||
))
|
||||
def test_should_not_create_broadcast_template_with_placeholders(
|
||||
client_request,
|
||||
service_one,
|
||||
mock_create_service_template,
|
||||
mock_update_service_template,
|
||||
template_content,
|
||||
template_type,
|
||||
):
|
||||
service_one['permissions'] += [template_type]
|
||||
page = client_request.post(
|
||||
'.add_service_template',
|
||||
service_id=SERVICE_ONE_ID,
|
||||
template_type=template_type,
|
||||
_data={
|
||||
'name': 'new name',
|
||||
'template_content': template_content,
|
||||
'service': SERVICE_ONE_ID,
|
||||
},
|
||||
_expected_status=200,
|
||||
)
|
||||
assert normalize_spaces(
|
||||
page.select_one('.error-message').text
|
||||
) == (
|
||||
'You can’t use ((double brackets)) to personalise this message'
|
||||
)
|
||||
assert mock_create_service_template.called is False
|
||||
|
||||
Reference in New Issue
Block a user