From 63b88dac8e5ff225a82837fb610350df45cd81aa Mon Sep 17 00:00:00 2001 From: jerger Date: Fri, 11 Feb 2022 16:39:53 +0100 Subject: [PATCH] fix tests --- src/test/cljc/dda/c4k_shynet/shynet_test.cljc | 21 +++++++++++-------- .../dda/c4k_shynet/browser_test.cljs} | 3 +-- 2 files changed, 13 insertions(+), 11 deletions(-) rename src/test/{cljc/dda/c4k_shynet/browser_test.cljc => cljs/dda/c4k_shynet/browser_test.cljs} (73%) diff --git a/src/test/cljc/dda/c4k_shynet/shynet_test.cljc b/src/test/cljc/dda/c4k_shynet/shynet_test.cljc index 3ef30fc..a2e0853 100644 --- a/src/test/cljc/dda/c4k_shynet/shynet_test.cljc +++ b/src/test/cljc/dda/c4k_shynet/shynet_test.cljc @@ -65,19 +65,22 @@ :metadata {:name "shynet-webserver-ingress" :annotations - {:cert-manager.io/cluster-issuer "letsencrypt-staging-issuer" - :nginx.ingress.kubernetes.io/proxy-body-size "256m" - :nginx.ingress.kubernetes.io/ssl-redirect "true" - :nginx.ingress.kubernetes.io/rewrite-target "/" - :nginx.ingress.kubernetes.io/proxy-connect-timeout "300" - :nginx.ingress.kubernetes.io/proxy-send-timeout "300" - :nginx.ingress.kubernetes.io/proxy-read-timeout "300"}} + {:ingress.kubernetes.io/force-ssl-redirect true + :ingress.kubernetes.io/ssl-redirect true + :cert-manager.io/cluster-issuer + "letsencrypt-staging-issuer"}} :spec {:tls [{:hosts ["test.com"], :secretName "shynet-secret"}] :rules [{:host "test.com" - :http {:paths [{:backend {:service - {:name "shynet-webserver-service" :port {:number 8080}}}, :path "/", :pathType "Prefix"}]}}]}} + :http + {:paths + [{:backend + {:service + {:name "shynet-webserver-service" + :port {:number 8080}}} + :path "/" + :pathType "Prefix"}]}}]}} (cut/generate-ingress {:fqdn "test.com" :issuer :staging})))) (deftest should-generate-secret diff --git a/src/test/cljc/dda/c4k_shynet/browser_test.cljc b/src/test/cljs/dda/c4k_shynet/browser_test.cljs similarity index 73% rename from src/test/cljc/dda/c4k_shynet/browser_test.cljc rename to src/test/cljs/dda/c4k_shynet/browser_test.cljs index 9bcd8dd..e194844 100644 --- a/src/test/cljc/dda/c4k_shynet/browser_test.cljc +++ b/src/test/cljs/dda/c4k_shynet/browser_test.cljs @@ -1,7 +1,6 @@ (ns dda.c4k-shynet.browser-test (:require - #?(:clj [clojure.test :refer [deftest is are testing run-tests]] - :cljs [cljs.test :refer-macros [deftest is are testing run-tests]]) + [cljs.test :refer-macros [deftest is are testing run-tests]] [hickory.render :as hr] [dda.c4k-shynet.browser :as cut]))