From 58c1017d2d3bfb5aae99ac7663734685180dcf60 Mon Sep 17 00:00:00 2001
From: Matthieu Fernandes <matthieu.fernandes@gmail.com>
Date: Mon, 4 Dec 2023 16:43:14 +0100
Subject: [PATCH] fix(helm): previous refactor as failling tests

commit: ae72bf4 refactor(helm): rework email configuration to use ident
introduce these failing tests:

* api-configmap_test > test that API configmap will contain the right
  entrypoints > should set allowed from
* api-configmap_test > test that API configmap will contain the right
  entrypoints > should set allowed from with custom values

This fix those tests.

(cherry picked from commit 076f4046bfa3821477205c37d16993034aaa4ce8)

# Conflicts:
#	helm/tests/api-configmap_test.yaml
---
 helm/tests/api-configmap_test.yaml | 43 ++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/helm/tests/api-configmap_test.yaml b/helm/tests/api-configmap_test.yaml
index 17b05224ee8..8316768a211 100644
--- a/helm/tests/api-configmap_test.yaml
+++ b/helm/tests/api-configmap_test.yaml
@@ -579,3 +579,46 @@ tests:
       - matchRegex:
           path: data.[gravitee.yml]
           pattern: "[ ]{12}- /path/to/default/keystore3.pem"
+<<<<<<< HEAD
+=======
+
+
+  - it: should set allowed from
+    set:
+      smtp:
+        allowedfrom:
+          - email@from
+        enabled: true
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: ConfigMap
+      - matchRegex:
+          path: data.[gravitee.yml]
+          pattern: " *email:\n
+                     *  allowedfrom:\n
+                     *  - email@from\n
+                     *  enabled: true"
+
+  - it: should set allowed from with custom values
+    set:
+      smtp:
+        allowedfrom:
+          - '*@company.com'
+          - specific@email.com
+        enabled: true
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: ConfigMap
+      - matchRegex:
+          path: data.[gravitee.yml]
+          pattern: " *email:\n
+                     *  allowedfrom:\n
+                     *  - '\\*@company\\.com'\n
+                     *  - specific@email\\.com\n
+                     *  enabled: true"
+
+>>>>>>> 076f4046bf (fix(helm): previous refactor as failling tests)