From 94eb70796cdfd64532ed402c37e9aa2c2a5d65cb Mon Sep 17 00:00:00 2001
From: bozmiha <Mihai.BOZ@ext.ec.europa.eu>
Date: Thu, 9 Nov 2023 16:15:26 +0200
Subject: [PATCH] modify locator for expired on element to fix test.

Signed-off-by: bozmiha <Mihai.BOZ@ext.ec.europa.eu>
---
 .../dcomponents/commonComponents/UserDataCommonComponent.java   | 2 +-
 domiSMP-ui-tests/src/main/java/pages/LoginPage.java             | 1 -
 .../src/test/java/domiSMPTests/ui/ProfilePgTests.java           | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/domiSMP-ui-tests/src/main/java/ddsl/dcomponents/commonComponents/UserDataCommonComponent.java b/domiSMP-ui-tests/src/main/java/ddsl/dcomponents/commonComponents/UserDataCommonComponent.java
index 976baf529..2d93d77bf 100644
--- a/domiSMP-ui-tests/src/main/java/ddsl/dcomponents/commonComponents/UserDataCommonComponent.java
+++ b/domiSMP-ui-tests/src/main/java/ddsl/dcomponents/commonComponents/UserDataCommonComponent.java
@@ -26,7 +26,7 @@ public class UserDataCommonComponent extends DomiSMPPage {
     private WebElement fullNameInput;
     @FindBy(id = "passwordUpdatedOn_id")
     private WebElement lastSetLbl;
-    @FindBy(id = "passwordExpireOnMessage_id")
+    @FindBy(id = "passwordExpireOn_id")
     private WebElement passwordExpiresOnLbl;
 
     public UserDataCommonComponent(WebDriver driver) {
diff --git a/domiSMP-ui-tests/src/main/java/pages/LoginPage.java b/domiSMP-ui-tests/src/main/java/pages/LoginPage.java
index ad8f31f6d..881ee4cc9 100644
--- a/domiSMP-ui-tests/src/main/java/pages/LoginPage.java
+++ b/domiSMP-ui-tests/src/main/java/pages/LoginPage.java
@@ -45,7 +45,6 @@ public class LoginPage extends DomiSMPPage {
             }
         } catch (Exception e) {
             LOG.debug("Password expiration popup is not present");
-            throw new RuntimeException("Password expiration popup is not present", e);
         }
 
 
diff --git a/domiSMP-ui-tests/src/test/java/domiSMPTests/ui/ProfilePgTests.java b/domiSMP-ui-tests/src/test/java/domiSMPTests/ui/ProfilePgTests.java
index e01db86f7..cd3c6d203 100644
--- a/domiSMP-ui-tests/src/test/java/domiSMPTests/ui/ProfilePgTests.java
+++ b/domiSMP-ui-tests/src/test/java/domiSMPTests/ui/ProfilePgTests.java
@@ -149,7 +149,6 @@ public class ProfilePgTests extends SeleniumTest {
         String oldLastSet = profilePage.profileData.getLastSetValue();
         String oldPasswordExpiresOn = profilePage.profileData.getPasswordExpiresOnValue();
 
-        //profilePage.profileData.setChangePasswordBtn.click();
         String newPass = "Edeltest!23456789Edelt" + Generator.randomAlphaNumericValue(4);
         SetChangePasswordDialog setChangePasswordDialog = profilePage.profileData.clickOnChangePassword();
         setChangePasswordDialog.fillChangePassword(data.getNewPassword(), newPass);
-- 
GitLab