aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSébastien Lesaint <sebastien.lesaint@sonarsource.com>2017-04-26 15:36:44 +0200
committerSébastien Lesaint <sebastien.lesaint@sonarsource.com>2017-04-27 14:42:50 +0200
commitee3ead28dc63b78ca14a800cce155b7db3d1e453 (patch)
treedd9f18099e723072627a193994781b5e508eb209
parent681ae7cfbd1672f468154f7ccc12245f72750382 (diff)
downloadsonarqube-ee3ead28dc63b78ca14a800cce155b7db3d1e453.tar.gz
sonarqube-ee3ead28dc63b78ca14a800cce155b7db3d1e453.zip
SONAR-9104 fix IT
-rw-r--r--it/it-tests/src/test/java/it/administration/ProjectsAdministrationTest.java8
-rw-r--r--it/it-tests/src/test/java/it/authorisation/ExecuteAnalysisPermissionTest.java4
2 files changed, 7 insertions, 5 deletions
diff --git a/it/it-tests/src/test/java/it/administration/ProjectsAdministrationTest.java b/it/it-tests/src/test/java/it/administration/ProjectsAdministrationTest.java
index c6258e7b886..9efa0899ff5 100644
--- a/it/it-tests/src/test/java/it/administration/ProjectsAdministrationTest.java
+++ b/it/it-tests/src/test/java/it/administration/ProjectsAdministrationTest.java
@@ -28,10 +28,13 @@ import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.sonarqube.ws.client.permission.RemoveGroupWsRequest;
+import org.sonarqube.ws.client.project.UpdateVisibilityRequest;
import pageobjects.Navigation;
+import util.ItUtils;
import static com.codeborne.selenide.Condition.text;
import static com.codeborne.selenide.Selenide.$;
+import static org.sonarqube.ws.client.project.UpdateVisibilityRequest.Visibility.PRIVATE;
import static util.ItUtils.newAdminWsClient;
import static util.ItUtils.projectDir;
@@ -52,9 +55,8 @@ public class ProjectsAdministrationTest {
public void return_all_projects_even_when_no_permission() throws Exception {
orchestrator.executeBuild(SonarScanner.create(projectDir("shared/xoo-sample")).setProperties("sonar.projectKey", "sample1"));
orchestrator.executeBuild(SonarScanner.create(projectDir("shared/xoo-sample")).setProperties("sonar.projectKey", "sample2"));
- // Remove 'Browse' permission from anyone and 'Admin' permission for admin group on project 2 -> No one can access or admin this
- // project, expect System Admin
- newAdminWsClient(orchestrator).permissions().removeGroup(new RemoveGroupWsRequest().setProjectKey("sample2").setGroupName("Anyone").setPermission("user"));
+ ItUtils.newAdminWsClient(orchestrator).projects().updateVisibility(new UpdateVisibilityRequest("sample2", PRIVATE));
+ // Remove 'Admin' permission for admin group on project 2 -> No one can access or admin this project, expect System Admin
newAdminWsClient(orchestrator).permissions().removeGroup(new RemoveGroupWsRequest().setProjectKey("sample2").setGroupName("sonar-administrators").setPermission("admin"));
nav.logIn().asAdmin().open("/projects_admin");
diff --git a/it/it-tests/src/test/java/it/authorisation/ExecuteAnalysisPermissionTest.java b/it/it-tests/src/test/java/it/authorisation/ExecuteAnalysisPermissionTest.java
index 4ac3eb1737c..5ec88a35529 100644
--- a/it/it-tests/src/test/java/it/authorisation/ExecuteAnalysisPermissionTest.java
+++ b/it/it-tests/src/test/java/it/authorisation/ExecuteAnalysisPermissionTest.java
@@ -101,8 +101,8 @@ public class ExecuteAnalysisPermissionTest {
// Do a first analysis, no error
executeAnonymousAnalysis();
- // Remove browse permission for groups Anyone on the project
- removeProjectPermission("anyone", "sample", "user");
+ // make project private
+ ItUtils.newAdminWsClient(orchestrator).projects().updateVisibility(new UpdateVisibilityRequest("sample", PRIVATE));
// still no error
executeAnonymousAnalysis();