aboutsummaryrefslogtreecommitdiffstats
path: root/it
diff options
context:
space:
mode:
authorJulien Lancelot <julien.lancelot@sonarsource.com>2017-03-13 17:11:50 +0100
committerJulien Lancelot <julien.lancelot@sonarsource.com>2017-03-21 13:05:50 +0100
commite0c71d74d5c500bdcc0f11faf03d3e4a2ec78c57 (patch)
tree83861de8505b7149f8fbc3b602982d912fc4cf6f /it
parent9a2d84d6e7345f6601fbba3ebe33d911e70461d2 (diff)
downloadsonarqube-e0c71d74d5c500bdcc0f11faf03d3e4a2ec78c57.tar.gz
sonarqube-e0c71d74d5c500bdcc0f11faf03d3e4a2ec78c57.zip
SONAR-8898 Fix ITs
Diffstat (limited to 'it')
-rw-r--r--it/it-tests/src/test/java/it/organization/OrganizationTest.java2
-rw-r--r--it/it-tests/src/test/java/util/user/UserRule.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/it/it-tests/src/test/java/it/organization/OrganizationTest.java b/it/it-tests/src/test/java/it/organization/OrganizationTest.java
index aa348ee7681..dcde71a0995 100644
--- a/it/it-tests/src/test/java/it/organization/OrganizationTest.java
+++ b/it/it-tests/src/test/java/it/organization/OrganizationTest.java
@@ -267,6 +267,7 @@ public class OrganizationTest {
userRule.createUser("bob", "bob");
userRule.removeGroups("sonar-users");
+ adminOrganizationService.addMember(orgKeyAndName, "bob");
addPermissionsToUser(orgKeyAndName, "bob", "provisioning", "scan");
ItUtils.runProjectAnalysis(orchestrator, "shared/xoo-sample",
@@ -325,6 +326,7 @@ public class OrganizationTest {
GroupManagement groupManagement = userRule.forOrganization(orgKeyAndName);
userRule.createUser("bob", "bob");
+ adminOrganizationService.addMember(orgKeyAndName, "bob");
groupManagement.createGroup("grp1");
groupManagement.createGroup("grp2");
groupManagement.associateGroupsToUser("bob", "grp1", "grp2");
diff --git a/it/it-tests/src/test/java/util/user/UserRule.java b/it/it-tests/src/test/java/util/user/UserRule.java
index 92443c96e27..a78598bdd04 100644
--- a/it/it-tests/src/test/java/util/user/UserRule.java
+++ b/it/it-tests/src/test/java/util/user/UserRule.java
@@ -232,8 +232,7 @@ public class UserRule extends ExternalResource implements GroupManagement {
.setParam("login", userLogin)
.setParam("name", group);
addOrganizationParam(request);
- WsResponse response = adminWsClient().wsConnector().call(request);
- assertThat(response.code()).isEqualTo(204);
+ adminWsClient().wsConnector().call(request).failIfNotSuccessful();
}
}
}