diff --git a/README.md b/README.md index 8b7d294..b4de019 100644 --- a/README.md +++ b/README.md @@ -24,19 +24,21 @@ Our convention 4 kubernetes c4k-* tools combine the advantages of both approache ## Refactoring & Module Overview -| Module | Version | common postgres | frontend script | provider adapter | [backup as deployment][bak1] | [speced c4k-common][com1] | [configs can be of type EDN and YAML][yaml1] | -|------------------|---------|:---------------:|:---------------:|:----------------:|:----------------------------:|:-------------------------:|:--------------------------------------------:| -| c4k-mastodon-bot | 0.1 | - | | | | | | -| c4k-keycloak | 0.2 | | | | | | | -| c4k-jira | 1.1 | x | x | | x | | | -| c4k-nextcloud | 2.0 | x | x | | x | x | x | -| c4k-jitsi | 1.2 | | | | | | | -| c4k-gittea | 0.1 | | | | | | | -| c4k-shynet | 1.0 | | | | | | | +| Module | Version | common postgres | frontend script | provider adapter | [backup as deployment][bak1] | [speced c4k-common][com1] | [configs as EDN and YAML][yaml1] | [renamed test-helper][th1] | +|------------------|---------|:---------------:|:---------------:|:----------------:|:----------------------------:|:-------------------------:|:--------------------------------:|:--------------------------:| +| c4k-mastodon-bot | 0.1 | - | | | | | | | +| c4k-keycloak | 0.2 | | | | | | | | +| c4k-jira | 1.1 | x | x | | x | | | | +| c4k-nextcloud | 2.0 | x | x | | x | x | x | | +| c4k-jitsi | 1.2 | | | | | | | | +| c4k-gittea | 0.1 | | | | | | | | +| c4k-shynet | 1.0 | | | | | | | | +| c4k-website | 0.1 | | | | | | | | [bak1]: https://gitlab.com/domaindrivenarchitecture/c4k-jira/-/merge_requests/1 [com1]: https://gitlab.com/domaindrivenarchitecture/c4k-nextcloud/-/merge_requests/3 [yaml1]: https://gitlab.com/domaindrivenarchitecture/c4k-nextcloud/-/merge_requests/4 +[th1]: https:// ## License diff --git a/project-cljs.clj b/project-cljs.clj index b7f34f6..4d3257e 100644 --- a/project-cljs.clj +++ b/project-cljs.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-common-cljs "2.1.3-SNAPSHOT" +(defproject org.domaindrivenarchitecture/c4k-common-cljs "3.0.0-SNAPSHOT" :description "Contains predicates and tools for c4k" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" diff --git a/project.clj b/project.clj index 4d2b3a5..2cccbf8 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-common-clj "2.1.3-SNAPSHOT" +(defproject org.domaindrivenarchitecture/c4k-common-clj "3.0.0-SNAPSHOT" :description "Contains predicates and tools for c4k" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" diff --git a/src/main/cljc/dda/c4k_common/common_test.cljc b/src/main/cljc/dda/c4k_common/test_helper.cljc similarity index 96% rename from src/main/cljc/dda/c4k_common/common_test.cljc rename to src/main/cljc/dda/c4k_common/test_helper.cljc index da8bb32..4e95f0b 100644 --- a/src/main/cljc/dda/c4k_common/common_test.cljc +++ b/src/main/cljc/dda/c4k_common/test_helper.cljc @@ -1,4 +1,4 @@ -(ns dda.c4k-common.common-test) +(ns dda.c4k-common.test-helper) ; Heavily assumes c1 and c2 have an identical structure but maybe different values ; This function finds the diff of two nested maps/vectors diff --git a/src/test/cljc/dda/c4k_common/common_it_test.cljc b/src/test/cljc/dda/c4k_common/common_test.cljc similarity index 90% rename from src/test/cljc/dda/c4k_common/common_it_test.cljc rename to src/test/cljc/dda/c4k_common/common_test.cljc index aa6b4a8..e0f6d36 100644 --- a/src/test/cljc/dda/c4k_common/common_it_test.cljc +++ b/src/test/cljc/dda/c4k_common/common_test.cljc @@ -1,4 +1,4 @@ -(ns dda.c4k-common.common-it-test +(ns dda.c4k-common.common-test (:require #?(:clj [clojure.test :refer [deftest is are testing run-tests]] :cljs [cljs.test :refer-macros [deftest is are testing run-tests]]) diff --git a/src/test/cljc/dda/c4k_common/postgres_test.cljc b/src/test/cljc/dda/c4k_common/postgres_test.cljc index 6d4bbe5..6efec6a 100644 --- a/src/test/cljc/dda/c4k_common/postgres_test.cljc +++ b/src/test/cljc/dda/c4k_common/postgres_test.cljc @@ -3,7 +3,7 @@ #?(:clj [clojure.test :refer [deftest is are testing run-tests]] :cljs [cljs.test :refer-macros [deftest is are testing run-tests]]) [clojure.spec.test.alpha :as st] - [dda.c4k-common.common-test :as ct] + [dda.c4k-common.test-helper :as ct] [dda.c4k-common.postgres :as cut])) (st/instrument `cut/generate-config) diff --git a/src/test/cljc/dda/c4k_common/predicate_test.cljc b/src/test/cljc/dda/c4k_common/predicate_test.cljc index 59a4333..b3ca535 100644 --- a/src/test/cljc/dda/c4k_common/predicate_test.cljc +++ b/src/test/cljc/dda/c4k_common/predicate_test.cljc @@ -51,7 +51,7 @@ (is (false? (cut/host-and-port-string? "test.123:1234"))) (is (false? (cut/host-and-port-string? "test.de:abc")))) -(deftest test-string-vector? - (is (true? (cut/string-vector? ["hallo" "welt" "!"]))) - (is (false? (cut/string-vector? ["hallo" 1 "welt" "!"]))) - (is (false? (cut/string-vector? "hallo welt!")))) \ No newline at end of file +(deftest test-string-sequence? + (is (true? (cut/string-sequence? ["hallo" "welt" "!"]))) + (is (false? (cut/string-sequence? ["hallo" 1 "welt" "!"]))) + (is (false? (cut/string-sequence? "hallo welt!")))) \ No newline at end of file