Merged 5.1.N (5.1.3) to 5.2.N (5.2.1)

135141 cpopa: Merged WEBAPP-API (5.2.1) to 5.1.N (5.1.3)
      135076 cpopa: MNT-17341 : External users with Manager role cannot invite other external users to the site because site invitation accept fails
         - removed redundant test which was also causing problems to AbstractInvitationServiceImplTest because of a name clash
           SiteService.deleteSite doesn't remove a site completely, instead it leaves behind authorities and permissions, thus a SiteService.createSite would throw an exception
           even though SiteService.getSite returns null.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135151 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Constantin Popa
2017-02-14 16:32:38 +00:00
parent d81b9be2ad
commit 461db4a173
2 changed files with 1 additions and 27 deletions

View File

@@ -702,6 +702,7 @@ public abstract class AbstractInvitationServiceImplTest extends BaseAlfrescoSpri
siteService.createSite("InviteSitePreset", siteName, "InviteSiteTitle",
"InviteSiteDescription", SiteVisibility.MODERATED);
}
assertEquals( SiteModel.SITE_MANAGER, siteService.getMembersRole(siteName, AuthenticationUtil.getAdminUserName()));
// Invite user
NominatedInvitation nominatedInvitation = invitationService.inviteNominated(