Skip to content

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

DEV: Reset test site settings without callbacks (#41960)

Alan Guo Xiang Tan134ae8735527
diff --git a/spec/support/test_setup.rb b/spec/support/test_setup.rb
index 0bb2777a4e1..556b76224ee 100644
--- a/spec/support/test_setup.rb
+++ b/spec/support/test_setup.rb
@@ -18,7 +18,10 @@ module TestSetup
WordWatcher.disable_cache
UpcomingChanges.clear_caches!
- SiteSetting.provider.all.each { |setting| SiteSetting.remove_override!(setting.name) }
+ previous_default_theme_id = SiteSetting.default_theme_id
+ SiteSetting.provider.clear
+ SiteSetting.refresh!
+ Theme.expire_site_cache! if SiteSetting.default_theme_id != previous_default_theme_id
# Set some standard overrides for tests. Some for performance, some to make the tests easier,
# and some because their default was changed, and we didn't want to refactor all the relevant specs.
@@ -33,9 +36,6 @@ module TestSetup
allow_uncategorized_topics: true,
}.each { |k, v| SiteSetting.set(k, v) }
- SiteSetting.refresh!(refresh_site_settings: false, refresh_theme_site_settings: true)
- SiteSetting.refresh_site_setting_group_ids!
-
# very expensive IO operations
SiteSetting.automatically_download_gravatars = false