Remove site setting stubbing (Round 1)

This commit is contained in:
Arpit Jalan
2015-06-03 15:44:00 +05:30
parent 11619247b4
commit b33654ac31
6 changed files with 25 additions and 26 deletions

View File

@ -135,8 +135,8 @@ describe AdminDashboardData do
describe 'favicon_url check' do
before do
SiteSetting.stubs(:logo_url).returns('/assets/my-logo.jpg')
SiteSetting.stubs(:logo_small_url).returns('/assets/my-small-logo.jpg')
SiteSetting.logo_url = '/assets/my-logo.jpg'
SiteSetting.logo_small_url = '/assets/my-small-logo.jpg'
end
it 'returns a string when favicon_url is default' do
@ -144,20 +144,20 @@ describe AdminDashboardData do
end
it 'returns a string when favicon_url contains default filename' do
SiteSetting.stubs(:favicon_url).returns("/prefix#{SiteSetting.defaults[:favicon_url]}")
SiteSetting.favicon_url = "/prefix#{SiteSetting.defaults[:favicon_url]}"
expect(subject).not_to be_nil
end
it 'returns nil when favicon_url does not match default-favicon.png' do
SiteSetting.stubs(:favicon_url).returns('/assets/my-favicon.png')
SiteSetting.favicon_url = '/assets/my-favicon.png'
expect(subject).to be_nil
end
end
describe 'logo_url check' do
before do
SiteSetting.stubs(:favicon_url).returns('/assets/my-favicon.png')
SiteSetting.stubs(:logo_small_url).returns('/assets/my-small-logo.jpg')
SiteSetting.favicon_url = '/assets/my-favicon.png'
SiteSetting.logo_small_url = '/assets/my-small-logo.jpg'
end
it 'returns a string when logo_url is default' do
@ -165,12 +165,12 @@ describe AdminDashboardData do
end
it 'returns a string when logo_url contains default filename' do
SiteSetting.stubs(:logo_url).returns("/prefix#{SiteSetting.defaults[:logo_url]}")
SiteSetting.logo_url = "/prefix#{SiteSetting.defaults[:logo_url]}"
expect(subject).not_to be_nil
end
it 'returns nil when logo_url does not match d-logo-sketch.png' do
SiteSetting.stubs(:logo_url).returns('/assets/my-logo.png')
SiteSetting.logo_url = '/assets/my-logo.png'
expect(subject).to be_nil
end
end