From 4fe4c52fc03db1ac7cc8be0e6dce16de36265279 Mon Sep 17 00:00:00 2001
From: Cam Saul <cammsaul@gmail.com>
Date: Tue, 27 Feb 2018 13:34:26 -0800
Subject: [PATCH] Test Fixes :wrench:
---
src/metabase/models/params.clj | 11 +++--------
test/metabase/api/embed_test.clj | 5 +++--
test/metabase/api/field_test.clj | 4 +++-
test/metabase/api/public_test.clj | 2 +-
4 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/metabase/models/params.clj b/src/metabase/models/params.clj
index 6a639c0fd52..8664fd77de7 100644
--- a/src/metabase/models/params.clj
+++ b/src/metabase/models/params.clj
@@ -82,14 +82,9 @@
[fields]
(let [table-id->name-field (fields->table-id->name-field (pk-fields fields))]
(for [field fields]
- (-> field
- ;; add matching `:name_field` if it's a PK
- (assoc :name_field (when (isa? (:special_type field) :type/PK)
- (-> (table-id->name-field (:table_id field))
- ;; remove :table_id for these Fields since it's not needed for frontend
- (dissoc :table_id))))
- ;; now remove `:table_id` since we don't need it for frontend widgets, only for this function here
- (dissoc :table_id)))))
+ ;; add matching `:name_field` if it's a PK
+ (assoc field :name_field (when (isa? (:special_type field) :type/PK)
+ (table-id->name-field (:table_id field)))))))
;; We hydrate the `:human_readable_field` for each Dimension using the usual hydration logic, so it contains columns we
diff --git a/test/metabase/api/embed_test.clj b/test/metabase/api/embed_test.clj
index 6818ada0e8b..c67660527fe 100644
--- a/test/metabase/api/embed_test.clj
+++ b/test/metabase/api/embed_test.clj
@@ -93,10 +93,11 @@
:visualization_settings {}
:dataset_query {:type "query"}
:parameters ()
- :param_values nil})
+ :param_values nil
+ :param_fields nil})
(def successful-dashboard-info
- {:description nil, :parameters (), :ordered_cards (), :param_values nil})
+ {:description nil, :parameters (), :ordered_cards (), :param_values nil, :param_fields nil})
;;; ------------------------------------------- GET /api/embed/card/:token -------------------------------------------
diff --git a/test/metabase/api/field_test.clj b/test/metabase/api/field_test.clj
index 2658d5c229b..9065871940b 100644
--- a/test/metabase/api/field_test.clj
+++ b/test/metabase/api/field_test.clj
@@ -83,7 +83,9 @@
:base_type "type/Text"
:has_field_values "list"
:fk_target_field_id nil
- :parent_id nil})
+ :parent_id nil
+ :dimensions []
+ :name_field nil})
((user->client :rasta) :get 200 (format "field/%d" (id :users :name))))
diff --git a/test/metabase/api/public_test.clj b/test/metabase/api/public_test.clj
index 1356f0ceda3..3bf417df622 100644
--- a/test/metabase/api/public_test.clj
+++ b/test/metabase/api/public_test.clj
@@ -88,7 +88,7 @@
;; Check that we can fetch a PublicCard
(expect
- #{:dataset_query :description :display :id :name :visualization_settings :param_values}
+ #{:dataset_query :description :display :id :name :visualization_settings :param_values :param_fields}
(tu/with-temporary-setting-values [enable-public-sharing true]
(with-temp-public-card [{uuid :public_uuid}]
(set (keys (http/client :get 200 (str "public/card/" uuid)))))))
--
GitLab