SONAR-8898 Fix ITs

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 aa348ee768114d6bc9740df81e72f86c525680e0..dcde71a09954b9f39a77462e57498ad2b8de041b 100644 (file)
--- 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 92443c96e275cf0c0f85546aeac2b3edfb1ea338..a78598bdd045ceec00590f9825d86bd228c25d50 100644 (file)
--- 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();
       }
     }
   }