From 65cfb4ef10ac08de60cc98cfc3054cd0910f5180 Mon Sep 17 00:00:00 2001
From: Noah Moss <32746338+noahmoss@users.noreply.github.com>
Date: Wed, 21 Jul 2021 08:22:00 -0700
Subject: [PATCH] site-url test improvements (#17142)
---
test/metabase/server/middleware/misc_test.clj | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/test/metabase/server/middleware/misc_test.clj b/test/metabase/server/middleware/misc_test.clj
index f491fe544ac..4698269c5ed 100644
--- a/test/metabase/server/middleware/misc_test.clj
+++ b/test/metabase/server/middleware/misc_test.clj
@@ -33,9 +33,14 @@
(public-settings/site-url)))))))
(testing "Site URL should not be inferred from healthcheck requests"
(mt/with-temporary-setting-values [site-url nil]
- (let [request (ring.mock/request :get "/api/health")]
+ (let [request (mock-request "/api/health" "https://mb1.example.com" nil nil)]
(maybe-set-site-url request)
(is (nil? (public-settings/site-url))))))
+ (testing "Site URL should not be inferred if already set in DB"
+ (mt/with-temporary-setting-values [site-url "https://mb1.example.com"]
+ (let [request (mock-request "/" "https://mb2.example.com" nil nil)]
+ (maybe-set-site-url request)
+ (is (= "https://mb1.example.com" (public-settings/site-url))))))
(testing "Site URL should not be inferred if already set by env variable"
(mt/with-temporary-setting-values [site-url nil]
(mt/with-temp-env-var-value [mb-site-url "https://mb1.example.com"]
--
GitLab