From 844b4e351562f8fe55bfa27834ba77a82ad45772 Mon Sep 17 00:00:00 2001
From: bozmiha <Mihai.BOZ@ext.ec.europa.eu>
Date: Wed, 7 Feb 2024 12:47:20 +0200
Subject: [PATCH] Removed step to close confirmation popup when password is
changed.
---
.../ddsl/dcomponents/SetChangePasswordDialog.java | 2 --
.../src/main/java/ddsl/enums/Messages.java | 11 +++++++++++
.../test/java/domiSMPTests/ui/ProfilePgTests.java | 15 ++++++++++-----
3 files changed, 21 insertions(+), 7 deletions(-)
create mode 100644 domismp-tests/domismp-tests-ui/src/main/java/ddsl/enums/Messages.java
diff --git a/domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/SetChangePasswordDialog.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/SetChangePasswordDialog.java
index 79ec86d6f..3ff07d77e 100644
--- a/domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/SetChangePasswordDialog.java
+++ b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/dcomponents/SetChangePasswordDialog.java
@@ -46,8 +46,6 @@ public class SetChangePasswordDialog extends DComponent {
//wait.forElementToBeClickable(setPasswordBtn);
if (weToDButton(setPasswordBtn).isEnabled()) {
weToDButton(setPasswordBtn).click();
- SuccesfullPasswordChangedPopup popup = new SuccesfullPasswordChangedPopup(driver);
- popup.closePopup();
return new DomiSMPPage(driver);
} else {
return null;
diff --git a/domismp-tests/domismp-tests-ui/src/main/java/ddsl/enums/Messages.java b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/enums/Messages.java
new file mode 100644
index 000000000..b0e8347ca
--- /dev/null
+++ b/domismp-tests/domismp-tests-ui/src/main/java/ddsl/enums/Messages.java
@@ -0,0 +1,11 @@
+package ddsl.enums;
+public class Messages {
+ /**
+ * This class is used to add all the alert messages from application.
+ */
+ public static final String PASSWORD_SUCCESSFULL_PASSWORD_CHANGED = "Password has been successfully set/changed. Login again to the application with the new password!";
+}
+
+
+
+
diff --git a/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/ProfilePgTests.java b/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/ProfilePgTests.java
index 6277ff6b3..a9651845d 100644
--- a/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/ProfilePgTests.java
+++ b/domismp-tests/domismp-tests-ui/src/test/java/domiSMPTests/ui/ProfilePgTests.java
@@ -2,6 +2,7 @@ package domiSMPTests.ui;
import ddsl.DomiSMPPage;
import ddsl.dcomponents.SetChangePasswordDialog;
+import ddsl.enums.Messages;
import ddsl.enums.Pages;
import domiSMPTests.SeleniumTest;
import org.testng.Assert;
@@ -136,14 +137,17 @@ public class ProfilePgTests extends SeleniumTest {
setChangePasswordDialog.fillChangePassword(data.getNewPassword(), new40CharactersPasswordValue);
List<String> errors = setChangePasswordDialog.getFieldErrorMessage();
DomiSMPPage homepage = setChangePasswordDialog.TryClickOnChangePassword();
+ String sucesfullMessage = homepage.getAlertArea().getAlertMessage();
+ soft.assertEquals(sucesfullMessage, Messages.PASSWORD_SUCCESSFULL_PASSWORD_CHANGED);
soft.assertEquals(errors.size(), 0, "Could not change the password of the user");
- soft.assertNotNull(homepage, "Could not change the password of the user");
+ soft.assertNotNull(homepage, "Homepage is not loaded. Could not change the password of the user");
soft.assertAll();
}
@Test(description = "PROF-04 User should be able to change his password")
- public void userShouldBeAbleToChangeHisPassword() throws Exception {
+ public void
+ userShouldBeAbleToChangeHisPassword() throws Exception {
UserModel adminUser = UserModel.generateUserWithADMINrole();
rest.users().createUser(adminUser);
@@ -155,10 +159,11 @@ public class ProfilePgTests extends SeleniumTest {
String newPass = "Edeltest!23456789Edelt" + Generator.randomAlphaNumericValue(4);
SetChangePasswordDialog setChangePasswordDialog = profilePage.profileData.clickOnChangePassword();
- setChangePasswordDialog.fillChangePassword(data.getNewPassword(), newPass);
+ setChangePasswordDialog.fillChangePassword(data.getNewPassword(),
+ newPass);
homePage = setChangePasswordDialog.TryClickOnChangePassword();
-
- soft.assertNotNull(homePage, "Could not change the password of the user");
+ String sucesfullMessage = homePage.getAlertArea().getAlertMessage();
+ soft.assertEquals(sucesfullMessage, Messages.PASSWORD_SUCCESSFULL_PASSWORD_CHANGED);
homePage.goToLoginPage();
loginPage.login(adminUser.getUsername(), newPass);
--
GitLab