From ecd89b4df66ceec6223fbd2409fe7e665cdca1be Mon Sep 17 00:00:00 2001 From: srosse <none@none> Date: Mon, 26 Oct 2015 12:18:32 +0100 Subject: [PATCH] OO-1738: fix the selenium test which imports existing users --- src/test/java/org/olat/selenium/UserTest.java | 3 ++- .../selenium/page/user/ImportUserPage.java | 24 ++++++++++++++++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/test/java/org/olat/selenium/UserTest.java b/src/test/java/org/olat/selenium/UserTest.java index 5403933e349..d11e894efe5 100644 --- a/src/test/java/org/olat/selenium/UserTest.java +++ b/src/test/java/org/olat/selenium/UserTest.java @@ -583,7 +583,8 @@ public class UserTest { .next() // -> preview .assertGreen(1) .assertWarn(1) - .changePassword() + .updatePasswords() + .updateUsers() .next() // -> groups .next() // -> emails .finish(); diff --git a/src/test/java/org/olat/selenium/page/user/ImportUserPage.java b/src/test/java/org/olat/selenium/page/user/ImportUserPage.java index e4b99bfa2bc..7c63845e53d 100644 --- a/src/test/java/org/olat/selenium/page/user/ImportUserPage.java +++ b/src/test/java/org/olat/selenium/page/user/ImportUserPage.java @@ -27,6 +27,7 @@ import org.olat.user.restapi.UserVO; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.ui.Select; /** * @@ -56,9 +57,26 @@ public class ImportUserPage { return this; } - public ImportUserPage changePassword() { - By updatePassword = By.cssSelector("input[name='update.password'][type='checkbox']"); - browser.findElement(updatePassword).click(); + /** + * In the first mandatory option, select the update password one. + * @return + */ + public ImportUserPage updatePasswords() { + By updatePassword = By.id("o_fioupdate_password_SELBOX"); + Select passwordDropdown = new Select(browser.findElement(updatePassword)); + passwordDropdown.selectByValue("update"); + OOGraphene.waitBusy(browser); + return this; + } + + /** + * In the second mandatory option, select the update existing user one. + * @return + */ + public ImportUserPage updateUsers() { + By updatePassword = By.id("o_fioupdate_user_SELBOX"); + Select passwordDropdown = new Select(browser.findElement(updatePassword)); + passwordDropdown.selectByValue("update"); OOGraphene.waitBusy(browser); return this; } -- GitLab