darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-06 11:18:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-permissions

Browse Source
This commit is contained in:
Rebecca Law
2016-03-30 09:32:24 +01:00
parent eb72c6e5bf 3e16fc1962
commit 1cfaeec7b2
11 changed files with 146 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/app/main/views/test_send.py
View File

@@ -40,7 +40,7 @@ def test_upload_csvfile_with_errors_shows_check_page_with_errors(
assert 'Re-upload your file' in content
def test_send_test_message_to_self(
def test_send_test_sms_message_to_self(
app_,
mocker,
api_user_active,
@@ -51,7 +51,7 @@ def test_send_test_message_to_self(
mock_has_permissions
):
expected_data = {'data': ['phone number', '+4412341234'], 'file_name': 'Test run'}
expected_data = {'data': 'phone number\r\n+4412341234\r\n', 'file_name': 'Test run'}
mocker.patch('app.main.views.send.s3download', return_value='phone number\r\n+4412341234')
with app_.test_request_context():
@@ -65,7 +65,7 @@ def test_send_test_message_to_self(
mock_s3_upload.assert_called_with(ANY, '12345', expected_data, 'eu-west-1')
def test_send_test_message_to_self(
def test_send_test_email_message_to_self(
app_,
mocker,
api_user_active,
@@ -247,11 +247,8 @@ def test_check_messages_should_revalidate_file_when_uploading_file(
'app.main.views.send.s3download',
return_value="""
phone number,name,,,
++44 7700 900981,test1,,,
+44 7700 900981,test2,,,
,,,
,,, \t \t
123,test1,,,
123,test2,,,
"""
)
with app_.test_request_context():
@@ -263,7 +260,7 @@ def test_check_messages_should_revalidate_file_when_uploading_file(
'notification_count': job_data['notification_count'],
'valid': True}
response = client.post(
url_for('main.check_messages', service_id=service_id, upload_id=job_data['id']),
url_for('main.start_job', service_id=service_id, upload_id=job_data['id']),
data={'file': (BytesIO(''.encode('utf-8')), 'invalid.csv')},
content_type='multipart/form-data',
follow_redirects=True