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

Merged 5.2.N (5.2.1) to HEAD (5.2)

Browse Source 
129048 cpopa: SHA-1627 : CLONE - Create email template
      - Hooked a new step into the invite moderated workflow, so as to notify by email all site managers of site join requests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alexandru Epure
2016-08-09 14:07:57 +00:00
parent 11fdceb2cc
commit 29945e3205
18 changed files with 929 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/test-java/org/alfresco/repo/invitation/site/InviteSenderTest.java
View File

@@ -115,7 +115,7 @@ public class InviteSenderTest extends TestCase
private final MessageService messageService = mock(MessageService.class);
private Action mailAction;
private SiteInfo siteInfo = mock(SiteInfo.class);
private InviteSender sender;
private InviteNominatedSender sender;
private Map<String,Serializable> lastSetMailModel;
protected void testSendMailWorkingPath(
@@ -355,8 +355,8 @@ public class InviteSenderTest extends TestCase
properties.put(wfVarInviteeGenPassword, password);
properties.put(wfVarInviteTicket, ticket);
properties.put(wfVarServerPath, path);
properties.put(InviteSender.WF_PACKAGE, packageId);
properties.put(InviteSender.WF_INSTANCE_ID, instanceId);
properties.put(InviteNominatedSender.WF_PACKAGE, packageId);
properties.put(InviteNominatedSender.WF_INSTANCE_ID, instanceId);
return properties;
}
@@ -366,7 +366,7 @@ public class InviteSenderTest extends TestCase
super.setUp();
ServiceRegistry services = mockServices();
Repository repository = mockRepository();
sender = new InviteSender(services, repository, messageService);
sender = new InviteNominatedSender(services, repository, messageService);
lastSetMailModel = null;
}