darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-07 03:58:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #594 from GSA/notify-api-316

Browse Source 
Rework downloadable reports and fix process_type
This commit is contained in:
Carlo Costino
2023-07-03 15:12:34 -04:00
committed by GitHub
parent da84a18970 9f88af0ac2
commit 234bbe677b
6 changed files with 16 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/app/main/views/test_template_folders.py
View File

@@ -522,7 +522,6 @@ def test_can_create_email_template_with_parent_folder(
'template_content': "here's a burrito 🌯",
'template_type': 'email',
'service': SERVICE_ONE_ID,
'process_type': 'normal',
'parent_folder_id': PARENT_FOLDER_ID
}
client_request.post('.add_service_template',
@@ -540,7 +539,6 @@ def test_can_create_email_template_with_parent_folder(
data['template_content'],
SERVICE_ONE_ID,
data['subject'],
data['process_type'],
data['parent_folder_id'])

14
tests/app/main/views/test_templates.py
View File

@@ -1110,7 +1110,6 @@ def test_should_redirect_when_saving_a_template(
'template_content': content,
'template_type': 'sms',
'service': SERVICE_ONE_ID,
'process_type': 'normal',
},
_expected_status=302,
_expected_redirect=url_for(
@@ -1120,7 +1119,7 @@ def test_should_redirect_when_saving_a_template(
),
)
mock_update_service_template.assert_called_with(
fake_uuid, name, 'sms', content, SERVICE_ONE_ID, None, 'normal',
fake_uuid, name, 'sms', content, SERVICE_ONE_ID, None
)
@@ -1140,7 +1139,6 @@ def test_should_edit_content_when_process_type_is_priority_not_platform_admin(
'template_content': "new template <em>content</em> with & entity",
'template_type': 'sms',
'service': SERVICE_ONE_ID,
'process_type': 'priority',
},
_expected_status=302,
_expected_redirect=url_for(
@@ -1155,8 +1153,7 @@ def test_should_edit_content_when_process_type_is_priority_not_platform_admin(
'sms',
"new template <em>content</em> with & entity",
SERVICE_ONE_ID,
None,
'priority'
None
)
@@ -1420,7 +1417,6 @@ def test_should_redirect_when_saving_a_template_email(
'template_type': 'email',
'service': SERVICE_ONE_ID,
'subject': subject,
'process_type': 'normal'
},
_expected_status=302,
_expected_redirect=url_for(
@@ -1430,7 +1426,7 @@ def test_should_redirect_when_saving_a_template_email(
),
)
mock_update_service_template.assert_called_with(
fake_uuid, name, 'email', content, SERVICE_ONE_ID, subject, 'normal',
fake_uuid, name, 'email', content, SERVICE_ONE_ID, subject
)
@@ -1803,7 +1799,6 @@ def test_should_create_sms_template_without_downgrading_unicode_characters(
'template_content': msg,
'template_type': template_type,
'service': SERVICE_ONE_ID,
'process_type': 'normal'
},
expected_status=302,
)
@@ -1814,8 +1809,7 @@ def test_should_create_sms_template_without_downgrading_unicode_characters(
msg, # content
ANY, # service_id
ANY, # subject
ANY, # process_type
ANY, # parent_folder_id
ANY # parent_folder_id
)

8
tests/app/utils/test_csv.py
View File

@@ -77,14 +77,14 @@ def _get_notifications_csv_mock(
@pytest.mark.parametrize('created_by_name, expected_content', [
(
None, [
'Recipient,Reference,Template,Type,Sent by,Sent by email,Job,Status,Time\n',
'foo@bar.com,ref 1234,foo,sms,,sender@email.gsa.gov,,Delivered,1943-04-19 12:00:00\r\n',
'Recipient,Template,Type,Sent by,Job,Status,Time\n',
'foo@bar.com,foo,sms,,,Delivered,1943-04-19 12:00:00\r\n',
]
),
(
'Anne Example', [
'Recipient,Reference,Template,Type,Sent by,Sent by email,Job,Status,Time\n',
'foo@bar.com,ref 1234,foo,sms,Anne Example,sender@email.gsa.gov,,Delivered,1943-04-19 12:00:00\r\n',
'Recipient,Template,Type,Sent by,Job,Status,Time\n',
'foo@bar.com,foo,sms,Anne Example,,Delivered,1943-04-19 12:00:00\r\n',
]
),
])