rename test-utils to test-setup for better clarity. remove some old tests...

rename test-utils to test-setup for better clarity.  remove some old tests which were commented out.

test/metabase/api/common_test.clj

@@ -5,7 +5,7 @@
             [metabase.api.org-test :refer [create-org]]
             [metabase.test-data :refer :all]
             [metabase.test-data.create :refer [create-user]]
-            metabase.test-utils
+            metabase.test-setup
             [metabase.test.util :refer :all]
             [metabase.util :refer [regex= regex?]])
   (:import com.metabase.corvus.api.ApiException))

test/metabase/models/org_perm_test.clj

-(ns metabase.models.org-perm-test
-  (:require [clojure.tools.logging :as log]
-            [clj-time.coerce :as tc]
-            [clj-time.core :as time]
-            [expectations :refer :all]
-            [korma.core :refer :all]
-            (metabase [db :refer :all]
-                      test-utils)
-            (metabase.models [org-perm :refer [OrgPerm]]
-                             [org :refer [Org]]
-                             [user :refer [User]])))
-
-
-;(defn insert-org []
-;  (let [result (ins Org
-;                 :name "org_perm_test"
-;                 :slug "org_perm_test"
-;                 :inherits false)]
-;    (or (:id result) -1)))
-;
-;(defn insert-user []
-;  (let [result (ins User
-;                 :email "org_perm_test"
-;                 :first_name "org_perm_test"
-;                 :last_name "org_perm_test"
-;                 :password "org_perm_test"
-;                 :date_joined (java.sql.Timestamp. (tc/to-long (time/now)))
-;                 :is_active true
-;                 :is_staff true
-;                 :is_superuser false)]
-;    (or (:id result) -1)))
-;
-;(defn count-perms []
-;  (get-in (first (select OrgPerm (aggregate (count :*) :cnt))) [:cnt]))
-;
-;
-;; start with 0 entries
-;(expect 0 (count-perms))
-;
-;; insert a new value
-;(expect (more->
-;          false nil?
-;          true (contains? :id))
-;  (let [org-id (insert-org)
-;        user-id (insert-user)]
-;    (ins OrgPerm
-;      :admin false
-;      :organization_id org-id
-;      :user_id user-id)))
-;
-;; now we should have 1 entry
-;(expect 1 (count-perms))

test/metabase/models/org_test.clj

-(ns metabase.models.org-test
-  (:require [clojure.tools.logging :as log]
-            [expectations :refer :all]
-            [korma.core :refer :all]
-            (metabase [db :refer :all]
-                      test-utils)
-            [metabase.models.org :refer [Org]]))
-
-
-;(defn count-orgs []
-;  (get-in (first (select Org (aggregate (count :*) :cnt))) [:cnt]))
-;
-;
-;; start with 0 entries
-;(expect 0 (count-orgs))
-;
-;; insert a new value
-;(expect (more->
-;          false nil?
-;          true (contains? :id))
-;  (ins Org
-;    :name "org_test"
-;    :slug "org_test"
-;    :inherits false))
-;
-;; now we should have 1 entry
-;(expect 1 (count-orgs))

test/metabase/models/setting_test.clj

@@ -2,8 +2,7 @@
   (:require [expectations :refer :all]
             [medley.core :as m]
             (metabase [db :refer [sel]]
-                      [test-data :refer :all]
-                      test-utils)
+                      [test-data :refer :all])
             [metabase.models.setting :refer [defsetting Setting] :as setting]
             [metabase.test.util :refer :all]))
 

test/metabase/models/user_test.clj

-(ns metabase.models.user-test
-  (:require [clojure.tools.logging :as log]
-            [clj-time.coerce :as tc]
-            [clj-time.core :as time]
-            [expectations :refer :all]
-            [korma.core :refer :all]
-            (metabase [db :refer :all]
-                      test-utils)
-            [metabase.models.user :refer [User]]))
-
-
-;(defn count-users []
-;  (get-in (first (select User (aggregate (count :*) :cnt))) [:cnt]))
-;
-;
-;; start with 0 entries
-;(expect 0 (count-users))
-;
-;; insert a new value
-;(expect (more->
-;          false nil?
-;          true (contains? :id))
-;  (ins User
-;    :email "user_test"
-;    :first_name "user_test"
-;    :last_name "user_test"
-;    :password "user_test"
-;    :date_joined (java.sql.Timestamp. (tc/to-long (time/now)))
-;    :is_active true
-;    :is_staff true
-;    :is_superuser false))
-;
-;; now we should have 1 entry
-;(expect 1 (count-users))

test/metabase/test_utils.clj → test/metabase/test_setup.clj

-(ns metabase.test-utils ; TODO - rename to setup
+(ns metabase.test-setup
   "Functions that run before + after unit tests (setup DB, start web server, load test data)."
   (:require [clojure.java.io :as io]
             [clojure.tools.logging :as log]
@@ -18,7 +18,7 @@
 
 ;; # FUNCTIONS THAT GET RUN ON TEST SUITE START / STOP
 
-(defn test-setup
+(defn test-startup
   {:expectations-options :before-run}
   []
   (log/info "Starting up Metabase unit test runner")