Skip to content

A platform for community discussion. Free, open, simple.

DEV: Fix a state leak in specs (#40658)

Jarek Radosz2f2676180de7
diff --git a/spec/support/site_settings_helpers.rb b/spec/support/site_settings_helpers.rb
index d6abe2e3fbe..3c8da75184d 100644
--- a/spec/support/site_settings_helpers.rb
+++ b/spec/support/site_settings_helpers.rb
@@ -15,10 +15,14 @@ module SiteSettingsHelpers
end
end
+ # GlobalSettings that affect the cache.
+ ASSET_HOST_GLOBAL_SETTINGS = %i[cdn_url s3_cdn_url s3_asset_cdn_url]
+
def global_setting(name, value)
SiteSetting.hidden_settings_provider.remove_hidden(name)
SiteSetting.shadowed_settings.delete(name)
GlobalSetting.reset_s3_cache!
+ Stylesheet::Manager.cache.clear if ASSET_HOST_GLOBAL_SETTINGS.include?(name.to_sym)
GlobalSetting.stubs(name).returns(value)
@@ -26,6 +30,7 @@ module SiteSettingsHelpers
SiteSetting.hidden_settings_provider.remove_hidden(name)
SiteSetting.shadowed_settings.delete(name)
GlobalSetting.reset_s3_cache!
+ Stylesheet::Manager.cache.clear if ASSET_HOST_GLOBAL_SETTINGS.include?(name.to_sym)
end
end