github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 15:28:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Safely skip secure_media steps when it's not enabled (#11110)

Browse Source 
* FIX: Safely skip secure_media steps when it's not enabled

* DEV: Secure media tests should enable secure media
This commit is contained in:
Rafael dos Santos Silva
2020-11-03 13:53:15 -03:00
committed by GitHub
parent d2116f0029
commit b70b3e867c
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spec/components/email/styles_spec.rb
View File

@ -188,6 +188,11 @@ describe Email::Styles do
end
context "replace_secure_media_urls" do
before do
setup_s3
SiteSetting.secure_media = true
end
let(:attachments) { { 'testimage.png' => stub(url: 'email/test.png') } }
it "replaces secure media within a link with a placeholder" do
frag = html_fragment("<a href=\"#{Discourse.base_url}\/secure-media-uploads/original/1X/testimage.png\"><img src=\"/secure-media-uploads/original/1X/testimage.png\"></a>")
@ -208,6 +213,11 @@ describe Email::Styles do
end
context "inline_secure_images" do
before do
setup_s3
SiteSetting.secure_media = true
end
let(:attachments) { { 'testimage.png' => stub(url: 'cid:email/test.png') } }
fab!(:upload) { Fabricate(:upload, original_filename: 'testimage.png', secure: true, sha1: '123456') }
let(:html) { "<a href=\"#{Discourse.base_url}\/secure-media-uploads/original/1X/123456.png\"><img src=\"/secure-media-uploads/original/1X/123456.png\" width=\"20\" height=\"30\"></a>" }