Skip to content
Snippets Groups Projects
Commit 0c21828c authored by srosse's avatar srosse
Browse files

OO-4030: update selenium after changes in password/username policy

parent 6050fe2d
No related branches found
No related tags found
No related merge requests found
...@@ -623,8 +623,9 @@ public class UserTest extends Deployments { ...@@ -623,8 +623,9 @@ public class UserTest extends Deployments {
.resume(); .resume();
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
String username = "miku-" + uuid; String username = ("miku-" + uuid).substring(0, 32);
UserVO userVo = UserAdminPage.createUserVO(username, "Miku", "Hatsune", "miku-" + uuid + "@openolat.com", "miku01"); String password = "Miku#hatsune#01";
UserVO userVo = UserAdminPage.createUserVO(username, "Miku", "Hatsune", username + "@openolat.com", password);
NavigationPage navBar = NavigationPage.load(browser); NavigationPage navBar = NavigationPage.load(browser);
UserAdminPage userAdminPage = navBar UserAdminPage userAdminPage = navBar
...@@ -644,7 +645,7 @@ public class UserTest extends Deployments { ...@@ -644,7 +645,7 @@ public class UserTest extends Deployments {
LoginPage userLoginPage = LoginPage.load(userBrowser, deploymentUrl); LoginPage userLoginPage = LoginPage.load(userBrowser, deploymentUrl);
//tools //tools
userLoginPage userLoginPage
.loginAs(username, "miku01") .loginAs(username, password)
.resume() .resume()
.assertLoggedIn(userVo); .assertLoggedIn(userVo);
} }
...@@ -671,9 +672,10 @@ public class UserTest extends Deployments { ...@@ -671,9 +672,10 @@ public class UserTest extends Deployments {
.resume(); .resume();
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
String username = "miku-" + uuid; String username = ("miku-" + uuid).substring(0, 32);
String lastName = "Hatsune" + uuid; String lastName = "Hatsune" + uuid;
UserVO userVo = UserAdminPage.createUserVO(username, "Miku", lastName, "miku-" + uuid + "@openolat.com", "miku01"); String password = "Miku#hatsune#02";
UserVO userVo = UserAdminPage.createUserVO(username, "Miku", lastName, username + "@openolat.com", password);
NavigationPage navBar = NavigationPage.load(browser); NavigationPage navBar = NavigationPage.load(browser);
UserAdminPage userAdminPage = navBar UserAdminPage userAdminPage = navBar
...@@ -686,7 +688,7 @@ public class UserTest extends Deployments { ...@@ -686,7 +688,7 @@ public class UserTest extends Deployments {
LoginPage userLoginPage = LoginPage.load(userBrowser, deploymentUrl); LoginPage userLoginPage = LoginPage.load(userBrowser, deploymentUrl);
//tools //tools
userLoginPage userLoginPage
.loginAs(username, "miku01") .loginAs(username, password)
.resume() .resume()
.assertLoggedIn(userVo); .assertLoggedIn(userVo);
//log out //log out
...@@ -702,7 +704,7 @@ public class UserTest extends Deployments { ...@@ -702,7 +704,7 @@ public class UserTest extends Deployments {
//user try the login //user try the login
userLoginPage = LoginPage.load(userBrowser, deploymentUrl); userLoginPage = LoginPage.load(userBrowser, deploymentUrl);
userLoginPage userLoginPage
.loginDenied(username, "miku01"); .loginDenied(username, password);
//assert on error message //assert on error message
By errorMessageby = By.cssSelector("div.modal-body.alert.alert-danger"); By errorMessageby = By.cssSelector("div.modal-body.alert.alert-danger");
OOGraphene.waitElement(errorMessageby, 2, userBrowser); OOGraphene.waitElement(errorMessageby, 2, userBrowser);
...@@ -741,8 +743,8 @@ public class UserTest extends Deployments { ...@@ -741,8 +743,8 @@ public class UserTest extends Deployments {
ImportUserPage importWizard = userAdminPage.startImport(); ImportUserPage importWizard = userAdminPage.startImport();
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
String username1 = "moka-" + uuid; String username1 = ("moka-" + uuid).substring(0, 32);
String username2 = "mizore-" + uuid; String username2 = ("mizore-" + uuid).substring(0, 32);
StringBuilder csv = new StringBuilder(); StringBuilder csv = new StringBuilder();
UserVO user1 = importWizard.append(username1, "rosario01", "Moka", "Akashiya", csv); UserVO user1 = importWizard.append(username1, "rosario01", "Moka", "Akashiya", csv);
...@@ -799,11 +801,13 @@ public class UserTest extends Deployments { ...@@ -799,11 +801,13 @@ public class UserTest extends Deployments {
ImportUserPage importWizard = userAdminPage.startImport(); ImportUserPage importWizard = userAdminPage.startImport();
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
String username1 = "moka-" + uuid; String username1 = ("moka-" + uuid).substring(0, 32);
String password1 = "Rosario#02";
String password2 = "Openolat#2";
StringBuilder csv = new StringBuilder(); StringBuilder csv = new StringBuilder();
UserVO newUser = importWizard.append(username1, "rosario02", "Moka", "Akashiya", csv); UserVO newUser = importWizard.append(username1, password1, "Moka", "Akashiya", csv);
user1 = importWizard.append(user1, "Aono", "openolat2", csv); user1 = importWizard.append(user1, "Aono", password2, csv);
importWizard importWizard
.fill(csv.toString()) .fill(csv.toString())
.nextData() // -> preview .nextData() // -> preview
...@@ -821,7 +825,7 @@ public class UserTest extends Deployments { ...@@ -821,7 +825,7 @@ public class UserTest extends Deployments {
LoginPage userLoginPage = LoginPage.load(existingUserBrowser, deploymentUrl); LoginPage userLoginPage = LoginPage.load(existingUserBrowser, deploymentUrl);
//tools //tools
userLoginPage userLoginPage
.loginAs(user1.getLogin(), "openolat2") .loginAs(user1.getLogin(), password2)
.resume() .resume()
.assertLoggedInByLastName("Aono"); .assertLoggedInByLastName("Aono");
...@@ -829,7 +833,7 @@ public class UserTest extends Deployments { ...@@ -829,7 +833,7 @@ public class UserTest extends Deployments {
LoginPage newLoginPage = LoginPage.load(newUserBrowser, deploymentUrl); LoginPage newLoginPage = LoginPage.load(newUserBrowser, deploymentUrl);
//tools //tools
newLoginPage newLoginPage
.loginAs(newUser.getLogin(), "rosario02") .loginAs(newUser.getLogin(), password1)
.resume() .resume()
.assertLoggedInByLastName("Akashiya"); .assertLoggedInByLastName("Akashiya");
} }
......
...@@ -52,6 +52,7 @@ public class DialogConfigurationPage { ...@@ -52,6 +52,7 @@ public class DialogConfigurationPage {
By inputBy = By.xpath("//div[contains(@class,'modal-body')]//div[@class='o_fileinput']/input[@type='file']"); By inputBy = By.xpath("//div[contains(@class,'modal-body')]//div[@class='o_fileinput']/input[@type='file']");
OOGraphene.uploadFile(inputBy, file, browser); OOGraphene.uploadFile(inputBy, file, browser);
OOGraphene.waitBusy(browser);
By uploadButtonBy = By.cssSelector("div.modal-body div.o_sel_upload_buttons button.btn-primary"); By uploadButtonBy = By.cssSelector("div.modal-body div.o_sel_upload_buttons button.btn-primary");
OOGraphene.waitElement(uploadButtonBy, browser); OOGraphene.waitElement(uploadButtonBy, browser);
......
...@@ -191,17 +191,8 @@ public class UserAdminPage { ...@@ -191,17 +191,8 @@ public class UserAdminPage {
} }
public UserAdminPage assertOnUserEditView(String username) { public UserAdminPage assertOnUserEditView(String username) {
By userInfoTdBy = By.cssSelector(".o_user_infos table tr td"); By userInfoBy = By.xpath("//div[contains(@class,'o_user_infos')]//table//tr/td[contains(text(),'" + username + "')]");
List<WebElement> tds = browser.findElements(userInfoTdBy); OOGraphene.waitElement(userInfoBy, browser);
boolean found = false;
for(WebElement td:tds) {
String text = td.getText();
if(text != null && text.equals(username)) {
found = true;
break;
}
}
Assert.assertTrue(found);
return this; return this;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment