darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-26 01:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #381 from alphagov/fix-csv-reupload

Browse Source 
Fix re-uploading of CSV files
This commit is contained in:
Chris Hill-Scott
2016-04-05 10:09:04 +01:00
parent 6992041027 c95123914a
commit a7849bf166
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/main/views/send.py
View File

@@ -252,6 +252,17 @@ def check_messages(service_id, template_type, upload_id):
) )
@main.route("/services/<service_id>/<template_type>/check/<upload_id>", methods=['POST'])
@login_required
@user_has_permissions('send_texts', 'send_emails', 'send_letters')
def recheck_messages(service_id, template_type, upload_id):
if not session.get('upload_data'):
return redirect(url_for('main.choose_template', service_id=service_id, template_type=template_type))
return send_messages(service_id, session['upload_data'].get('template_id'))
@main.route("/services/<service_id>/start-job/<upload_id>", methods=['POST']) @main.route("/services/<service_id>/start-job/<upload_id>", methods=['POST'])
@login_required @login_required
@user_has_permissions('send_texts', 'send_emails', 'send_letters') @user_has_permissions('send_texts', 'send_emails', 'send_letters')

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

@@ -25,19 +25,26 @@ def test_upload_csvfile_with_errors_shows_check_page_with_errors(
with app_.test_request_context(): with app_.test_request_context():
with app_.test_client() as client: with app_.test_client() as client:
client.login(api_user_active) client.login(api_user_active)
response = client.post( initial_upload = client.post(
url_for('main.send_messages', service_id=12345, template_id=54321), url_for('main.send_messages', service_id=12345, template_id=54321),
data={'file': (BytesIO(contents.encode('utf-8')), 'invalid.csv')}, data={'file': (BytesIO(contents.encode('utf-8')), 'invalid.csv')},
content_type='multipart/form-data', content_type='multipart/form-data',
follow_redirects=True follow_redirects=True
) )
assert response.status_code == 200 reupload = client.post(
content = response.get_data(as_text=True) url_for('main.check_messages', service_id=12345, template_type='sms', upload_id='abc123'),
assert 'There was a problem with invalid.csv' in content data={'file': (BytesIO(contents.encode('utf-8')), 'invalid.csv')},
assert '+44 123' in content content_type='multipart/form-data',
assert '+44 456' in content follow_redirects=True
assert 'Not a UK mobile number' in content )
assert 'Re-upload your file' in content for response in [initial_upload, reupload]:
assert response.status_code == 200
content = response.get_data(as_text=True)
assert 'There was a problem with invalid.csv' in content
assert '+44 123' in content
assert '+44 456' in content
assert 'Not a UK mobile number' in content
assert 'Re-upload your file' in content
def test_send_test_sms_message_to_self( def test_send_test_sms_message_to_self(