github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 16:34:31 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Avoid deprecated site setting logging in SiteSetting.settings_hash.

Browse Source
This commit is contained in:
Guo Xiang Tan
2018-11-20 11:59:38 +08:00
parent 81b3bdaabd
commit 1a57be3248
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spec/models/site_setting_spec.rb
View File

@ -163,10 +163,10 @@ describe SiteSetting do
it 'should act as a proxy to the new methods' do
begin
original_settings = SiteSettings::DeprecatedSettings::DEPRECATED_SETTINGS
SiteSettings::DeprecatedSettings::DEPRECATED_SETTINGS.clear
original_settings = SiteSettings::DeprecatedSettings::SETTINGS
SiteSettings::DeprecatedSettings::SETTINGS.clear
SiteSettings::DeprecatedSettings::DEPRECATED_SETTINGS.push([
SiteSettings::DeprecatedSettings::SETTINGS.push([
'use_https', 'force_https', true, '0.0.1'
])
@ -186,9 +186,9 @@ describe SiteSetting do
expect(SiteSetting.force_https).to eq(false)
expect(SiteSetting.force_https?).to eq(false)
ensure
SiteSettings::DeprecatedSettings::DEPRECATED_SETTINGS.clear
SiteSettings::DeprecatedSettings::SETTINGS.clear
SiteSettings::DeprecatedSettings::DEPRECATED_SETTINGS.concat(
SiteSettings::DeprecatedSettings::SETTINGS.concat(
original_settings
)
end