IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 02:11:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make default_logo_check more smarter

Browse Source
This commit is contained in:
Neil Lalonde 2013-06-05 16:59:19 -04:00
parent 4e8ff74b99
commit f030d9b420
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/admin_dashboard_data.rb
View File

@ -106,9 +106,9 @@ class AdminDashboardData
end
def default_logo_check
if SiteSetting.logo_url =~ /d-logo-sketch\.png/ or
SiteSetting.logo_small_url =~ /d-logo-sketch-small\.png/ or
SiteSetting.favicon_url =~ /default-favicon\.png/
if SiteSetting.logo_url =~ /#{SiteSetting.defaults[:logo_url].split('/').last}/ or
SiteSetting.logo_small_url =~ /#{SiteSetting.defaults[:logo_small_url].split('/').last}/ or
SiteSetting.favicon_url =~ /#{SiteSetting.defaults[:favicon_url].split('/').last}/
I18n.t('dashboard.default_logo_warning')
end
end

8
spec/models/admin_dashboard_data_spec.rb
View File

@ -157,8 +157,8 @@ describe AdminDashboardData do
expect(subject).to_not be_nil
end
it 'returns a string when favicon_url contains default-favicon.png' do
SiteSetting.stubs(:favicon_url).returns('/discourse/images/default-favicon.png')
it 'returns a string when favicon_url contains default filename' do
SiteSetting.stubs(:favicon_url).returns("/prefix#{SiteSetting.defaults[:favicon_url]}")
expect(subject).to_not be_nil
end
@ -178,8 +178,8 @@ describe AdminDashboardData do
expect(subject).to_not be_nil
end
it 'returns a string when logo_url contains d-logo-sketch.png' do
SiteSetting.stubs(:logo_url).returns('/discourse/images/d-logo-sketch.png')
it 'returns a string when logo_url contains default filename' do
SiteSetting.stubs(:logo_url).returns("/prefix#{SiteSetting.defaults[:logo_url]}")
expect(subject).to_not be_nil
end