From 2dec697dc950f9fb7cd4daf614eb4f79750d8dbe Mon Sep 17 00:00:00 2001 From: Pea Tyczynska Date: Thu, 10 Jan 2019 15:43:38 +0000 Subject: [PATCH] Fix a test after merge conflict mixup --- tests/app/main/views/test_notifications.py | 23 +++++----------------- 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/tests/app/main/views/test_notifications.py b/tests/app/main/views/test_notifications.py index 2e010dbc9..40125b565 100644 --- a/tests/app/main/views/test_notifications.py +++ b/tests/app/main/views/test_notifications.py @@ -191,24 +191,11 @@ def test_notification_page_shows_page_for_letter_notification( assert mock_page_count.call_args_list[0][1]['values'] == {'name': 'Jo'} -@pytest.mark.parametrize('notification_status, expected_message', ( - ( - 'permanent-failure', - 'Cancelled 1 January at 1:02am', - ), - ( - 'cancelled', - 'Cancelled 1 January at 1:02am', - ), - ( - 'validation-failed', -<<<<<<< HEAD - 'Validation failed – content is outside the printable area', -======= - 'Can’t print this letter – content is outside the printable area.', ->>>>>>> Cancelled notifications do not show as failures on dashboard stats - ), -)) +@pytest.mark.parametrize('notification_status, expected_message', [ + ('permanent-failure', 'Cancelled 1 January at 1:02am'), + ('cancelled', 'Cancelled 1 January at 1:02am'), + ('validation-failed', 'Validation failed – content is outside the printable area'), +]) @freeze_time("2016-01-01 01:01") def test_notification_page_shows_cancelled_letter( client_request,