diff --git a/app/main/views/uploads.py b/app/main/views/uploads.py index 4709b58b4..b4ff77d83 100644 --- a/app/main/views/uploads.py +++ b/app/main/views/uploads.py @@ -19,6 +19,7 @@ from app import current_service, notification_api_client, service_api_client from app.extensions import antivirus_client from app.main import main from app.main.forms import PDFUploadForm +from app.main.views.jobs import view_jobs from app.s3_client.s3_letter_upload_client import ( get_letter_metadata, get_letter_pdf_and_metadata, @@ -38,7 +39,7 @@ MAX_FILE_UPLOAD_SIZE = 2 * 1024 * 1024 # 2MB @main.route("/services//uploads") @user_has_permissions('send_messages') def uploads(service_id): - return render_template('views/uploads/index.html') + return view_jobs(service_id) @main.route("/services//upload-letter", methods=['GET', 'POST']) diff --git a/app/templates/views/uploads/index.html b/app/templates/views/uploads/index.html deleted file mode 100644 index 0b2ad0480..000000000 --- a/app/templates/views/uploads/index.html +++ /dev/null @@ -1,18 +0,0 @@ -{% extends "withnav_template.html" %} -{% from "components/page-header.html" import page_header %} - -{% block service_page_title %} - Uploads -{% endblock %} - -{% block maincolumn_content %} -
-
- {{ page_header('Uploads') }} - -

Upload a letter and Notify will print, pack and post it for you.

- - Upload a letter -
-
-{% endblock %} diff --git a/tests/app/main/views/test_uploads.py b/tests/app/main/views/test_uploads.py index ab4d355b2..a45daaafc 100644 --- a/tests/app/main/views/test_uploads.py +++ b/tests/app/main/views/test_uploads.py @@ -8,6 +8,26 @@ from app.utils import normalize_spaces from tests.conftest import SERVICE_ONE_ID +@pytest.mark.parametrize('extra_permissions', ( + [], + ['letter'], + ['upload_letters'], + pytest.param( + ['letter', 'upload_letters'], + marks=pytest.mark.xfail(raises=AssertionError), + ), +)) +def test_no_upload_letters_button_without_permission( + client_request, + service_one, + mock_get_jobs, + extra_permissions, +): + service_one['permissions'] += extra_permissions + page = client_request.get('main.uploads', service_id=SERVICE_ONE_ID) + assert not page.find('a', text='Upload a letter') + + def test_get_upload_hub_page( client_request, service_one,