github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-26 06:21:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Nuke all SiteSetting.stubs from our codebase.

Browse Source
This commit is contained in:
Guo Xiang Tan
2017-07-07 15:09:14 +09:00
parent e7e16de3e0
commit 13f3de4bf6
59 changed files with 257 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spec/controllers/admin/dashboard_controller_spec.rb
View File

@ -22,7 +22,7 @@ describe Admin::DashboardController do
context 'version checking is enabled' do
before do
SiteSetting.stubs(:version_checks).returns(true)
SiteSetting.version_checks = true
end
it 'returns discourse version info' do
@ -34,7 +34,7 @@ describe Admin::DashboardController do
context 'version checking is disabled' do
before do
SiteSetting.stubs(:version_checks).returns(false)
SiteSetting.version_checks = false
end
it 'does not return discourse version info' do

4
spec/controllers/admin/screened_ip_addresses_controller_spec.rb
View File

@ -42,7 +42,7 @@ describe Admin::ScreenedIpAddressesController do
Fabricate(:screened_ip_address, ip_address: "42.42.42.5", match_count: 1)
StaffActionLogger.any_instance.expects(:log_roll_up)
SiteSetting.stubs(:min_ban_entries_for_roll_up).returns(3)
SiteSetting.min_ban_entries_for_roll_up = 3
xhr :post, :roll_up
expect(response).to be_success
@ -62,7 +62,7 @@ describe Admin::ScreenedIpAddressesController do
Fabricate(:screened_ip_address, ip_address: "1.2.42.0/24", match_count: 1)
StaffActionLogger.any_instance.expects(:log_roll_up)
SiteSetting.stubs(:min_ban_entries_for_roll_up).returns(5)
SiteSetting.min_ban_entries_for_roll_up = 5
xhr :post, :roll_up
expect(response).to be_success

9
spec/controllers/admin/site_settings_controller_spec.rb
View File

@ -30,20 +30,21 @@ describe Admin::SiteSettingsController do
end
it 'sets the value when the param is present' do
SiteSetting.expects(:'test_setting=').with('hello').once
xhr :put, :update, id: 'test_setting', test_setting: 'hello'
expect(SiteSetting.test_setting).to eq('hello')
end
it 'allows value to be a blank string' do
SiteSetting.expects(:'test_setting=').with('').once
xhr :put, :update, id: 'test_setting', test_setting: ''
expect(SiteSetting.test_setting).to eq('')
end
it 'logs the change' do
SiteSetting.stubs(:test_setting).returns('previous')
SiteSetting.expects(:'test_setting=').with('hello').once
SiteSetting.test_setting = 'previous'
StaffActionLogger.any_instance.expects(:log_site_setting_change).with('test_setting', 'previous', 'hello')
xhr :put, :update, id: 'test_setting', test_setting: 'hello'
expect(SiteSetting.test_setting).to eq('hello')
end
it 'does not allow changing of hidden settings' do

19
spec/controllers/application_controller_spec.rb
View File

@ -177,8 +177,8 @@ describe TopicsController do
context "allow_user_locale disabled" do
context "accept-language header differs from default locale" do
before do
SiteSetting.stubs(:allow_user_locale).returns(false)
SiteSetting.stubs(:default_locale).returns("en")
SiteSetting.allow_user_locale = false
SiteSetting.default_locale = "en"
set_accept_language("fr")
end
@ -206,9 +206,9 @@ describe TopicsController do
context "set_locale_from_accept_language_header enabled" do
context "accept-language header differs from default locale" do
before do
SiteSetting.stubs(:allow_user_locale).returns(true)
SiteSetting.stubs(:set_locale_from_accept_language_header).returns(true)
SiteSetting.stubs(:default_locale).returns("en")
SiteSetting.allow_user_locale = true
SiteSetting.set_locale_from_accept_language_header = true
SiteSetting.default_locale = "en"
set_accept_language("fr")
end
@ -234,8 +234,9 @@ describe TopicsController do
context "the preferred locale includes a region" do
it "returns the locale and region separated by an underscore" do
SiteSetting.stubs(:set_locale_from_accept_language_header).returns(true)
SiteSetting.stubs(:default_locale).returns("en")
SiteSetting.allow_user_locale = true
SiteSetting.set_locale_from_accept_language_header = true
SiteSetting.default_locale = "en"
set_accept_language("zh-CN")
get :show, {topic_id: topic.id}
@ -246,8 +247,8 @@ describe TopicsController do
context 'accept-language header is not set' do
it 'uses the site default locale' do
SiteSetting.stubs(:allow_user_locale).returns(true)
SiteSetting.stubs(:default_locale).returns('en')
SiteSetting.allow_user_locale = true
SiteSetting.default_locale = 'en'
set_accept_language('')
get :show, {topic_id: topic.id}

2
spec/controllers/invites_controller_spec.rb
View File

@ -283,7 +283,7 @@ describe InvitesController do
context 'new registrations are disabled' do
let(:topic) { Fabricate(:topic) }
let(:invite) { topic.invite_by_email(topic.user, "iceking@adventuretime.ooo") }
before { SiteSetting.stubs(:allow_new_registrations).returns(false) }
before { SiteSetting.allow_new_registrations = false }
it "doesn't redeem the invite" do
Invite.any_instance.stubs(:redeem).never

2
spec/controllers/list_controller_spec.rb
View File

@ -8,7 +8,7 @@ describe ListController do
@post = Fabricate(:post, user: @user)
# forces tests down some code paths
SiteSetting.stubs(:top_menu).returns('latest,-video|new|unread|categories|category/beer')
SiteSetting.top_menu = 'latest,-video|new|unread|categories|category/beer'
end
describe 'titles for crawler layout' do

4
spec/controllers/posts_controller_spec.rb
View File

@ -889,7 +889,7 @@ describe PostsController do
context "when edit history is not visible to the public" do
before { SiteSetting.stubs(:edit_history_visible_to_public).returns(false) }
before { SiteSetting.edit_history_visible_to_public = false }
it "ensures anonymous cannot see the revisions" do
xhr :get, :revisions, post_id: post_revision.post_id, revision: post_revision.number
@ -926,7 +926,7 @@ describe PostsController do
context "when edit history is visible to everyone" do
before { SiteSetting.stubs(:edit_history_visible_to_public).returns(true) }
before { SiteSetting.edit_history_visible_to_public = true }
it "ensures anyone can see the revisions" do
xhr :get, :revisions, post_id: post_revision.post_id, revision: post_revision.number

12
spec/controllers/session_controller_spec.rb
View File

@ -36,7 +36,7 @@ describe SessionController do
# send welcome messages
Fabricate(:admin)
# skip for now
# SiteSetting.stubs("send_welcome_message").returns(false)
# SiteSetting.send_welcome_message = false
end
def get_sso(return_path)
@ -343,9 +343,9 @@ describe SessionController do
describe 'local attribute override from SSO payload' do
before do
SiteSetting.stubs("sso_overrides_email").returns(true)
SiteSetting.stubs("sso_overrides_username").returns(true)
SiteSetting.stubs("sso_overrides_name").returns(true)
SiteSetting.sso_overrides_email = true
SiteSetting.sso_overrides_username = true
SiteSetting.sso_overrides_name = true
@user = Fabricate(:user)
@ -525,7 +525,7 @@ describe SessionController do
describe 'local logins disabled' do
it 'fails' do
SiteSetting.stubs(:enable_local_logins).returns(false)
SiteSetting.enable_local_logins = false
xhr :post, :create, login: user.username, password: 'myawesomepassword'
expect(response.status.to_i).to eq(500)
end
@ -617,7 +617,7 @@ describe SessionController do
let(:permitted_ip_address) { '111.234.23.11' }
before do
Fabricate(:screened_ip_address, ip_address: permitted_ip_address, action_type: ScreenedIpAddress.actions[:allow_admin])
SiteSetting.stubs(:use_admin_ip_whitelist).returns(true)
SiteSetting.use_admin_ip_whitelist = true
end
it 'is successful for admin at the ip address' do

7
spec/controllers/similar_topics_controller_spec.rb
View File

@ -16,7 +16,7 @@ describe SimilarTopicsController do
it "returns no results if the title length is below the minimum" do
Topic.expects(:similar_to).never
SiteSetting.stubs(:min_title_similar_length).returns(100)
SiteSetting.min_title_similar_length = 100
xhr :get, :index, title: title, raw: raw
json = ::JSON.parse(response.body)
expect(json["similar_topics"].size).to eq(0)
@ -24,7 +24,7 @@ describe SimilarTopicsController do
it "returns no results if the body length is below the minimum" do
Topic.expects(:similar_to).never
SiteSetting.stubs(:min_body_similar_length).returns(100)
SiteSetting.min_body_similar_length = 100
xhr :get, :index, title: title, raw: raw
json = ::JSON.parse(response.body)
expect(json["similar_topics"].size).to eq(0)
@ -33,7 +33,7 @@ describe SimilarTopicsController do
describe "minimum_topics_similar" do
before do
SiteSetting.stubs(:minimum_topics_similar).returns(30)
SiteSetting.minimum_topics_similar = 30
end
after do
@ -69,4 +69,3 @@ describe SimilarTopicsController do
end
end

10
spec/controllers/static_controller_spec.rb
View File

@ -54,9 +54,9 @@ describe StaticController do
context 'show' do
before do
post = create_post
SiteSetting.stubs(:tos_topic_id).returns(post.topic.id)
SiteSetting.stubs(:guidelines_topic_id).returns(post.topic.id)
SiteSetting.stubs(:privacy_topic_id).returns(post.topic.id)
SiteSetting.tos_topic_id = post.topic.id
SiteSetting.guidelines_topic_id = post.topic.id
SiteSetting.privacy_topic_id = post.topic.id
end
context "with a static file that's present" do
@ -87,7 +87,7 @@ describe StaticController do
end
context "when #{setting_name} site setting is set" do
before { SiteSetting.stubs(setting_name).returns('http://example.com/page') }
before { SiteSetting.public_send("#{setting_name}=", 'http://example.com/page') }
it "redirects to the #{setting_name}" do
expect(subject).to redirect_to('http://example.com/page')
@ -110,7 +110,7 @@ describe StaticController do
end
it "should display the login template when login is required" do
SiteSetting.stubs(:login_required).returns(true)
SiteSetting.login_required = true
xhr :get, :show, id: 'login'
expect(response).to be_success
end

2
spec/controllers/topics_controller_spec.rb
View File

@ -996,7 +996,7 @@ describe TopicsController do
context "allow_uncategorized_topics is false" do
before do
SiteSetting.stubs(:allow_uncategorized_topics).returns(false)
SiteSetting.allow_uncategorized_topics = false
end
it "can add a category to an uncategorized topic" do