1)Necessary locators are changed and some locator got added.

2)Some testcases got modified in user page since the functionliyty of user page got changed.

smp-ui-tests/src/main/java/pages/components/ConfirmationDialog.java

@@ -38,8 +38,8 @@ public class ConfirmationDialog extends PageComponent {
 		waitForElementToBeClickable(noBtn);
 /*		Actions actions = new Actions(driver);
 		actions.moveToElement(noBtn).click().build().perform();*/
-		((JavascriptExecutor) driver).executeScript("arguments[0].click();", noBtn);
-		//noBtn.click();
+		//((JavascriptExecutor) driver).executeScript("arguments[0].click();", noBtn);
+		noBtn.click();
 		waitForElementToBeGone(noBtn);
 	}
 

smp-ui-tests/src/main/java/pages/users/UserPopup.java

@@ -66,7 +66,7 @@ public class UserPopup extends PageComponent {
 	@FindBy(css ="smp-password-change-dialog mat-dialog-actions button:nth-child(1)")
 	WebElement changedPassword;
 
-	@FindBy(css = "#nobuttondialog_id")
+	@FindBy(css = "#closebuttondialog_id")
 	WebElement passChangedClose;
 
 	@FindBy(css = "smp-password-change-dialog mat-dialog-actions button:nth-child(2)")
@@ -161,7 +161,7 @@ public class UserPopup extends PageComponent {
 		//return new UsersPage(driver);
 		return new ConfirmationDialog(driver);
 	}
-	public void setPassword(String adminPass,String newPass,String confirmPass)
+	public void setOrChangePassword(String adminPass,String newPass,String confirmPass)
 	{
 
 		clearAndFillInput(adminPassInput,adminPass);

smp-ui-tests/src/test/java/ui/UsersPgTest.java

@@ -78,9 +78,14 @@ public class UsersPgTest extends BaseTest {
 			e.printStackTrace();
 		}
 		popup.clickChangePassword();
-	    popup.setPassword(adminPass,validPass,validPass);
-		popup.clickChangedPassword().cancel();
-		//popup.clickCloseAfterChangedPass();
+	    popup.setOrChangePassword(adminPass,validPass,validPass);
+		popup.clickChangedPassword();
+		popup.clickCloseAfterChangedPass();
+		try {
+			Thread.sleep(1000);
+		}
+		catch(Exception e)
+		{}
 		popup.clickOK();
 		soft.assertTrue(usersPage.grid().isUserListed(username), "User present in the page");
 
@@ -160,7 +165,7 @@ public class UsersPgTest extends BaseTest {
 			popup = usersPage.clickEdit();
 
 			popup.clickChangePassword();
-			popup.setPassword(adminPass,pass,pass);
+			popup.setOrChangePassword(adminPass,pass,pass);
 			popup.clickClosePasswordDialog();
 			popup.clickCancel();
 			//popup.clickChangedPassword();
@@ -501,7 +506,7 @@ public class UsersPgTest extends BaseTest {
 		popup = page.clickEdit();
 
 		popup.clickChangePassword();
-		popup.setPassword(adminPass,validPass,validPass);
+		popup.setOrChangePassword(adminPass,validPass,validPass);
 		popup.clickChangedPassword();
 		popup.clickCloseAfterChangedPass();
 		popup.clickCancel();
@@ -545,7 +550,7 @@ public class UsersPgTest extends BaseTest {
 		popup = usersPage.clickEdit();
 
 		popup.clickChangePassword();
-		popup.setPassword(adminPass,validPass,confirmPass);
+		popup.setOrChangePassword(adminPass,validPass,confirmPass);
        // popup.clickUserDetailsToggle();
 		// popup.fillDetailsForm(username,validPass,confirmPass);
         soft.assertTrue(!popup.isChangePasswordButtonActive(), "password change button is enabled before valid data is filled in the popup(2)");