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 65bb59dd7dee4153e73eab9fcce8fca59c0f9cfc..fbe653d972028a6ccb839ab9408838103c2964b3 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 8bda2e1a5b0b4c84b55dceb5ad3cdc4a59a548c8..a23f03fa8d54eb385f219e85d7bc076cc537a6e9 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 { + } }