From 85a044dab3ae5e2783af0f42cd740fe144a88c66 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 2 Apr 2014 20:07:52 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 64840: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud) 64783: MNT-10059: Resurrect PublishingRestApiTest and PublishWebContentJbpmTest. Re-enable PublishingRestApiTest test. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66201 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repo/web/scripts/WebScriptTestSuite.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/test-java/org/alfresco/repo/web/scripts/WebScriptTestSuite.java b/source/test-java/org/alfresco/repo/web/scripts/WebScriptTestSuite.java index d9d5edba5f..9d481d0d6c 100644 --- a/source/test-java/org/alfresco/repo/web/scripts/WebScriptTestSuite.java +++ b/source/test-java/org/alfresco/repo/web/scripts/WebScriptTestSuite.java @@ -90,8 +90,7 @@ public class WebScriptTestSuite extends TestSuite suite.addTestSuite( WorkflowModelBuilderTest.class ); suite.addTestSuite( ActivitiWorkflowRestApiTest.class ); suite.addTestSuite( JBPMWorkflowRestApiTest.class ); - // Still failing - see MNT-10059 - // suite.addTestSuite( PublishingRestApiTest.class ); + suite.addTestSuite( PublishingRestApiTest.class ); // This uses a slightly different context // As such, we can't run it in the same suite as the others,