From 8c797e33f23a766eefd4d2dad3470ea2b9b42a09 Mon Sep 17 00:00:00 2001
From: Mike Thompson <mike.thompson@day8.com.au>
Date: Tue, 9 Aug 2016 00:10:19 +1000
Subject: [PATCH] Reduce test boilerplate by combining two tests.

---
 test/re-frame/interceptor_test.cljs | 37 +++++++++++++----------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/test/re-frame/interceptor_test.cljs b/test/re-frame/interceptor_test.cljs
index afab897..0ee30d0 100644
--- a/test/re-frame/interceptor_test.cljs
+++ b/test/re-frame/interceptor_test.cljs
@@ -35,30 +35,25 @@
         p  (path [:1 :2])]    ;; a two level path
 
     (let [b4 (-> (context [] [] db)
-                ((:before p)))           ;; before
-          a (-> b4
-                (assoc-effect :db :4)
-                ((:after p)))]           ;; after
-
-      (is (= (get-coeffect b4 :db))      ;; test before
-             :target)
-      (is (= (get-effect a :db)          ;; test after
-             {:1 {:2 :4}})))))
-
-(deftest test-path-with-nil-db
-  (let [db  {:1 {:2 :target}}
-        p  (path [:1 :2])]    ;; a two level path
-
-    (let [b4 (-> (context [] [] db)
-                 ((:before p)))           ;; before
-          a (-> b4
-                (assoc-effect :db nil)   ;; <-- db becomes nil
-                ((:after p)))]           ;; after
+                ((:before p))) ]          ;; before
 
       (is (= (get-coeffect b4 :db))      ;; test before
           :target)
-      (is (= (get-effect a :db)          ;; test after
-             {:1 {:2 nil}})))))
+
+      ;; test #1
+      (is (= {:1 {:2 :4}}
+             (-> b4
+                 (assoc-effect :db :4)    ;; <-- db becomes :4
+                 ((:after p))
+                 (get-effect :db))))
+
+      ;; test #2 - set dbto nil
+      (is (= {:1 {:2 nil}}
+             (-> b4
+                 (assoc-effect :db nil)   ;; <-- db becomes nil
+                 ((:after p))
+                 (get-effect :db)))))))
+
 
 (deftest test-db-handler-interceptor
   (let [event   [:a :b]