inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

1
source/test-java/org/alfresco/repo/invitation/AbstractInvitationServiceImplTest.java
View File

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

27
source/test-java/org/alfresco/repo/site/SiteServiceImplTest.java
View File

@@ -851,33 +851,6 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest
startNewTransaction(); startNewTransaction();
} }
public void testMNT_15614() throws Exception
{
RetryingTransactionCallback<Object> work = new RetryingTransactionCallback<Object>()
{
@Override
public Object execute() throws Throwable
{
String[] siteNames = { "it", "site", "GROUP" };
authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
for (String siteName : siteNames)
{
siteService.createSite(siteName, siteName, siteName, siteName, SiteVisibility.PUBLIC);
assertEquals( SiteModel.SITE_MANAGER, siteService.getMembersRole(siteName, AuthenticationUtil.getAdminUserName()));
siteService.deleteSite(siteName);
}
return null;
}
};
endTransaction();
transactionService.getRetryingTransactionHelper().doInTransaction(work);
startNewTransaction();
}
/** /**
* Test listSite case sensitivity * Test listSite case sensitivity
*/ */