From 7eb0fce720b510c47afc283a0efb6ea74dfe43c6 Mon Sep 17 00:00:00 2001
From: bozmiha <Mihai.BOZ@ext.ec.europa.eu>
Date: Thu, 9 Nov 2023 17:03:39 +0200
Subject: [PATCH] fix issue when alert was blocking the code editor.
Signed-off-by: bozmiha <Mihai.BOZ@ext.ec.europa.eu>
---
.../src/main/java/ddsl/dcomponents/AlertComponent.java | 8 ++++++--
.../test/java/domiSMPTests/ui/EditResourcePgTests.java | 10 +++++++++-
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/domiSMP-ui-tests/src/main/java/ddsl/dcomponents/AlertComponent.java b/domiSMP-ui-tests/src/main/java/ddsl/dcomponents/AlertComponent.java
index 65bb59dd7..fbe653d97 100644
--- a/domiSMP-ui-tests/src/main/java/ddsl/dcomponents/AlertComponent.java
+++ b/domiSMP-ui-tests/src/main/java/ddsl/dcomponents/AlertComponent.java
@@ -16,10 +16,10 @@ public class AlertComponent extends DComponent {
private final static Logger LOG = LoggerFactory.getLogger(AlertComponent.class);
@FindBy(id = "alertmessage_id")
- public WebElement alertToaster;
+ private WebElement alertToaster;
@FindBy(css = "[class = \"closebtn\"]")
- public WebElement closeBtn;
+ private WebElement closeBtn;
public AlertComponent(WebDriver driver) {
@@ -41,4 +41,8 @@ public class AlertComponent extends DComponent {
}
}
+ public void closeAlert() {
+ weToDButton(closeBtn).click();
+ }
+
}
diff --git a/domiSMP-ui-tests/src/test/java/domiSMPTests/ui/EditResourcePgTests.java b/domiSMP-ui-tests/src/test/java/domiSMPTests/ui/EditResourcePgTests.java
index 8bda2e1a5..a23f03fa8 100644
--- a/domiSMP-ui-tests/src/test/java/domiSMPTests/ui/EditResourcePgTests.java
+++ b/domiSMP-ui-tests/src/test/java/domiSMPTests/ui/EditResourcePgTests.java
@@ -131,6 +131,8 @@ public class EditResourcePgTests extends SeleniumTest {
EditResourceDocumentPage editResourceDocumentPage = editResourcePage.getResourceDetailsTab().clickOnEditDocument();
editResourceDocumentPage.clickOnGenerate();
editResourceDocumentPage.clickOnSave();
+ editResourceDocumentPage.getAlertArea().closeAlert();
+
String currentGeneratedValue = editResourceDocumentPage.getDocumentValue();
editResourceDocumentPage.clickOnValidate();
@@ -154,7 +156,7 @@ public class EditResourcePgTests extends SeleniumTest {
editResourceDocumentPage = editResourcePage.getResourceDetailsTab().clickOnEditDocument();
editResourceDocumentPage.clickOnGenerate();
editResourceDocumentPage.clickOnSave();
-
+ editResourceDocumentPage.getAlertArea().closeAlert();
String oasis2GeneratedDocumentValue = editResourceDocumentPage.getDocumentValue();
editResourceDocumentPage.clickOnValidate();
@@ -177,6 +179,8 @@ public class EditResourcePgTests extends SeleniumTest {
editResourceDocumentPage = editResourcePage.getResourceDetailsTab().clickOnEditDocument();
editResourceDocumentPage.clickOnGenerate();
editResourceDocumentPage.clickOnSave();
+ editResourceDocumentPage.getAlertArea().closeAlert();
+
String oasis1GeneratedDocumentValue = editResourceDocumentPage.getDocumentValue();
@@ -188,6 +192,10 @@ public class EditResourcePgTests extends SeleniumTest {
soft.assertTrue(oasis1DocumentXML.isNodePresent("ServiceGroup"), " Service group Node is not present in generated document");
soft.assertAll();
}
+
+ @Test(description = "EDTRES-04 Resource admins are able to add generated document", priority = 1)
+ public void resourceAdminsAreAbleToAddGeneratedDocument2() throws Exception {
+ }
}
--
GitLab