me/c4k-forgejo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'reflect_ns_change_test_helper' into 'main'

Browse source 
freflect new namespace for test-helper

See merge request domaindrivenarchitecture/c4k-gitea!1
This commit is contained in:
Michael Jerger 2022-07-29 12:50:52 +00:00
commit 3fd976e0a7
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
project.clj
View file

@ -5,7 +5,7 @@
:url "https://www.apache.org/licenses/LICENSE-2.0.html"} :url "https://www.apache.org/licenses/LICENSE-2.0.html"}
:dependencies [[org.clojure/clojure "1.10.3"] :dependencies [[org.clojure/clojure "1.10.3"]
[org.clojure/tools.reader "1.3.6"] [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"]] [hickory "0.7.1"]]
:target-path "target/%s/" :target-path "target/%s/"
:source-paths ["src/main/cljc" :source-paths ["src/main/cljc"

2
shadow-cljs.edn
View file

@ -4,7 +4,7 @@
"src/test/cljc" "src/test/cljc"
"src/test/cljs" "src/test/cljs"
"src/test/resources"] "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"]] [hickory "0.7.1"]]
:builds {:frontend {:target :browser :builds {:frontend {:target :browser
:modules {:main {:init-fn dda.c4k-gitea.browser/init}} :modules {:main {:init-fn dda.c4k-gitea.browser/init}}

12
src/test/cljc/dda/c4k_gitea/gitea_test.cljc
View file

@ -3,7 +3,7 @@
#?(:clj [clojure.test :refer [deftest is are testing run-tests]] #?(:clj [clojure.test :refer [deftest is are testing run-tests]]
:cljs [cljs.test :refer-macros [deftest is are testing run-tests]]) :cljs [cljs.test :refer-macros [deftest is are testing run-tests]])
[clojure.spec.test.alpha :as st] [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-common.base64 :as b64]
[dda.c4k-gitea.gitea :as cut])) [dda.c4k-gitea.gitea :as cut]))
@ -28,7 +28,7 @@
:GITEA__service__EMAIL_DOMAIN_WHITELIST-c2 "test.com,test.net", :GITEA__service__EMAIL_DOMAIN_WHITELIST-c2 "test.com,test.net",
:GITEA__service__NO_REPLY_ADDRESS-c1 "", :GITEA__service__NO_REPLY_ADDRESS-c1 "",
:GITEA__service__NO_REPLY_ADDRESS-c2 "noreply@test.com"} :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" :fqdn "test.de"
:mailer-from "" :mailer-from ""
:mailer-host-port "m.t.de:123" :mailer-host-port "m.t.de:123"
@ -45,7 +45,7 @@
(deftest should-generate-certificate (deftest should-generate-certificate
(is (= {:name-c2 "prod", :name-c1 "staging"} (is (= {:name-c2 "prod", :name-c1 "staging"}
(ct/map-diff (cut/generate-certificate {}) (th/map-diff (cut/generate-certificate {})
(cut/generate-certificate {:issuer "prod"}))))) (cut/generate-certificate {:issuer "prod"})))))
(deftest should-generate-secret (deftest should-generate-secret
@ -57,7 +57,7 @@
:GITEA__mailer__USER-c2 (b64/encode "maileruser"), :GITEA__mailer__USER-c2 (b64/encode "maileruser"),
:GITEA__mailer__PASSWD-c1 "", :GITEA__mailer__PASSWD-c1 "",
:GITEA__mailer__PASSWD-c2 (b64/encode "mailerpw")} :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 "" :postgres-db-password ""
:mailer-user "" :mailer-user ""
:mailer-pw ""}) :mailer-pw ""})
@ -69,11 +69,11 @@
(deftest should-generate-root-volume (deftest should-generate-root-volume
(is (= {:storage-c1 "5Gi", (is (= {:storage-c1 "5Gi",
:storage-c2 "20Gi"} :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}))))) (cut/generate-root-volume {:volume-total-storage-size 101})))))
(deftest should-generate-data-volume (deftest should-generate-data-volume
(is (= {:storage-c1 "1Gi", (is (= {:storage-c1 "1Gi",
:storage-c2 "15Gi"} :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}))))) (cut/generate-data-volume {:volume-total-storage-size 20})))))