From 51f3e0478acff7e3ba13621750779dfa971562f3 Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Fri, 20 Jan 2017 16:20:37 +0000 Subject: [PATCH] allow creation of letter jobs --- app/main/views/send.py | 9 --------- tests/app/main/views/test_send.py | 17 +++++------------ 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/app/main/views/send.py b/app/main/views/send.py index 5df777946..580202a81 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -363,7 +363,6 @@ def recheck_messages(service_id, template_type, upload_id): @login_required @user_has_permissions('send_texts', 'send_emails', 'send_letters') def start_job(service_id, upload_id): - upload_data = session['upload_data'] if request.files or not upload_data.get('valid'): @@ -372,14 +371,6 @@ def start_job(service_id, upload_id): session.pop('upload_data') - template = service_api_client.get_service_template( - service_id, - upload_data.get('template_id') - )['data'] - - if template['template_type'] == 'letter': - abort(403) - job_api_client.create_job( upload_id, service_id, diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py index 73c7ddefa..270cfde08 100644 --- a/tests/app/main/views/test_send.py +++ b/tests/app/main/views/test_send.py @@ -407,31 +407,24 @@ def test_create_job_should_call_api( ) -def test_cant_start_letters_job( - app_, - client, - service_one, - mock_get_service, - active_user_with_permissions, +def test_can_start_letters_job( + logged_in_client, mock_create_job, mock_get_service_letter_template, - mocker, fake_uuid ): - client.login(active_user_with_permissions, mocker, service_one) - with client.session_transaction() as session: + with logged_in_client.session_transaction() as session: session['upload_data'] = { 'original_file_name': 'example.csv', 'template_id': fake_uuid, 'notification_count': 123, 'valid': True } - response = client.post( + response = logged_in_client.post( url_for('main.start_job', service_id=fake_uuid, upload_id=fake_uuid), data={} ) - assert response.status_code == 403 - mock_create_job.assert_not_called() + assert response.status_code == 302 @pytest.mark.parametrize(