diff --git a/app/main/views/templates.py b/app/main/views/templates.py index df395924d..c417576f4 100644 --- a/app/main/views/templates.py +++ b/app/main/views/templates.py @@ -259,7 +259,7 @@ def edit_service_template(service_id, template_id): 'process_type': form.process_type.data }, current_service) template_change = get_template(template, current_service).compare_to(new_template) - if template_change.has_different_placeholders and not request.form.get('confirm'): + if template_change.placeholders_added and not request.form.get('confirm'): example_column_headings = ( first_column_headings[new_template.template_type] + list(new_template.placeholders) diff --git a/tests/app/main/views/test_templates.py b/tests/app/main/views/test_templates.py index 0531fa245..cf0bc3fdd 100644 --- a/tests/app/main/views/test_templates.py +++ b/tests/app/main/views/test_templates.py @@ -405,6 +405,38 @@ def test_should_show_interstitial_when_making_breaking_change( ) +def test_removing_placeholders_is_not_a_breaking_change( + logged_in_client, + mock_get_service_email_template, + mock_update_service_template, + mock_has_permissions, + fake_uuid, +): + service_id = fake_uuid + template_id = fake_uuid + existing_template = mock_get_service_email_template(0, 0)['data'] + response = logged_in_client.post( + url_for( + '.edit_service_template', + service_id=service_id, + template_id=template_id + ), + data={ + 'name': existing_template['name'], + 'template_content': "no placeholders", + 'subject': existing_template['subject'], + } + ) + + assert response.status_code == 302 + assert response.location == url_for( + 'main.view_template', + service_id=service_id, + template_id=template_id, + _external=True, + ) + + def test_should_not_create_too_big_template( logged_in_client, service_one,