From 107c66823b4685f49497df845b2d40e7c355829d Mon Sep 17 00:00:00 2001
From: Sameer Al-Sakran <sameer@expa.com>
Date: Mon, 28 Nov 2016 19:47:31 -0800
Subject: [PATCH] some basic tests
---
src/metabase/util/stats.clj | 6 +++---
test/metabase/util/stats_test.clj | 13 ++++++++++++-
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/metabase/util/stats.clj b/src/metabase/util/stats.clj
index 4e215a22ef2..9f87abf4b0a 100644
--- a/src/metabase/util/stats.clj
+++ b/src/metabase/util/stats.clj
@@ -8,7 +8,7 @@
[humanization :as humanization]
[table :as table]
[setting :as setting])
- [metabase.public-settings :as settings]
+ [metabase.public-settings :as public-settings]
[metabase.util :as u]))
(def ^:private ^:const ^String metabase-usage-url "https://kqatai1z3c.execute-api.us-east-1.amazonaws.com/prod/ServerStatsCollector")
@@ -122,12 +122,12 @@
:running_on (environment-type)
:application_database (config/config-str :mb-db-type)
:check_for_updates (setting/get :check-for-updates)
- :site_name (not= settings/site-name "Metabase")
+ :site_name (not= (public-settings/site-name) "Metabase")
:report_timezone (setting/get :report-timezone)
:friendly_names (humanization/enable-advanced-humanization)
:email_configured ((resolve 'metabase.email/email-configured?))
:slack_configured ((resolve 'metabase.integrations.slack/slack-configured?))
- :sso_configured (boolean (resolve 'metabase.api.session/google-auth-client-id))
+ :sso_configured (boolean ((resolve 'metabase.api.session/google-auth-client-id)))
:instance_started instance-start-date
:has_sample_data (db/exists? 'Database, :is_sample true)})
diff --git a/test/metabase/util/stats_test.clj b/test/metabase/util/stats_test.clj
index 4f11467ccf3..feefe3e72d7 100644
--- a/test/metabase/util/stats_test.clj
+++ b/test/metabase/util/stats_test.clj
@@ -54,4 +54,15 @@
(expect "1001-10000" (bin-large-number 1001))
(expect "1001-10000" (bin-large-number 10000))
(expect "10000+" (bin-large-number 10001))
-(expect "10000+" (bin-large-number 100000))
\ No newline at end of file
+(expect "10000+" (bin-large-number 100000))
+
+
+(expect "unknown" ((get-anonymous-usage-stats) :running_on))
+(expect "h2" ((get-anonymous-usage-stats) :application_database))
+(expect true ((get-anonymous-usage-stats) :check_for_updates))
+(expect true ((get-anonymous-usage-stats) :site_name))
+(expect true ((get-anonymous-usage-stats) :friendly_names))
+(expect false ((get-anonymous-usage-stats) :email_configured))
+(expect false ((get-anonymous-usage-stats) :slack_configured))
+(expect false ((get-anonymous-usage-stats) :sso_configured))
+(expect false ((get-anonymous-usage-stats) :has_sample_data))
\ No newline at end of file
--
GitLab