github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-07 09:57:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Upload#short_url generates incorrect URL when extension is nil.

Browse Source
This commit is contained in:
Guo Xiang Tan
2019-06-19 09:10:50 +08:00
parent e8b9f38374
commit 73a45048a0
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spec/models/post_spec.rb
View File

@ -1234,6 +1234,7 @@ describe Post do
fab!(:audio_upload) { Fabricate(:upload, extension: "ogg") }
fab!(:attachment_upload) { Fabricate(:upload, extension: "csv") }
fab!(:attachment_upload_2) { Fabricate(:upload) }
fab!(:attachment_upload_3) { Fabricate(:upload, extension: nil) }
let(:base_url) { "#{Discourse.base_url_no_prefix}#{Discourse.base_uri}" }
let(:video_url) { "#{base_url}#{video_upload.url}" }
@ -1243,6 +1244,7 @@ describe Post do
<<~RAW
<a href="#{attachment_upload.url}">Link</a>
[test|attachment](#{attachment_upload_2.short_url})
[test3|attachment](#{attachment_upload_3.short_url})
<img src="#{image_upload.url}">
<video width="100%" height="100%" controls>
@ -1272,7 +1274,8 @@ describe Post do
image_upload.id,
audio_upload.id,
attachment_upload.id,
attachment_upload_2.id
attachment_upload_2.id,
attachment_upload_3.id
)
end

3
spec/models/upload_spec.rb
View File

@ -235,6 +235,9 @@ describe Upload do
it "should generate a correct short url" do
upload = Upload.new(sha1: 'bda2c513e1da04f7b4e99230851ea2aafeb8cc4e', extension: 'png')
expect(upload.short_url).to eq('upload://r3AYqESanERjladb4vBB7VsMBm6.png')
upload.extension = nil
expect(upload.short_url).to eq('upload://r3AYqESanERjladb4vBB7VsMBm6')
end
end