From dc8a727b3fce071010de0586caf3983fbc8de95b Mon Sep 17 00:00:00 2001 From: Martin Brennan Date: Thu, 30 Nov 2023 14:58:55 +1000 Subject: [PATCH] COPY: secure media -> secure uploads (#24643) Fixing up the last few holdouts --- config/locales/server.en.yml | 2 +- plugins/chat/spec/plugin_spec.rb | 4 ++-- .../chat/spec/validators/chat_allow_uploads_validator_spec.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 44bac35c43c..208dd1a4909 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -233,7 +233,7 @@ en: default_tags_already_selected: "You cannot select a tag used in another list." s3_upload_bucket_is_required: "You cannot enable uploads to S3 unless you've provided the 's3_upload_bucket'." enable_s3_uploads_is_required: "You cannot enable usage of the S3 inventory unless you've enabled S3 uploads." - page_publishing_requirements: "Page publishing cannot be enabled if secure media is enabled." + page_publishing_requirements: "Page publishing cannot be enabled if secure uploads is enabled." s3_backup_requires_s3_settings: "You cannot use S3 as backup location unless you've provided the '%{setting_name}'." s3_bucket_reused: "You cannot use the same bucket for 's3_upload_bucket' and 's3_backup_bucket'. Choose a different bucket or use a different path for each bucket." secure_uploads_requirements: "S3 uploads and S3 ACLs must be enabled before enabling secure uploads." diff --git a/plugins/chat/spec/plugin_spec.rb b/plugins/chat/spec/plugin_spec.rb index c5a316cbaea..74df880676f 100644 --- a/plugins/chat/spec/plugin_spec.rb +++ b/plugins/chat/spec/plugin_spec.rb @@ -236,8 +236,8 @@ describe Chat do end end - describe "secure media compatibility" do - it "disables chat uploads if secure media changes from disabled to enabled" do + describe "secure uploads compatibility" do + it "disables chat uploads if secure uploads changes from disabled to enabled" do enable_secure_uploads expect(SiteSetting.chat_allow_uploads).to eq(false) last_history = UserHistory.last diff --git a/plugins/chat/spec/validators/chat_allow_uploads_validator_spec.rb b/plugins/chat/spec/validators/chat_allow_uploads_validator_spec.rb index db24616ab4f..869903d04e1 100644 --- a/plugins/chat/spec/validators/chat_allow_uploads_validator_spec.rb +++ b/plugins/chat/spec/validators/chat_allow_uploads_validator_spec.rb @@ -6,7 +6,7 @@ RSpec.describe Chat::AllowUploadsValidator do expect(validator.valid_value?("f")).to eq(true) end - context "when secure media is enabled" do + context "when secure uploads is enabled" do before do SiteSetting.chat_allow_uploads = false enable_secure_uploads