use_ssl is just confusing, it means use_https , fix name of setting

This commit is contained in:
Sam
2014-01-09 10:51:38 +11:00
parent 5a036fc17e
commit 1533a1163c
25 changed files with 15 additions and 32 deletions

View File

@@ -16,19 +16,19 @@ describe Discourse do
end
context 'base_url' do
context 'when ssl is off' do
context 'when https is off' do
before do
SiteSetting.expects(:use_ssl?).returns(false)
SiteSetting.expects(:use_https?).returns(false)
end
it 'has a non-ssl base url' do
it 'has a non https base url' do
Discourse.base_url.should == "http://foo.com"
end
end
context 'when ssl is on' do
context 'when https is on' do
before do
SiteSetting.expects(:use_ssl?).returns(true)
SiteSetting.expects(:use_https?).returns(true)
end
it 'has a non-ssl base url' do