Merge pull request #1082 from alphagov/persist-letters

allow creation of letter jobs
This commit is contained in:
Leo Hemsted
2017-01-31 10:31:34 +00:00
committed by GitHub
2 changed files with 5 additions and 21 deletions

View File

@@ -369,7 +369,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'):
@@ -378,14 +377,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,

View File

@@ -409,31 +409,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(