diff --git a/app/main/views/agreement.py b/app/main/views/agreement.py index 3dd878526..13c3a93a5 100644 --- a/app/main/views/agreement.py +++ b/app/main/views/agreement.py @@ -31,8 +31,7 @@ def service_agreement(service_id): @main.route('/services//agreement.pdf') @user_has_permissions('manage_service') def service_download_agreement(service_id): - return send_file(**get_mou( - )) + return send_file(**get_mou()) @main.route('/services//agreement/accept', methods=['GET', 'POST']) @@ -88,8 +87,7 @@ def public_agreement(variant): abort(404) if request.endpoint == 'main.public_download_agreement': - return send_file(**get_mou( - )) + return send_file(**get_mou()) return render_template( 'views/agreement/agreement-public.html', diff --git a/app/main/views/organisations.py b/app/main/views/organisations.py index 12eb7de98..3c059fb22 100644 --- a/app/main/views/organisations.py +++ b/app/main/views/organisations.py @@ -469,6 +469,4 @@ def organisation_billing(org_id): @main.route('/organisations//agreement.pdf') @user_is_platform_admin def organisation_download_agreement(org_id): - return send_file(**get_mou( - - )) + return send_file(**get_mou()) diff --git a/app/s3_client/s3_mou_client.py b/app/s3_client/s3_mou_client.py index 1aeec1cdf..108d23758 100644 --- a/app/s3_client/s3_mou_client.py +++ b/app/s3_client/s3_mou_client.py @@ -7,8 +7,7 @@ from app.s3_client.s3_logo_client import get_s3_object def get_mou(): bucket = current_app.config['MOU_BUCKET_NAME'] filename = 'agreement.pdf' - attachment_filename = 'U.S. Notify data sharing and financial agreement.pdf'.format( - ) + attachment_filename = 'U.S. Notify data sharing and financial agreement.pdf' try: key = get_s3_object(bucket, filename) return { diff --git a/app/templates/components/uk_components/header/_header.scss b/app/templates/components/uk_components/header/_header.scss index 23f769997..20ffec2a5 100644 --- a/app/templates/components/uk_components/header/_header.scss +++ b/app/templates/components/uk_components/header/_header.scss @@ -263,6 +263,7 @@ background: transparent; } + // Hide the inverted logo when printing in browsers that don't support SVG. .govuk-header__logotype-fallback-image { display: none; } diff --git a/tests/app/main/views/test_agreement.py b/tests/app/main/views/test_agreement.py index 44fc60018..63cd08069 100644 --- a/tests/app/main/views/test_agreement.py +++ b/tests/app/main/views/test_agreement.py @@ -142,7 +142,6 @@ def test_download_service_agreement( 'attachment; filename="{}"'.format(expected_file_served) ) mock_get_s3_object.assert_called_once() - # mock_get_s3_object.assert_called_once_with('test-mou', expected_file_fetched) else: assert not expected_file_fetched assert mock_get_s3_object.called is False