diff --git a/requirements.txt b/requirements.txt index dd5d88e03..7aa73ef3f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -29,4 +29,4 @@ whitenoise==1.0.6 #manages static assets # pin to minor version 3.1.x notifications-python-client>=3.1,<3.2 -git+https://github.com/alphagov/notifications-utils.git@13.1.1#egg=notifications-utils==13.1.1 +git+https://github.com/alphagov/notifications-utils.git@13.2.0#egg=notifications-utils==13.2.0 diff --git a/tests/app/main/views/test_jobs.py b/tests/app/main/views/test_jobs.py index 3dda7fa4f..68701fe88 100644 --- a/tests/app/main/views/test_jobs.py +++ b/tests/app/main/views/test_jobs.py @@ -112,7 +112,7 @@ def test_should_show_page_for_one_job( page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') assert page.h1.text.strip() == 'thisisatest.csv' assert page.find('div', {'class': 'sms-message-wrapper'}).text.strip() == ( - '{}: Your vehicle tax is about to expire'.format(service_one['name']) + '{}: Template content with & entity'.format(service_one['name']) ) assert ' '.join(page.find('tbody').find('tr').text.split()) == ( '07123456789 Delivered 1 January at 11:10am' diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py index 452a04ae3..4a99bb590 100644 --- a/tests/app/main/views/test_send.py +++ b/tests/app/main/views/test_send.py @@ -479,7 +479,7 @@ def test_should_show_preview_letter_message( mock_get_service_letter_template.assert_called_with(service_id, template_id) assert mock_letter_preview.call_args[0][0]['message'] == ( '

Subject

\n' - '

Your vehicle tax is about to expire

' + '

Template <em>content</em> with & entity

' ) diff --git a/tests/app/main/views/test_templates.py b/tests/app/main/views/test_templates.py index 5680ffd9b..4ca915753 100644 --- a/tests/app/main/views/test_templates.py +++ b/tests/app/main/views/test_templates.py @@ -35,7 +35,7 @@ def test_should_show_page_for_one_template( assert response.status_code == 200 assert "Two week reminder" in response.get_data(as_text=True) - assert "Your vehicle tax is about to expire" in response.get_data(as_text=True) + assert "Template <em>content</em> with & entity" in response.get_data(as_text=True) assert "Use priority queue?" not in response.get_data(as_text=True) mock_get_service_template.assert_called_with( service_id, template_id) @@ -63,7 +63,7 @@ def test_should_show_page_template_with_priority_select_if_platform_admin( assert response.status_code == 200 assert "Two week reminder" in response.get_data(as_text=True) - assert "Your vehicle tax is about to expire" in response.get_data(as_text=True) + assert "Template <em>content</em> with & entity" in response.get_data(as_text=True) assert "Use priority queue?" in response.get_data(as_text=True) mock_get_service_template.assert_called_with( service_id, template_id) @@ -419,7 +419,7 @@ def test_should_show_delete_template_page_with_time_block(app_, assert 'Test template was last used 10 minutes ago. Are you sure you want to delete it?' in content assert 'Are you sure' in content assert 'Two week reminder' in content - assert 'Your vehicle tax is about to expire' in content + assert 'Template <em>content</em> with & entity' in content mock_get_service_template.assert_called_with(service_id, template_id) @@ -453,7 +453,7 @@ def test_should_show_delete_template_page_with_never_used_block(app_, assert 'Two week reminder has never been used. Are you sure you want to delete it?' in content assert 'Are you sure' in content assert 'Two week reminder' in content - assert 'Your vehicle tax is about to expire' in content + assert 'Template <em>content</em> with & entity' in content mock_get_service_template.assert_called_with(service_id, template_id) diff --git a/tests/conftest.py b/tests/conftest.py index 054952fd9..c04ea82ac 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -232,7 +232,7 @@ def mock_get_services_with_one_service(mocker, fake_uuid, user=None): def mock_get_service_template(mocker): def _get(service_id, template_id, version=None): template = template_json( - service_id, template_id, "Two week reminder", "sms", "Your vehicle tax is about to expire") + service_id, template_id, "Two week reminder", "sms", "Template content with & entity") if version: template.update({'version': version}) return {'data': template} @@ -248,7 +248,7 @@ def mock_get_service_template_with_priority(mocker): def _get(service_id, template_id, version=None): template = template_json( - service_id, template_id, "Two week reminder", "sms", "Your vehicle tax is about to expire", + service_id, template_id, "Two week reminder", "sms", "Template content with & entity", process_type='priority') if version: template.update({'version': version}) @@ -268,7 +268,7 @@ def mock_get_deleted_template(mocker): template_id, "Two week reminder", "sms", - "Your vehicle tax is about to expire", + "Template content with & entity", archived=True ) if version: @@ -325,7 +325,7 @@ def mock_get_template_versions(mocker, fake_uuid, user=None): def mock_get_service_template_with_placeholders(mocker): def _get(service_id, template_id): template = template_json( - service_id, template_id, "Two week reminder", "sms", "((name)), your vehicle tax is about to expire" + service_id, template_id, "Two week reminder", "sms", "((name)), Template content with & entity" ) return {'data': template} @@ -377,7 +377,7 @@ def mock_get_service_letter_template(mocker): template_id, "Two week reminder", "letter", - "Your vehicle tax is about to expire", "Subject") + "Template content with & entity", "Subject") return {'data': template} return mocker.patch(