diff options
| author | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2017-04-24 17:58:44 +0200 |
|---|---|---|
| committer | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2017-04-27 14:42:50 +0200 |
| commit | 93ce8a7e599cea9ed686b4406a0f4f64d3486a5c (patch) | |
| tree | 000833726a52cdf278e3bbca9660d189647b777c | |
| parent | d7ce42f81b9ce387128df86363a6fabb463fda55 (diff) | |
| download | sonarqube-93ce8a7e599cea9ed686b4406a0f4f64d3486a5c.tar.gz sonarqube-93ce8a7e599cea9ed686b4406a0f4f64d3486a5c.zip | |
SONAR-9136 remove permission to AnyOne in perm template of new orgs
3 files changed, 1 insertions, 5 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationCreationImpl.java b/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationCreationImpl.java index cc835cbb44c..8b51febb2f4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationCreationImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/organization/OrganizationCreationImpl.java @@ -217,8 +217,6 @@ public class OrganizationCreationImpl implements OrganizationCreation { insertGroupPermission(dbSession, permissionTemplateDto, SCAN.getKey(), ownerGroup); insertGroupPermission(dbSession, permissionTemplateDto, USER, defaultGroup); insertGroupPermission(dbSession, permissionTemplateDto, CODEVIEWER, defaultGroup); - insertGroupPermission(dbSession, permissionTemplateDto, USER, null); - insertGroupPermission(dbSession, permissionTemplateDto, CODEVIEWER, null); dbClient.organizationDao().setDefaultTemplates( dbSession, diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/OrganizationCreationImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/organization/OrganizationCreationImplTest.java index ca95df2bbb4..62896239c36 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/organization/OrganizationCreationImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/organization/OrganizationCreationImplTest.java @@ -272,7 +272,6 @@ public class OrganizationCreationImplTest { .extracting(PermissionTemplateGroupDto::getGroupId, PermissionTemplateGroupDto::getPermission) .containsOnly( tuple(ownersGroup.getId(), UserRole.ADMIN), tuple(ownersGroup.getId(), UserRole.ISSUE_ADMIN), tuple(ownersGroup.getId(), GlobalPermissions.SCAN_EXECUTION), - tuple(ANYONE_GROUP_ID, UserRole.USER), tuple(ANYONE_GROUP_ID, UserRole.CODEVIEWER), tuple(defaultGroupId, UserRole.USER), tuple(defaultGroupId, UserRole.CODEVIEWER)); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/CreateActionTest.java index 7a354eac0bf..48ac414b770 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/CreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/CreateActionTest.java @@ -524,7 +524,7 @@ public class CreateActionTest { } @Test - public void request_creates_default_template_for_owner_group_and_anyone() { + public void request_creates_default_template_for_owner_group() { mockForSuccessfulInsert(SOME_UUID, SOME_DATE); UserDto user = dbTester.users().insertUser(); userSession.logIn(user).setSystemAdministrator(); @@ -544,7 +544,6 @@ public class CreateActionTest { .extracting(PermissionTemplateGroupDto::getGroupId, PermissionTemplateGroupDto::getPermission) .containsOnly( tuple(ownersGroup.getId(), UserRole.ADMIN), tuple(ownersGroup.getId(), UserRole.ISSUE_ADMIN), tuple(ownersGroup.getId(), GlobalPermissions.SCAN_EXECUTION), - tuple(0, UserRole.USER), tuple(0, UserRole.CODEVIEWER), tuple(defaultGroup.getId(), UserRole.USER), tuple(defaultGroup.getId(), UserRole.CODEVIEWER)); } |