From f030d9b420881202e787a71fb4fd4f797f52c0e4 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Wed, 5 Jun 2013 16:59:19 -0400 Subject: [PATCH] Make default_logo_check more smarter --- app/models/admin_dashboard_data.rb | 6 +++--- spec/models/admin_dashboard_data_spec.rb | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/models/admin_dashboard_data.rb b/app/models/admin_dashboard_data.rb index 45cd9088375..cd490df12b5 100644 --- a/app/models/admin_dashboard_data.rb +++ b/app/models/admin_dashboard_data.rb @@ -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 diff --git a/spec/models/admin_dashboard_data_spec.rb b/spec/models/admin_dashboard_data_spec.rb index b168c36e9c9..7ff5127fe5c 100644 --- a/spec/models/admin_dashboard_data_spec.rb +++ b/spec/models/admin_dashboard_data_spec.rb @@ -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