Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

GDGT-26 Fix discard-setting-changes helper for settings that use init (#72069)

YBfdd2d558ba57
diff --git a/test/metabase/settings/models/setting_test.clj b/test/metabase/settings/models/setting_test.clj
index e53abe8848d..7bafeec5310 100644
--- a/test/metabase/settings/models/setting_test.clj
+++ b/test/metabase/settings/models/setting_test.clj
@@ -247,6 +247,17 @@
#"Cannot initialize setting before the db is set up"
(setting/get :test-setting-custom-init)))))))
+(deftest discard-setting-changes-with-init-test
+ (testing "discard-setting-changes correctly handles settings with :init"
+ (clear-setting-if-leak!)
+ (let [value-inside (atom nil)]
+ (mt/discard-setting-changes [:test-setting-custom-init]
+ (reset! value-inside (test-setting-custom-init))
+ (testing "the setting returns its initialized value inside the macro, not nil"
+ (is (some? @value-inside))))
+ (testing "after the macro, the setting's initialized value is preserved (not re-initialized)"
+ (is (= @value-inside (test-setting-custom-init)))))))
+
(def ^:private base-options
{:setter :none
:default "totally-basic"})
diff --git a/test/metabase/test/util.clj b/test/metabase/test/util.clj
index 3ad08dd0e50..010814b3f7e 100644
--- a/test/metabase/test/util.clj
+++ b/test/metabase/test/util.clj
@@ -641,8 +641,8 @@
((reduce
(fn [thunk setting-k]
(fn []
- (let [value (setting/read-setting setting-k)]
- (do-with-temporary-setting-value! setting-k value thunk :skip-init? true))))
+ (let [value (setting/get setting-k)]
+ (do-with-temporary-setting-value! setting-k value thunk))))
thunk
settings)))