From d2ecc6d4b127ddb0561d8c751b51ea666c19831a Mon Sep 17 00:00:00 2001
From: Marco Lecheler <marco.lecheler@mercedes-benz.com>
Date: Wed, 14 Jun 2023 14:01:00 +0200
Subject: [PATCH 1/2] chore(test): use vault.fullname in Helm test

---
 templates/tests/server-test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/tests/server-test.yaml b/templates/tests/server-test.yaml
index 59b150109..7be3f162e 100644
--- a/templates/tests/server-test.yaml
+++ b/templates/tests/server-test.yaml
@@ -9,7 +9,7 @@ SPDX-License-Identifier: MPL-2.0
 apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{ .Release.Name }}-server-test"
+  name: {{ template "vault.fullname" . }}-server-test
   namespace: {{ .Release.Namespace }}
   annotations:
     "helm.sh/hook": test

From b4be0e42ed171feec0bb9247ca44b4bdfc5c4c29 Mon Sep 17 00:00:00 2001
From: Marco Lecheler <marco.lecheler@mercedes-benz.com>
Date: Wed, 21 Jun 2023 10:56:41 +0200
Subject: [PATCH 2/2] chore(test): add vault metadata.name server-tests

---
 test/unit/server-test.bats | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/test/unit/server-test.bats b/test/unit/server-test.bats
index de82f84c3..314703a5d 100644
--- a/test/unit/server-test.bats
+++ b/test/unit/server-test.bats
@@ -37,6 +37,33 @@ load _helpers
 
 #--------------------------------------------------------------------
 
+@test "server/standalone-server-test-Pod: default metadata.name" {
+  cd `chart_dir`
+  local actual=$(helm template \
+      --show-only templates/tests/server-test.yaml  \
+      . | tee /dev/stderr |
+      yq -r '.metadata.name' | tee /dev/stderr)
+  [ "${actual}" = "release-name-vault-server-test" ]
+}
+
+@test "server/standalone-server-test-Pod: release metadata.name vault" {
+  cd `chart_dir`
+  local actual=$(helm template vault \
+      --show-only templates/tests/server-test.yaml  \
+      . | tee /dev/stderr |
+      yq -r '.metadata.name' | tee /dev/stderr)
+  [ "${actual}" = "vault-server-test" ]
+}
+
+@test "server/standalone-server-test-Pod: release metadata.name foo" {
+  cd `chart_dir`
+  local actual=$(helm template foo \
+      --show-only templates/tests/server-test.yaml  \
+      . | tee /dev/stderr |
+      yq -r '.metadata.name' | tee /dev/stderr)
+  [ "${actual}" = "foo-vault-server-test" ]
+}
+
 @test "server/standalone-server-test-Pod: default server.standalone.enabled" {
   cd `chart_dir`
   local actual=$(helm template \