From 0fc9fc3e657e99a7205bda379d81ed30dac5d8b6 Mon Sep 17 00:00:00 2001 From: jem Date: Sat, 6 Nov 2021 17:29:13 +0100 Subject: [PATCH] fixed cljs tests --- src/main/cljc/dda/c4k_common/common.cljc | 3 ++- src/test/clj/dda/c4k_common/yaml_test.clj | 6 ++++-- src/test/cljc/dda/c4k_common/postgres_test.cljc | 9 +++++++-- src/test/cljs/dda/c4k_common/yaml_test.cljs | 5 +++++ 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/main/cljc/dda/c4k_common/common.cljc b/src/main/cljc/dda/c4k_common/common.cljc index 84727bd..9e10360 100644 --- a/src/main/cljc/dda/c4k_common/common.cljc +++ b/src/main/cljc/dda/c4k_common/common.cljc @@ -1,7 +1,8 @@ (ns dda.c4k-common.common (:require [clojure.walk] - [orchestra.core :refer [defn-spec]] + #?(:clj [orchestra.core :refer [defn-spec]] + :cljs [orchestra.core :refer-macros [defn-spec]]) [dda.c4k-common.predicate :as cp])) diff --git a/src/test/clj/dda/c4k_common/yaml_test.clj b/src/test/clj/dda/c4k_common/yaml_test.clj index 9a8f8bb..178921b 100644 --- a/src/test/clj/dda/c4k_common/yaml_test.clj +++ b/src/test/clj/dda/c4k_common/yaml_test.clj @@ -1,10 +1,12 @@ (ns dda.c4k-common.yaml-test (:require [clojure.test :refer [deftest is are testing run-tests]] - [orchestra.spec.test :as st] + [clojure.spec.test.alpha :as st] [dda.c4k-common.yaml :as cut])) -(st/instrument) +(st/instrument `cut/from-string) +(st/instrument `cut/to-string) +(st/instrument `cut/dispatch-by-resource-name) (deftest should-dispatch-by-resource-name (is (= :clj diff --git a/src/test/cljc/dda/c4k_common/postgres_test.cljc b/src/test/cljc/dda/c4k_common/postgres_test.cljc index 79bbf11..6d007d1 100644 --- a/src/test/cljc/dda/c4k_common/postgres_test.cljc +++ b/src/test/cljc/dda/c4k_common/postgres_test.cljc @@ -2,10 +2,15 @@ (:require #?(:clj [clojure.test :refer [deftest is are testing run-tests]] :cljs [cljs.test :refer-macros [deftest is are testing run-tests]]) - [orchestra.spec.test :as st] + [clojure.spec.test.alpha :as st] [dda.c4k-common.postgres :as cut])) -(st/instrument) +(st/instrument `cut/generate-config) +(st/instrument `cut/generate-deployment) +(st/instrument `cut/generate-persistent-volume) +(st/instrument `cut/generate-pvc) +(st/instrument `cut/generate-secret) +(st/instrument `cut/generate-service) (deftest should-generate-config (is (= {:postgres-db "postgres" diff --git a/src/test/cljs/dda/c4k_common/yaml_test.cljs b/src/test/cljs/dda/c4k_common/yaml_test.cljs index e02d234..cca3846 100644 --- a/src/test/cljs/dda/c4k_common/yaml_test.cljs +++ b/src/test/cljs/dda/c4k_common/yaml_test.cljs @@ -2,8 +2,13 @@ (:require [cljs.test :refer-macros [deftest is are testing run-tests]] [shadow.resource :as rc] + [clojure.spec.test.alpha :as st] [dda.c4k-common.yaml :as cut])) +(st/instrument `cut/from-string) +(st/instrument `cut/to-string) +(st/instrument `cut/dispatch-by-resource-name) + (defmethod cut/load-resource :test [resource-name] (case resource-name "test/ingress_test.yaml" (rc/inline "test/ingress_test.yaml")