From 4124373fb785291030790c2b32857defad3f680d Mon Sep 17 00:00:00 2001
From: Tim Colbert <admin@tcolbert.net>
Date: Thu, 8 Nov 2018 11:21:19 +1000
Subject: [PATCH] Fix tests to check for null and default, resolve indent of
 template

---
 templates/server-statefulset.yaml |  2 +-
 test/unit/server-statefulset.bats | 43 ++++++++++++++++---------------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/templates/server-statefulset.yaml b/templates/server-statefulset.yaml
index 9384617f0..fd0220244 100644
--- a/templates/server-statefulset.yaml
+++ b/templates/server-statefulset.yaml
@@ -39,7 +39,7 @@ spec:
     spec:
     {{- if .Values.server.affinity }}
       affinity:
-        {{ tpl .Values.server.affinity . }}
+        {{ tpl .Values.server.affinity . | nindent 8 | trim }}
     {{- end }}
       terminationGracePeriodSeconds: 10
       securityContext:
diff --git a/test/unit/server-statefulset.bats b/test/unit/server-statefulset.bats
index 2c25077ed..f1bc2c9d1 100755
--- a/test/unit/server-statefulset.bats
+++ b/test/unit/server-statefulset.bats
@@ -11,27 +11,6 @@ load _helpers
   [ "${actual}" = "true" ]
 }
 
-
-@test "server/StatefulSet: affinity not set with server.affinity" {
-  cd `chart_dir`
-  local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
-      --set 'server.affinity=' \
-      . | tee /dev/stderr |
-      yq 'length > 0' | tee /dev/stderr)
-  [ "${actual}" = "true" ]
-}
-
-@test "server/StatefulSet: affinity set with server.affinity as empty" {
-  cd `chart_dir`
-  local actual=$(helm template \
-      -x templates/server-statefulset.yaml  \
-      --set 'server.affinity=""' \
-      . | tee /dev/stderr |
-      yq 'length > 0' | tee /dev/stderr)
-  [ "${actual}" = "true" ]
-}
-
 @test "server/StatefulSet: enable with global.enabled false" {
   cd `chart_dir`
   local actual=$(helm template \
@@ -113,6 +92,28 @@ load _helpers
   [ "${actual}" = "2" ]
 }
 
+#--------------------------------------------------------------------
+# affinity
+
+@test "server/StatefulSet: affinity not set with server.affinity" {
+  cd `chart_dir`
+  local actual=$(helm template \
+      -x templates/server-statefulset.yaml  \
+      --set 'server.affinity=null' \
+      . | tee /dev/stderr |
+      yq '.spec.template.spec | .affinity? == null' | tee /dev/stderr)
+  [ "${actual}" = "true" ]
+}
+
+@test "server/StatefulSet: affinity set by default" {
+  cd `chart_dir`
+  local actual=$(helm template \
+      -x templates/server-statefulset.yaml  \
+      . | tee /dev/stderr |
+      yq '.spec.template.spec.affinity | .podAntiAffinity? != null' | tee /dev/stderr)
+  [ "${actual}" = "true" ]
+}
+
 #--------------------------------------------------------------------
 # extraVolumes