SONAR-10134 Add organization parameter in quality gates wsclient

2 files changed, 7 insertions, 4 deletions

diff --git a/tests/src/test/java/org/sonarqube/tests/qualityGate/OrganizationQualityGateUiTest.java b/tests/src/test/java/org/sonarqube/tests/qualityGate/OrganizationQualityGateUiTest.java
index 37cd43aa4cc..0262c9d68bc 100644
--- a/tests/src/test/java/org/sonarqube/tests/qualityGate/OrganizationQualityGateUiTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/qualityGate/OrganizationQualityGateUiTest.java
@@ -55,11 +55,14 @@ public class OrganizationQualityGateUiTest {
   private Users.CreateWsResponse.User gateAdmin;
 
   @Before
-  public void setUp() throws Exception {
+  public void setUp() {
     organization = tester.organizations().generate();
     gateAdmin = tester.users().generate();
-    tester.organizations().addMember(tester.organizations().getDefaultOrganization(), gateAdmin);
-    tester.wsClient().permissions().addUser(new AddUserRequest().setLogin(gateAdmin.getLogin()).setPermission("gateadmin"));
+    tester.organizations().addMember(organization, gateAdmin);
+    tester.wsClient().permissions().addUser(new AddUserRequest()
+      .setOrganization(organization.getKey())
+      .setLogin(gateAdmin.getLogin())
+      .setPermission("gateadmin"));
     user = tester.users().generate();
     tester.organizations().addMember(organization, user);
     restoreProfile(orchestrator, getClass().getResource("/issue/with-many-rules.xml"), organization.getKey());
diff --git a/tests/src/test/java/org/sonarqube/tests/qualityGate/QualityGateUiTest.java b/tests/src/test/java/org/sonarqube/tests/qualityGate/QualityGateUiTest.java
index 859f6b479fc..279c5a438de 100644
--- a/tests/src/test/java/org/sonarqube/tests/qualityGate/QualityGateUiTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/qualityGate/QualityGateUiTest.java
@@ -56,7 +56,7 @@ public class QualityGateUiTest {
     .disableOrganizations();
 
   @Before
-  public void initPeriod() throws Exception {
+  public void initPeriod() {
     tester.settings().setGlobalSettings("sonar.leak.period", "previous_version");
   }