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

91788: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      91682: Merged 5.0.0 (5.0.0.1) to 5.0.N (5.0.1)
         91617: MNT-12879: Cannot preview or download document with explicit permissions
         Disabled activity generation for file downloads from a private site if the user is not a member of the site.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94831 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 11:39:15 +00:00
parent 95283567ba
commit a35aee7b1e
3 changed files with 199 additions and 5 deletions

View File

@@ -53,6 +53,7 @@ import org.alfresco.repo.web.scripts.workflow.ActivitiWorkflowRestApiTest;
import org.alfresco.repo.web.scripts.workflow.JBPMWorkflowRestApiTest;
import org.alfresco.repo.web.scripts.workflow.WorkflowModelBuilderTest;
import org.alfresco.slingshot.documentlibrary.FolderTemplateTest;
import org.alfresco.slingshot.web.scripts.SlingshotContentGetTest;
/**
* Web Scripts test suite
@@ -102,6 +103,7 @@ public class WebScriptTestSuite extends TestSuite
suite.addTestSuite( CommentsApiTest.class );
suite.addTestSuite( FolderTemplateTest.class );
suite.addTestSuite( DeclarativeSpreadsheetWebScriptTest.class );
suite.addTestSuite( SlingshotContentGetTest.class);
// This uses a slightly different context
// As such, we can't run it in the same suite as the others,