Merge pull request #63 from Flexiana/add-cloverage-onto-kaocha

Add Cloverage to kaocha
Flexiana · Apr 5, 2021 · 2e6bbb1 · 2e6bbb1
2 parents 07a5c00 + 3d5817c
commit 2e6bbb1
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+[![Clojure CI](https://github.com/Flexiana/framework/actions/workflows/test.yml/badge.svg)](https://github.com/Flexiana/framework/actions/workflows/test.yml)
+
 # framework
 
 ## Usage

diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject com.flexiana/framework "0.1.4"
+(defproject com.flexiana/framework "0.1.5"
   :description "Framework"
   :url "https://github.com/Flexiana/framework"
   :license {:name "FIXME" :url "FIXME"}
@@ -18,20 +18,22 @@
                  [crypto-password "0.2.1"]
                  [garden "1.3.10"]
                  [hickory "0.7.1"]
-                 [hiccup "1.0.5"]]
+                 [hiccup "1.0.5"]
+                 [funcool/cuerdas "RELEASE"]]
   :plugins [[lein-tools-deps "0.4.5"]]
   :middleware [lein-tools-deps.plugin/resolve-dependencies-with-deps-edn]
   :lein-tools-deps/config {:config-files [:install :user :project]}
 
   :source-paths ["src"]
   :target "target/%s/"
-  :profiles {:dev      {:resource-paths ["config/dev"]
+  :profiles {:dev      {:resource-paths         ["config/dev"]
                         :lein-tools-deps/config {:config-files [:install :user :project]}}
              :local    {:resource-paths ["config/local"]}
              :prod     {:resource-paths ["config/prod"]}
              :cljstyle {:dependencies []}
              :test     {:source-paths ["test"]
                         :dependencies [[lambdaisland/kaocha "1.0.732"]
+                                       [lambdaisland/kaocha-cloverage "1.0.75"]
                                        [mvxcvi/cljstyle "0.14.0"
                                         :exclusions [org.clojure/clojure]]
                                        [clj-kondo "2021.01.20"]
@@ -45,5 +47,6 @@
                         "+test"
                         "run"
                         "-m"
-                        "kaocha.runner"]}
+                        "kaocha.runner"
+                        "--plugin" "cloverage"]}
   :main framework.components.core)
diff --git a/src/framework/components/router/core.clj b/src/framework/components/router/core.clj
@@ -10,7 +10,7 @@
   (start
     [this]
     (assoc this :ring-router (ring/router (concat
-                                            (:routes (:specific-component this)) ;adds routes specific to some component
+                                            (:routes (:specific-component this)) ; adds routes specific to some component
                                             (:custom-routes this))))))
 
 (defn make-router

diff --git a/src/framework/components/session/middleware.clj b/src/framework/components/session/middleware.clj
@@ -1,6 +1,6 @@
 (ns framework.components.session.middleware
   (:require
-    [sessions.backend :refer [fetch add! delete!]]
+    [framework.components.session.backend :refer [fetch add! delete!]]
     [xiana.core :as xiana]))
 
 (defn session-middleware

diff --git a/src/framework/mail/ core.clj → src/framework/mail/core.clj b/src/framework/mail/ core.clj → src/framework/mail/core.clj
diff --git a/test/framework/acl/builder/roles_test.clj b/test/framework/acl/builder/roles_test.clj
@@ -50,14 +50,14 @@
                :member [{:resource "posts", :actions [:delete :read], :restriction :own}]}
               (xiana/flow->
                 {}
-                ;(p/init {"posts" [:read :delete :blow :blow-up]})
+                ;; (p/init {"posts" [:read :delete :blow :blow-up]})
                 (init {:guest  [{:resource "posts", :actions [:delete :read], :restriction :own}]
                        :member [{:resource "posts", :actions [:delete :read], :restriction :own}]})
                 (deny {:role :guest :resource "posts" :actions :delete})))
   (test-roles {:member [{:resource "posts", :actions [:delete :read], :restriction :own}]}
               (xiana/flow->
                 {}
-                ;(p/init {"posts" [:read :delete :blow :blow-up]})
+                ;; (p/init {"posts" [:read :delete :blow :blow-up]})
                 (init {:guest  [{:resource "posts", :actions [:all], :restriction :own}]
                        :member [{:resource "posts", :actions [:delete :read], :restriction :own}]})
                 (deny {:role :guest :resource "posts" :actions :delete})))

diff --git a/test/framework/components/app/core_test.clj b/test/framework/components/app/core_test.clj
@@ -0,0 +1,4 @@
+(ns framework.components.app.core-test
+  (:require
+    [clojure.test :as t]
+    [framework.components.app.core :as app.core]))
diff --git a/tests.edn b/tests.edn
@@ -0,0 +1,2 @@
+#kaocha/v1
+{:plugins [:kaocha.plugin/cloverage]}