SONAR-8968 Add organization parameter in api/users/groups

2 files changed, 2 insertions, 7 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 dcde71a0995..cf1783c879c 100644
--- a/it/it-tests/src/test/java/it/organization/OrganizationTest.java
+++ b/it/it-tests/src/test/java/it/organization/OrganizationTest.java
@@ -312,7 +312,7 @@ public class OrganizationTest {
   }
 
   @Test
-  public void deleting_an_organization_also_deletes_group_permissions_and_projects_and_check_security() {
+  public void deleting_an_organization_also_deletes_projects_and_check_security() {
     verifyNoExtraOrganization();
 
     String orgKeyAndName = "org-key";
@@ -343,10 +343,6 @@ public class OrganizationTest {
     adminOrganizationService.delete(orgKeyAndName);
 
     expect404HttpError(() -> searchSampleProject(orgKeyAndName, componentsService));
-    assertThat(groupManagement.getUserGroups("bob").getGroups())
-      .extracting(Groups.Group::getName)
-      .doesNotContain("grp1", "grp2");
-
     verifyNoExtraOrganization();
   }
 
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 51dc8b95683..038e0f150eb 100644
--- a/it/it-tests/src/test/java/util/user/UserRule.java
+++ b/it/it-tests/src/test/java/util/user/UserRule.java
@@ -218,8 +218,7 @@ public class UserRule extends ExternalResource implements GroupManagement {
           .setParam("login", userLogin)
           .setParam("selected", "selected");
       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());
     }