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

Merged BRANCHES/DEV/HEAD_QUICK_SHARE_TMP to HEAD:

Browse Source 
41641: Merged from THOR1_SPRINTS to HEAD_QUICK_SHARE_TMP
        36472: Merged DEV/THOR1_QUICK_SHARE to DEV/THOR1_SPRINTS
           Improvements for THOR-1270 "F387: As the link receiver, I can view the Document Preview in the browser without having to login"
           - Added new component evaluator for bringing in different components based on page id
           - The title of the quickshare page now contains the document's name (to improve the social "Share with:" experience)
           - Added new icon for page not found screen
        36601: Merge from THOR1_QUICK_SHARE to THOR1_SPRINTS
           36599: Improvements for THOR-1270 "F387: As the link receiver, I can view the Document Preview in the browser without having to login"
              - Made the "Preparing previewer... text get rendered using javascript so Google+ won't
                include it in its description when sharing quickshare links
        36735: THOR-1430: QuickShare link breaks after uploading a new version of a shared file
   41656: Merged from CLOUD1 to HEAD_QUICK_SHARE_TMP
        37200: Fix issue from "V4.0-BUG-FIX to CLOUD1 merge" r37178
           - Removed trailing === of property "system.quickshare.enabled"
        37226: Fix issue from "V4.0-BUG-FIX to CLOUD1 merge" r37178 part 3
           - When "date-format.defaultFTL" was removed from common.properties freemarker code in node-header that depended upon it got an exception, 
             code is now refactored to use client side date handling instead.
   41659: Merged CLOUD1 to HEAD_QUICK_SHARE_TMP
        39206 Fixed CLOUD-198 "WASA - XSS issue with quickshare"
   41661: Merge from CLOUD1-BUG-FIX to HEAD_QUICK_SHARE_TMP
   41680: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/HEAD_QUICK_SHARE_TMP:
        41679: Minor: fix for non-MT (required for QuickShare Unshare when running non-MT)
   41681: Fix pesky solrcore.properties
   41715: QuickShare: fix test and add to suite


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@41738 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2012-09-18 15:01:58 +00:00
parent 4f7aee6432
commit 6da7aceb6e
3 changed files with 76 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/java/org/alfresco/repo/web/scripts/WebScriptTestSuite.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2010 Alfresco Software Limited.
* Copyright (C) 2005-2012 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -35,6 +35,7 @@ import org.alfresco.repo.web.scripts.invitation.InvitationWebScriptTest;
import org.alfresco.repo.web.scripts.invite.InviteServiceTest;
import org.alfresco.repo.web.scripts.person.PersonServiceTest;
import org.alfresco.repo.web.scripts.preference.PreferenceServiceTest;
import org.alfresco.repo.web.scripts.quickshare.QuickShareRestApiTest;
import org.alfresco.repo.web.scripts.rating.RatingRestApiTest;
import org.alfresco.repo.web.scripts.replication.ReplicationRestApiTest;
import org.alfresco.repo.web.scripts.rule.RuleServiceTest;
@@ -49,7 +50,6 @@ import org.alfresco.repo.web.scripts.wcm.sandbox.SandboxTest;
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.repo.web.scripts.workflow.AbstractWorkflowRestApiTest;
/**
* Web Scripts test suite
@@ -59,11 +59,12 @@ public class WebScriptTestSuite extends TestSuite
public static Test suite()
{
TestSuite suite = new TestSuite();
// Ensure that a suitable context is available
TestWebScriptRepoServer.getTestServer();
// Add the tests
suite.addTestSuite( QuickShareRestApiTest.class );
suite.addTestSuite( AdminWebScriptTest.class );
suite.addTestSuite( AuditWebScriptTest.class );
suite.addTestSuite( BlogServiceTest.class );
@@ -94,7 +95,7 @@ public class WebScriptTestSuite extends TestSuite
suite.addTestSuite( WorkflowModelBuilderTest.class );
suite.addTestSuite( ActivitiWorkflowRestApiTest.class );
suite.addTestSuite( JBPMWorkflowRestApiTest.class );
// This uses a slightly different context
// As such, we can't run it in the same suite as the others,
// due to finalisers closing caches when we're not looking
@@ -102,4 +103,4 @@ public class WebScriptTestSuite extends TestSuite
return suite;
}
}
}