darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-02-12 14:34:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix a test after merge conflict mixup

Browse Source
This commit is contained in:
Pea Tyczynska
2019-01-10 15:43:38 +00:00
parent 9f99ebd53b
commit 2dec697dc9
1 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/app/main/views/test_notifications.py
View File

@@ -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,