Skip to content
Snippets Groups Projects
Commit 9e9bb8a5 authored by srosse's avatar srosse
Browse files

no-jira: fix import new users for linux headless

parent c971cbae
No related branches found
No related tags found
No related merge requests found
......@@ -519,11 +519,12 @@ public class UserTest {
String username2 = "mizore-" + uuid;
StringBuilder csv = new StringBuilder();
importWizard.append(username1, "rosario01", "Moka", "Akashiya", csv);
UserVO user1 = importWizard.append(username1, "rosario01", "Moka", "Akashiya", csv);
importWizard.append(username2, "vampire01", "Mizore", "Shirayuki", csv);
importWizard
.fill(csv.toString())
.next() // -> preview
.assertGreen(2)
.next() // -> groups
.next() // -> emails
.finish();
......@@ -536,6 +537,6 @@ public class UserTest {
userLoginPage
.loginAs(username1, "rosario01")
.resume()
.assertLoggedIn(username1);
.assertLoggedIn(user1);
}
}
......@@ -79,14 +79,6 @@ public class LoginPage {
Assert.assertTrue(name.contains(user.getLastName()));
}
public void assertLoggedIn(String username) {
WebElement usernameEl = browser.findElement(usernameFooterBy);
Assert.assertNotNull(usernameEl);
Assert.assertTrue(usernameEl.isDisplayed());
String value = usernameEl.getText();
Assert.assertTrue(value.contains(username));
}
/**
* Login and accept the disclaimer if there is one.
*
......
......@@ -21,9 +21,11 @@ package org.olat.selenium.page.user;
import java.awt.Toolkit;
import java.awt.datatransfer.StringSelection;
import java.util.List;
import org.junit.Assert;
import org.olat.selenium.page.graphene.OOGraphene;
import org.olat.user.restapi.UserVO;
import org.openqa.selenium.By;
import org.openqa.selenium.Keys;
import org.openqa.selenium.Platform;
......@@ -74,7 +76,7 @@ public class ImportUserPage {
* @param lastName
* @param sb
*/
public void append(String username, String password, String firstName, String lastName, StringBuilder sb) {
public UserVO append(String username, String password, String firstName, String lastName, StringBuilder sb) {
String email = username.replace("-", "") + "@frentix.com";
String institution = "frentix GmbH";
......@@ -90,6 +92,20 @@ public class ImportUserPage {
.append(institution).append(" ")
.append(institutionNumber).append(" ")
.append(institutionEmail).append('\n');
UserVO userVo = new UserVO();
userVo.setLogin(username);
userVo.setFirstName(firstName);
userVo.setLastName(lastName);
userVo.setEmail(email);
return userVo;
}
public ImportUserPage assertGreen(int numOfGreen) {
By greenBy = By.cssSelector(".o_dnd_label i.o_icon_new");
List<WebElement> greenEls = browser.findElements(greenBy);
Assert.assertEquals(numOfGreen, greenEls.size());
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