import org.junit.After;
import org.junit.BeforeClass;
import org.junit.ClassRule;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
String user1 = createUser();
String user2 = createUser();
createUser();
-
adminClient.organizations().addMember(orgKey, user1);
adminClient.organizations().addMember(orgKey, user2);
@Test
public void admin_can_add_members() {
String orgKey = createOrganization();
- userRule.createUser("foo", "pwd");
+ String user = createUser();
createUser();
MembersPage page = nav.logIn().asAdmin().openOrganizationMembers(orgKey);
page
.shouldHaveTotal(1)
- .addMember("foo")
+ .addMember(user)
.shouldHaveTotal(2);
page.getMembersByIdx(0).shouldBeNamed("admin", "Administrator").shouldHaveGroups(2);
- page.getMembersByIdx(1).shouldBeNamed("foo", "foo").shouldHaveGroups(1);
+ page.getMembersByIdx(1).shouldBeNamed(user, user).shouldHaveGroups(1);
}
@Test
public void admin_can_remove_members() {
String orgKey = createOrganization();
- userRule.createUser("foo", "pwd");
- userRule.createUser("bar", "pwd");
-
- adminClient.organizations().addMember(orgKey, "foo");
- adminClient.organizations().addMember(orgKey, "bar");
+ String user1 = createUser();
+ String user2 = createUser();
+ adminClient.organizations().addMember(orgKey, user1);
+ adminClient.organizations().addMember(orgKey, user2);
MembersPage page = nav.logIn().asAdmin().openOrganizationMembers(orgKey);
page.shouldHaveTotal(3)
@Test
public void admin_can_manage_groups() {
String orgKey = createOrganization();
- userRule.createUser("foo", "pwd");
-
- adminClient.organizations().addMember(orgKey, "foo");
+ String user = createUser();
+ adminClient.organizations().addMember(orgKey, user);
MembersPage page = nav.logIn().asAdmin().openOrganizationMembers(orgKey);
// foo user
@Test
public void groups_count_should_be_updated_when_a_member_was_just_added() {
String orgKey = createOrganization();
- userRule.createUser("foo", "pwd");
-
+ String user = createUser();
MembersPage page = nav.logIn().asAdmin().openOrganizationMembers(orgKey);
page
- .addMember("foo")
+ .addMember(user)
.getMembersByIdx(1)
.shouldHaveGroups(1)
.manageGroupsOpen()
adminWsClient = newAdminWsClient(ORCHESTRATOR);
userTokensWsClient = adminWsClient.userTokens();
+ userRule.deactivateUsers(LOGIN, "simple-user");
userRule.createUser(LOGIN, "123456");
addUserPermission(LOGIN, "admin");
@Test
public void basic_authentication_does_not_support_utf8_passwords() {
- String login = LOGIN;
+ String login = "user_with_utf8_password";
// see http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-test.txt
String password = "κόσμε";
// create user with a UTF-8 password
- userRule.createUser(login, LOGIN, null, password);
+ userRule.createUser(login, password);
// authenticate
assertThat(checkAuthenticationWithAuthenticateWebService(login, password)).isFalse();
.setParam("login", login)
.setParam("name", name)
.setParam("email", email)
- .setParam("password", password));
+ .setParam("password", password))
+ .failIfNotSuccessful();
}
public void createUser(String login, String password) {
public Users getUsers() {
WsResponse response = adminWsClient().wsConnector().call(
- new GetRequest("api/users/search"));
- assertThat(response.code()).isEqualTo(200);
+ new GetRequest("api/users/search"))
+ .failIfNotSuccessful();
return Users.parse(response.content());
}
.setParam("name", name)
.setParam("description", description);
addOrganizationParam(request);
- adminWsClient().wsConnector().call(request);
+ adminWsClient().wsConnector().call(request).failIfNotSuccessful();
}
private void addOrganizationParam(PostRequest request) {
PostRequest request = new PostRequest("api/user_groups/delete")
.setParam("name", groupName);
addOrganizationParam(request);
- adminWsClient().wsConnector().call(request);
+ adminWsClient().wsConnector().call(request).failIfNotSuccessful();
}
}
}
public Groups getGroups() {
GetRequest request = new GetRequest("api/user_groups/search");
addOrganizationParam(request);
- WsResponse response = adminWsClient().wsConnector().call(request);
- assertThat(response.code()).isEqualTo(200);
+ WsResponse response = adminWsClient().wsConnector().call(request).failIfNotSuccessful();
return Groups.parse(response.content());
}