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

Fix the build take 2.

Browse Source
This commit is contained in:
Guo Xiang Tan
2018-11-14 18:07:04 +08:00
parent 2220345a8b
commit 861b52b6f3
2 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/site_settings/deprecated_settings.rb
View File

@ -16,7 +16,11 @@ module SiteSettings::DeprecatedSettings
def setup_deprecated_methods def setup_deprecated_methods
DEPRECATED_SETTINGS.each do |old_setting, new_setting, override, version| DEPRECATED_SETTINGS.each do |old_setting, new_setting, override, version|
SiteSetting.singleton_class.public_send(:alias_method, :"_#{old_setting}", :"#{old_setting}") unless override
SiteSetting.singleton_class.public_send(
:alias_method, :"_#{old_setting}", :"#{old_setting}"
)
end
define_singleton_method old_setting do |warn: true| define_singleton_method old_setting do |warn: true|
if warn if warn
@ -30,7 +34,11 @@ module SiteSettings::DeprecatedSettings
self.public_send(override ? new_setting : "_#{old_setting}") self.public_send(override ? new_setting : "_#{old_setting}")
end end
SiteSetting.singleton_class.public_send(:alias_method, :"_#{old_setting}?", :"#{old_setting}?") unless override
SiteSetting.singleton_class.public_send(
:alias_method, :"_#{old_setting}?", :"#{old_setting}?"
)
end
define_singleton_method "#{old_setting}?" do |warn: true| define_singleton_method "#{old_setting}?" do |warn: true|
if warn if warn
@ -44,7 +52,11 @@ module SiteSettings::DeprecatedSettings
self.public_send("#{override ? new_setting : "_" + old_setting}?") self.public_send("#{override ? new_setting : "_" + old_setting}?")
end end
SiteSetting.singleton_class.public_send(:alias_method, :"_#{old_setting}=", :"#{old_setting}=") unless override
SiteSetting.singleton_class.public_send(
:alias_method, :"_#{old_setting}=", :"#{old_setting}="
)
end
define_singleton_method "#{old_setting}=" do |val, warn: true| define_singleton_method "#{old_setting}=" do |val, warn: true|
if warn if warn

15
spec/models/site_setting_spec.rb
View File

@ -163,9 +163,12 @@ describe SiteSetting do
it 'should act as a proxy to the new methods' do it 'should act as a proxy to the new methods' do
begin begin
SiteSettings::DeprecatedSettings::DEPRECATED_SETTINGS.push(%w{ original_settings = SiteSettings::DeprecatedSettings::DEPRECATED_SETTINGS
use_https force_https 0.0.1 SiteSettings::DeprecatedSettings::DEPRECATED_SETTINGS.clear
})
SiteSettings::DeprecatedSettings::DEPRECATED_SETTINGS.push([
'use_https', 'force_https', true, '0.0.1'
])
SiteSetting.setup_deprecated_methods SiteSetting.setup_deprecated_methods
@ -183,7 +186,11 @@ describe SiteSetting do
expect(SiteSetting.force_https).to eq(false) expect(SiteSetting.force_https).to eq(false)
expect(SiteSetting.force_https?).to eq(false) expect(SiteSetting.force_https?).to eq(false)
ensure ensure
SiteSettings::DeprecatedSettings::DEPRECATED_SETTINGS.pop SiteSettings::DeprecatedSettings::DEPRECATED_SETTINGS.clear
SiteSettings::DeprecatedSettings::DEPRECATED_SETTINGS.concat(
original_settings
)
end end
end end
end end