From f966f67fa760047107b35e632ac11a443dfcd71e Mon Sep 17 00:00:00 2001 From: dinsmol Date: Mon, 30 Aug 2021 22:44:57 +0300 Subject: [PATCH] changed cert filename format --- app/controllers/admin/certificates_controller.rb | 6 ++++-- test/integration/admin_area/certificates_test.rb | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/controllers/admin/certificates_controller.rb b/app/controllers/admin/certificates_controller.rb index d338b2e9f..e9c88b54d 100644 --- a/app/controllers/admin/certificates_controller.rb +++ b/app/controllers/admin/certificates_controller.rb @@ -61,11 +61,13 @@ module Admin end def download_csr - send_data @certificate.csr, filename: "#{@api_user.username}.csr.pem" + filename = "#{@api_user.username}_#{Date.today.strftime("%y%m%d")}_portal.csr.pem" + send_data @certificate.csr, filename: filename end def download_crt - send_data @certificate.crt, filename: "#{@api_user.username}.crt.pem" + filename = "#{@api_user.username}_#{Date.today.strftime("%y%m%d")}_portal.crt.pem" + send_data @certificate.crt, filename: filename end private diff --git a/test/integration/admin_area/certificates_test.rb b/test/integration/admin_area/certificates_test.rb index d2eec0bc4..75face570 100644 --- a/test/integration/admin_area/certificates_test.rb +++ b/test/integration/admin_area/certificates_test.rb @@ -22,24 +22,26 @@ class AdminAreaCertificatesIntegrationTest < JavaScriptApplicationSystemTestCase page.driver.browser.switch_to.alert.accept - assert_text 'Record deleted' + assert_text 'Record deleted' end def test_download_csr + filename = "test_bestnames_#{Date.today.strftime("%y%m%d")}_portal.csr.pem" get download_csr_admin_api_user_certificate_path(api_user_id: @apiuser.id, id: @certificate.id) assert_response :ok assert_equal 'application/octet-stream', response.headers['Content-Type'] - assert_equal "attachment; filename=\"test_bestnames.csr.pem\"; filename*=UTF-8''test_bestnames.csr.pem", response.headers['Content-Disposition'] + assert_equal "attachment; filename=\"#{filename}\"; filename*=UTF-8''#{filename}", response.headers['Content-Disposition'] assert_not_empty response.body end def test_download_crt + filename = "test_bestnames_#{Date.today.strftime("%y%m%d")}_portal.crt.pem" get download_crt_admin_api_user_certificate_path(api_user_id: @apiuser.id, id: @certificate.id) assert_response :ok assert_equal 'application/octet-stream', response.headers['Content-Type'] - assert_equal "attachment; filename=\"test_bestnames.crt.pem\"; filename*=UTF-8''test_bestnames.crt.pem", response.headers['Content-Disposition'] + assert_equal "attachment; filename=\"#{filename}\"; filename*=UTF-8''#{filename}", response.headers['Content-Disposition'] assert_not_empty response.body end