From 01041921c5dfa2796d3d11f61709a96ab0c43245 Mon Sep 17 00:00:00 2001
From: Noah Moss <32746338+noahmoss@users.noreply.github.com>
Date: Wed, 27 Dec 2023 16:18:37 -0500
Subject: [PATCH] Fix misc clj-kondo issues in tests (#37139)
Fixes misc clj-kondo errors in tests (and one random whitespace issue in a src namespace).
---
.../internal_user_test.clj | 7 +--
.../automagic_dashboards/interesting.clj | 4 +-
.../automagic_dashboards/interesting_test.clj | 1 -
test/metabase/db/custom_migrations_test.clj | 56 +++++++++----------
test/metabase/lib/join_test.cljc | 20 +++----
.../middleware/binning_test.clj | 40 ++++++-------
6 files changed, 63 insertions(+), 65 deletions(-)
diff --git a/enterprise/backend/test/metabase_enterprise/internal_user_test.clj b/enterprise/backend/test/metabase_enterprise/internal_user_test.clj
index 91c1e8fbed7..da1c03c69c0 100644
--- a/enterprise/backend/test/metabase_enterprise/internal_user_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/internal_user_test.clj
@@ -43,10 +43,9 @@
(is (false? (contains? user-ids-minus-internal config/internal-mb-user-id))
"Selecting Users with a clause to ignore internal users does not return the internal user."))
;; oss:
- (do
- (is (= (t2/select-fn-set :id User {:where [:not= :id config/internal-mb-user-id]})
- (t2/select-fn-set :id User))
- "Ignore internal user where clause does nothing in ee mode."))))
+ (is (= (t2/select-fn-set :id User {:where [:not= :id config/internal-mb-user-id]})
+ (t2/select-fn-set :id User))
+ "Ignore internal user where clause does nothing in ee mode.")))
(is (= (setup/has-user-setup)
(with-internal-user-restoration
;; there's no internal-user in this block
diff --git a/src/metabase/automagic_dashboards/interesting.clj b/src/metabase/automagic_dashboards/interesting.clj
index 3eb5136b593..3d351ca0584 100644
--- a/src/metabase/automagic_dashboards/interesting.clj
+++ b/src/metabase/automagic_dashboards/interesting.clj
@@ -462,8 +462,8 @@
metric-specs
filter-specs]} :- [:map
[:dimension-specs [:maybe [:sequential ads/dimension-template]]]
- [:metric-specs [:maybe [:sequential ads/metric-template]]]
- [:filter-specs [:maybe [:sequential ads/filter-template]]]]]
+ [:metric-specs [:maybe [:sequential ads/metric-template]]]
+ [:filter-specs [:maybe [:sequential ads/filter-template]]]]]
(let [dims (->> (find-dimensions context dimension-specs)
(add-field-self-reference context))
metrics (-> (normalize-seq-of-maps :metric metric-specs)
diff --git a/test/metabase/automagic_dashboards/interesting_test.clj b/test/metabase/automagic_dashboards/interesting_test.clj
index 23ff1e97cf6..b95bd13d46e 100644
--- a/test/metabase/automagic_dashboards/interesting_test.clj
+++ b/test/metabase/automagic_dashboards/interesting_test.clj
@@ -240,7 +240,6 @@
quantity-dim
unmatched-dim]
bindings (vals (#'interesting/candidate-bindings context dimensions))]
- bindings
(testing "3 results are returned - one for each matched field group"
(is (= 3 (count bindings))))
(testing "The return data shape is a vector for each field, each of which is a vector of
diff --git a/test/metabase/db/custom_migrations_test.clj b/test/metabase/db/custom_migrations_test.clj
index 86e8de4f237..f6e4149bb16 100644
--- a/test/metabase/db/custom_migrations_test.clj
+++ b/test/metabase/db/custom_migrations_test.clj
@@ -1340,34 +1340,34 @@
:size_x 4
:size_y 4
:col 1
- :row 1})]
- (let [expected-settings {:graph.dimensions ["CREATED_AT" "CATEGORY"],
- :graph.metrics ["count"],
- :click "link",
- :click_link_template
- "http://localhost:3001/?year={{CREATED_AT}}&cat={{CATEGORY}}&count={{count}}"
- :click_behavior
- {:type "link",
- :linkType "url",
- :linkTemplate "http://localhost:3001/?year={{CREATED_AT}}&cat={{CATEGORY}}&count={{count}}"},
- :column_settings
- ;; the model keywordizes the json parsing yielding this monstrosity below
- {"[\"ref\",[\"field\",2,null]]"
- {:click_behavior
- {:type "link",
- :linkType "url",
- :linkTemplate "http://example.com/{{ID}}",
- :linkTextTemplate "here's an id: {{ID}}"}},
- "[\"ref\",[\"field\",6,null]]"
- {:click_behavior
- {:type "link",
- :linkType "url",
- :linkTemplate "http://example.com//{{id}}",
- :linkTextTemplate "here is my id: {{id}}"}}}}]
- (f)
- (is (= expected-settings
- (-> (t2/select-one :model/DashboardCard :id dashcard-id)
- :visualization_settings))))))]
+ :row 1})
+ expected-settings {:graph.dimensions ["CREATED_AT" "CATEGORY"],
+ :graph.metrics ["count"],
+ :click "link",
+ :click_link_template
+ "http://localhost:3001/?year={{CREATED_AT}}&cat={{CATEGORY}}&count={{count}}"
+ :click_behavior
+ {:type "link",
+ :linkType "url",
+ :linkTemplate "http://localhost:3001/?year={{CREATED_AT}}&cat={{CATEGORY}}&count={{count}}"},
+ :column_settings
+ ;; the model keywordizes the json parsing yielding this monstrosity below
+ {"[\"ref\",[\"field\",2,null]]"
+ {:click_behavior
+ {:type "link",
+ :linkType "url",
+ :linkTemplate "http://example.com/{{ID}}",
+ :linkTextTemplate "here's an id: {{ID}}"}},
+ "[\"ref\",[\"field\",6,null]]"
+ {:click_behavior
+ {:type "link",
+ :linkType "url",
+ :linkTemplate "http://example.com//{{id}}",
+ :linkTextTemplate "here is my id: {{id}}"}}}}]
+ (f)
+ (is (= expected-settings
+ (-> (t2/select-one :model/DashboardCard :id dashcard-id)
+ :visualization_settings)))))]
(testing "Running the migration from scratch"
(impl/test-migrations ["v48.00-022"] [migrate!]
(expect-correct-settings! migrate!)))
diff --git a/test/metabase/lib/join_test.cljc b/test/metabase/lib/join_test.cljc
index 462e8578a9b..ac44f39d51e 100644
--- a/test/metabase/lib/join_test.cljc
+++ b/test/metabase/lib/join_test.cljc
@@ -77,7 +77,7 @@
[_ orders-product-id] (lib/join-condition-lhs-columns query product-card nil nil)
[products-id] (lib/join-condition-rhs-columns query product-card orders-product-id nil)]
(is (=? {:stages [{:joins [{:stages [{:source-card (:id product-card)}]}]}]}
- (lib/join query (lib/join-clause product-card [(lib/= orders-product-id products-id)]))))))
+ (lib/join query (lib/join-clause product-card [(lib/= orders-product-id products-id)]))))))
(testing "source-table"
(let [query {:lib/type :mbql/query
:lib/metadata lib.tu/metadata-provider-with-mock-cards
@@ -193,8 +193,8 @@
:lib/options {:lib/uuid "bbbae500-c972-4550-b100-e0584eb72c4d"}
:source-table (meta/id :categories)}]}]}]
:database (meta/id)
- :lib/metadata meta/metadata-provider}]
- (let [metadata (lib/returned-columns query)]
+ :lib/metadata meta/metadata-provider}
+ metadata (lib/returned-columns query)]
(is (=? [(merge (meta/field-metadata :categories :name)
{:display-name "Name"
:lib/source :source/fields
@@ -205,7 +205,7 @@
(is (=? [:field
{:lib/uuid string?, :join-alias "CATEGORIES__via__CATEGORY_ID"}
(meta/id :categories :name)]
- (lib/ref (first metadata))))))))
+ (lib/ref (first metadata)))))))
(deftest ^:parallel join-against-source-card-metadata-test
(let [metadata-provider (lib.tu/metadata-provider-with-cards-for-queries
@@ -510,15 +510,15 @@
(deftest ^:parallel with-join-conditions-do-not-add-alias-when-already-present-test
(testing "with-join-conditions should not replace an existing join alias (don't second guess explicit aliases)"
(let [query lib.tu/query-with-join
- [join] (lib/joins query)]
- (let [new-conditions [(lib/=
- (meta/field-metadata :venues :id)
- (-> (meta/field-metadata :categories :id)
- (lib/with-join-alias "My Join")))]]
+ [join] (lib/joins query)
+ new-conditions [(lib/=
+ (meta/field-metadata :venues :id)
+ (-> (meta/field-metadata :categories :id)
+ (lib/with-join-alias "My Join")))]]
(is (=? [[:= {}
[:field {} (meta/id :venues :id)]
[:field {:join-alias "My Join"} (meta/id :categories :id)]]]
- (lib/join-conditions (lib/with-join-conditions join new-conditions))))))))
+ (lib/join-conditions (lib/with-join-conditions join new-conditions)))))))
(deftest ^:parallel with-join-conditions-join-has-no-alias-yet-test
(testing "with-join-conditions should work if join doesn't yet have an alias"
diff --git a/test/metabase/query_processor/middleware/binning_test.clj b/test/metabase/query_processor/middleware/binning_test.clj
index 1c4cd470b6c..8c2c0255db4 100644
--- a/test/metabase/query_processor/middleware/binning_test.clj
+++ b/test/metabase/query_processor/middleware/binning_test.clj
@@ -188,23 +188,23 @@
source-metadata (qp/query->expected-cols source-card-query)
query (-> (lib/query meta/metadata-provider source-card-query)
lib/append-stage
- (lib/aggregate (lib/count)))]
- (let [people-longitude (m/find-first #(= (:id %) (meta/id :people :longitude))
- (lib/breakoutable-columns query))
- _ (is (some? people-longitude))
- binning-strategy (m/find-first #(= (:display-name %) "Bin every 20 degrees")
- (lib/available-binning-strategies query people-longitude))
- _ (is (some? binning-strategy))
- query (-> query
- (lib/breakout (lib/with-binning people-longitude binning-strategy)))
- legacy-query (-> (lib.convert/->legacy-MBQL query)
- (assoc-in [:query :source-metadata] source-metadata))]
- (is (=? {:query {:breakout [[:field
- "People__LONGITUDE"
- {:base-type :type/Float,
- :binning {:strategy :bin-width
- :bin-width 20.0
- :min-value -180.0
- :max-value -60.0
- :num-bins 6}}]]}}
- (binning/update-binning-strategy legacy-query)))))))))
+ (lib/aggregate (lib/count)))
+ people-longitude (m/find-first #(= (:id %) (meta/id :people :longitude))
+ (lib/breakoutable-columns query))
+ _ (is (some? people-longitude))
+ binning-strategy (m/find-first #(= (:display-name %) "Bin every 20 degrees")
+ (lib/available-binning-strategies query people-longitude))
+ _ (is (some? binning-strategy))
+ query (-> query
+ (lib/breakout (lib/with-binning people-longitude binning-strategy)))
+ legacy-query (-> (lib.convert/->legacy-MBQL query)
+ (assoc-in [:query :source-metadata] source-metadata))]
+ (is (=? {:query {:breakout [[:field
+ "People__LONGITUDE"
+ {:base-type :type/Float,
+ :binning {:strategy :bin-width
+ :bin-width 20.0
+ :min-value -180.0
+ :max-value -60.0
+ :num-bins 6}}]]}}
+ (binning/update-binning-strategy legacy-query))))))))
--
GitLab