IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Properly support defaults for upload site settings.

Browse Source
This commit is contained in:
Guo Xiang Tan
2019-01-02 15:29:17 +08:00
parent 684eef71c7
commit b0c8fdd7da
26 changed files with 170 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spec/models/emoji_spec.rb
View File

@@ -18,7 +18,7 @@ describe Emoji do
describe '.load_custom' do
describe 'when a custom emoji has an invalid upload_id' do
it 'should return the custom emoji without a URL' do
CustomEmoji.create!(name: 'test', upload_id: -1)
CustomEmoji.create!(name: 'test', upload_id: 9999)
emoji = Emoji.load_custom.first

34
spec/models/site_setting_spec.rb
View File

@@ -150,40 +150,6 @@ describe SiteSetting do
end
end
describe '.site_home_logo_url' do
describe 'when logo site setting is set' do
let(:upload) { Fabricate(:upload) }
before do
SiteSetting.logo = upload
end
it 'should return the right URL' do
expect(SiteSetting.site_home_logo_url)
.to eq("#{Discourse.base_url}#{upload.url}")
end
end
describe 'when logo site setting is not set' do
describe 'when there is a custom title' do
before do
SiteSetting.title = "test"
end
it 'should return a blank string' do
expect(SiteSetting.site_home_logo_url).to eq('')
end
end
describe 'when title has not been set' do
it 'should return the default logo url' do
expect(SiteSetting.site_home_logo_url)
.to eq("#{Discourse.base_url}/images/d-logo-sketch.png")
end
end
end
end
context 'deprecated site settings' do
before do
SiteSetting.force_https = true