Merge pull request #9822 from metabase/fix-bad-test

Fix tests not cleaning up after themselves 

test/metabase/models/dependency_test.clj

 (ns metabase.models.dependency-test
-  (:require [expectations :refer :all]
-            [metabase.models.dependency :refer :all]
-            [metabase.test.data :refer :all]
+  (:require [expectations :refer [expect]]
+            [metabase.models.dependency :as dep :refer [Dependency]]
+            [metabase.test.util :as tu]
             [metabase.util.date :as du]
             [toucan
              [db :as db]
@@ -11,10 +11,11 @@
 (models/defmodel ^:private Mock :mock)
 
 (extend (class Mock)
-  IDependent
-  {:dependencies (fn [_ id instance]
-                   {:a [1 2]
-                    :b [3 4 5]})})
+  dep/IDependent
+  {:dependencies
+   (constantly
+    {:a [1 2]
+     :b [3 4 5]})})
 
 
 ;; IDependent/dependencies
@@ -22,7 +23,7 @@
 (expect
   {:a [1 2]
    :b [3 4 5]}
-  (dependencies Mock 7 {}))
+  (dep/dependencies Mock 7 {}))
 
 
 ;; helper functions
@@ -55,7 +56,7 @@
                                  :dependent_on_model "foobar"
                                  :dependent_on_id    13
                                  :created_at         (du/new-sql-timestamp)}]]
-    (format-dependencies (retrieve-dependencies Mock 4))))
+    (format-dependencies (dep/retrieve-dependencies Mock 4))))
 
 
 ;; update-dependencies!
@@ -63,8 +64,8 @@
 ;; we skip over values which aren't integers
 (expect
   #{}
-  (do
-    (update-dependencies! Mock 2 {:test ["a" "b" "c"]})
+  (tu/with-model-cleanup [Dependency]
+    (dep/update-dependencies! Mock 2 {:test ["a" "b" "c"]})
     (set (db/select Dependency, :model "Mock", :model_id 2))))
 
 ;; valid working dependencies list
@@ -81,8 +82,8 @@
      :model_id           7
      :dependent_on_model "test"
      :dependent_on_id    3}}
-  (do
-    (update-dependencies! Mock 7 {:test [1 2 3]})
+  (tu/with-model-cleanup [Dependency]
+    (dep/update-dependencies! Mock 7 {:test [1 2 3]})
     (format-dependencies (db/select Dependency, :model "Mock", :model_id 7))))
 
 ;; delete dependencies that are no longer in the list
@@ -95,12 +96,11 @@
      :model_id           1
      :dependent_on_model "test"
      :dependent_on_id    2}}
-  (do
-    (db/insert! Dependency
-      :model              "Mock"
-      :model_id           1
-      :dependent_on_model "test"
-      :dependent_on_id    5
-      :created_at         (du/new-sql-timestamp))
-    (update-dependencies! Mock 1 {:test [1 2]})
-    (format-dependencies (db/select Dependency, :model "Mock", :model_id 1))))
+  (tt/with-temp Dependency [_ {:model               "Mock"
+                               :model_id           1
+                               :dependent_on_model "test"
+                               :dependent_on_id    5
+                               :created_at         (du/new-sql-timestamp)}]
+    (tu/with-model-cleanup [Dependency]
+      (dep/update-dependencies! Mock 1 {:test [1 2]})
+      (format-dependencies (db/select Dependency, :model "Mock", :model_id 1)))))