Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

64839: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      64771: MNT-10059: Resurrect PublishingRestApiTest and PublishWebContentJbpmTest.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66200 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-04-02 20:06:48 +00:00
parent 68474ade51
commit 798f24963d

View File

@@ -165,6 +165,7 @@ public class PublishingTestHelper
{
reset(channelType);
when(channelType.getId()).thenReturn(channelTypeId);
when(channelType.getTitle()).thenReturn(channelTypeId);
}
else
{