From 9014b3e07a26172c66e1d56f88d0c95e74133553 Mon Sep 17 00:00:00 2001
From: jerger <michael.jerger@meissa-gmbh.de>
Date: Fri, 29 Jul 2022 14:13:45 +0200
Subject: [PATCH 1/2] fix it
---
project.clj | 2 +-
src/test/cljc/dda/c4k_gitea/gitea_test.cljc | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/project.clj b/project.clj
index 43a0a96..2a71112 100644
--- a/project.clj
+++ b/project.clj
@@ -5,7 +5,7 @@
:url "https://www.apache.org/licenses/LICENSE-2.0.html"}
:dependencies [[org.clojure/clojure "1.10.3"]
[org.clojure/tools.reader "1.3.6"]
- [org.domaindrivenarchitecture/c4k-common-clj "2.1.2"]
+ [org.domaindrivenarchitecture/c4k-common-clj "3.0.0"]
[hickory "0.7.1"]]
:target-path "target/%s/"
:source-paths ["src/main/cljc"
diff --git a/src/test/cljc/dda/c4k_gitea/gitea_test.cljc b/src/test/cljc/dda/c4k_gitea/gitea_test.cljc
index b9f0dcd..556a186 100644
--- a/src/test/cljc/dda/c4k_gitea/gitea_test.cljc
+++ b/src/test/cljc/dda/c4k_gitea/gitea_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 th]
[dda.c4k-common.base64 :as b64]
[dda.c4k-gitea.gitea :as cut]))
@@ -28,7 +28,7 @@
:GITEA__service__EMAIL_DOMAIN_WHITELIST-c2 "test.com,test.net",
:GITEA__service__NO_REPLY_ADDRESS-c1 "",
:GITEA__service__NO_REPLY_ADDRESS-c2 "noreply@test.com"}
- (ct/map-diff (cut/generate-appini-env {:default-app-name ""
+ (th/map-diff (cut/generate-appini-env {:default-app-name ""
:fqdn "test.de"
:mailer-from ""
:mailer-host-port "m.t.de:123"
@@ -45,7 +45,7 @@
(deftest should-generate-certificate
(is (= {:name-c2 "prod", :name-c1 "staging"}
- (ct/map-diff (cut/generate-certificate {})
+ (th/map-diff (cut/generate-certificate {})
(cut/generate-certificate {:issuer "prod"})))))
(deftest should-generate-secret
@@ -57,7 +57,7 @@
:GITEA__mailer__USER-c2 (b64/encode "maileruser"),
:GITEA__mailer__PASSWD-c1 "",
:GITEA__mailer__PASSWD-c2 (b64/encode "mailerpw")}
- (ct/map-diff (cut/generate-secrets {:postgres-db-user ""
+ (th/map-diff (cut/generate-secrets {:postgres-db-user ""
:postgres-db-password ""
:mailer-user ""
:mailer-pw ""})
@@ -69,11 +69,11 @@
(deftest should-generate-root-volume
(is (= {:storage-c1 "5Gi",
:storage-c2 "20Gi"}
- (ct/map-diff (cut/generate-root-volume {:volume-total-storage-size 6})
+ (th/map-diff (cut/generate-root-volume {:volume-total-storage-size 6})
(cut/generate-root-volume {:volume-total-storage-size 101})))))
(deftest should-generate-data-volume
(is (= {:storage-c1 "1Gi",
:storage-c2 "15Gi"}
- (ct/map-diff (cut/generate-data-volume {:volume-total-storage-size 6})
+ (th/map-diff (cut/generate-data-volume {:volume-total-storage-size 6})
(cut/generate-data-volume {:volume-total-storage-size 20})))))
\ No newline at end of file
From c003a1a09fa64dbce8fe2d594de6e9749432cce8 Mon Sep 17 00:00:00 2001
From: Clemens Geibel <clemens.geibel@meissa-gmbh.de>
Date: Fri, 29 Jul 2022 14:46:17 +0200
Subject: [PATCH 2/2] Updated c4k-common-cljs to 3.0.0
---
shadow-cljs.edn | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/shadow-cljs.edn b/shadow-cljs.edn
index 7aadcbd..a31cc14 100644
--- a/shadow-cljs.edn
+++ b/shadow-cljs.edn
@@ -4,7 +4,7 @@
"src/test/cljc"
"src/test/cljs"
"src/test/resources"]
- :dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "2.1.0"]
+ :dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "3.0.0"]
[hickory "0.7.1"]]
:builds {:frontend {:target :browser
:modules {:main {:init-fn dda.c4k-gitea.browser/init}}