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

DEV: Re-enable site setting deprecation specs (#24258)

Browse Source 
Followup to baeac8f105cff8bbe70db67789bc96883cb185bc
This commit is contained in:
Martin Brennan
2023-11-07 11:50:20 +10:00
committed by GitHub
parent 2797e0478e
commit 6bf66ccd1a
1 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
spec/lib/site_setting_extension_spec.rb
View File

@ -834,27 +834,24 @@ RSpec.describe SiteSettingExtension do
end end
context "for deprecated settings" do context "for deprecated settings" do
let(:fake_logger) { FakeLogger.new }
before do before do
@orig_logger = Rails.logger @orig_logger = Rails.logger
Rails.logger = @fake_logger = FakeLogger.new Rails.logger = fake_logger
end end
after { Rails.logger = @orig_logger } after { Rails.logger = @orig_logger }
xit "does not log deprecation warnings" do it "does not log deprecation warnings" do
begin stub_const(
original_settings = SiteSettings::DeprecatedSettings::SETTINGS.dup SiteSettings::DeprecatedSettings,
SiteSettings::DeprecatedSettings::SETTINGS.clear "SETTINGS",
SiteSettings::DeprecatedSettings::SETTINGS.push( [["use_https", "force_https", true, "0.0.1"]],
["use_https", "force_https", true, "0.0.1"], ) do
)
SiteSetting.setup_deprecated_methods SiteSetting.setup_deprecated_methods
SiteSetting.client_settings_json_uncached SiteSetting.client_settings_json_uncached
expect(@fake_logger.warnings).to eq([]) expect(fake_logger.warnings).to eq([])
ensure
SiteSettings::DeprecatedSettings::SETTINGS.clear
SiteSettings::DeprecatedSettings::SETTINGS.concat(original_settings)
end end
end end
end end
@ -862,27 +859,24 @@ RSpec.describe SiteSettingExtension do
describe ".settings_hash" do describe ".settings_hash" do
context "for deprecated settings" do context "for deprecated settings" do
let(:fake_logger) { FakeLogger.new }
before do before do
@orig_logger = Rails.logger @orig_logger = Rails.logger
Rails.logger = @fake_logger = FakeLogger.new Rails.logger = fake_logger
end end
after { Rails.logger = @orig_logger } after { Rails.logger = @orig_logger }
xit "does not log deprecation warnings" do it "does not log deprecation warnings" do
begin stub_const(
original_settings = SiteSettings::DeprecatedSettings::SETTINGS.dup SiteSettings::DeprecatedSettings,
SiteSettings::DeprecatedSettings::SETTINGS.clear "SETTINGS",
SiteSettings::DeprecatedSettings::SETTINGS.push( [["use_https", "force_https", true, "0.0.1"]],
["use_https", "force_https", true, "0.0.1"], ) do
)
SiteSetting.setup_deprecated_methods SiteSetting.setup_deprecated_methods
SiteSetting.settings_hash SiteSetting.settings_hash
expect(@fake_logger.warnings).to eq([]) expect(fake_logger.warnings).to eq([])
ensure
SiteSettings::DeprecatedSettings::SETTINGS.clear
SiteSettings::DeprecatedSettings::SETTINGS.concat(original_settings)
end end
end end
end end