Merge pull request #2181 from nordic-institute/XRDDEV-2535

chore: make security server client details certificate fields system …
nordic-institute · Jun 12, 2024 · c4bb954 · c4bb954
2 parents f5710eb + b732b3f
commit c4bb954
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/...rver/system-test/src/intTest/java/org/niis/xroad/ss/test/ui/glue/CertificateStepDefs.java b/...rver/system-test/src/intTest/java/org/niis/xroad/ss/test/ui/glue/CertificateStepDefs.java
@@ -41,7 +41,15 @@ public class CertificateStepDefs extends BaseUiStepDefs {
     @Step("Certificate fields as follows:")
     public void validateCert(DataTable dataTable) {
         Map<String, String> values = dataTable.asMap();
-        values.forEach((key, expectedValue) -> certificatePageObj.signatureField(key).shouldBe(Condition.text(expectedValue)));
+        values.forEach((key, expectedValue) -> {
+            if (key.contains("Distinguished Name")) {
+                for (String dnAttribute : expectedValue.split(",")) {
+                    certificatePageObj.signatureField(key).shouldHave(Condition.text(dnAttribute));
+                }
+            } else {
+                certificatePageObj.signatureField(key).shouldBe(Condition.text(expectedValue));
+            }
+        });
     }
 
     @Step("Certificate is closed")