diff --git a/source/java/org/alfresco/wcm/WCMTestSuite.java b/source/java/org/alfresco/wcm/WCMTestSuite.java index 169a66060b..816699316c 100644 --- a/source/java/org/alfresco/wcm/WCMTestSuite.java +++ b/source/java/org/alfresco/wcm/WCMTestSuite.java @@ -29,6 +29,7 @@ import junit.framework.TestSuite; import org.alfresco.wcm.sandbox.SandboxServiceImplTest; import org.alfresco.wcm.webproject.WebProjectServiceImplTest; +import org.alfresco.wcm.webproject.script.ScriptWebProjectsTest; /** * WCM test suite @@ -48,6 +49,7 @@ public class WCMTestSuite extends TestSuite suite.addTestSuite(WebProjectServiceImplTest.class); suite.addTestSuite(SandboxServiceImplTest.class); + suite.addTestSuite(ScriptWebProjectsTest.class); return suite; } diff --git a/source/java/org/alfresco/wcm/sandbox/SandboxServiceImplTest.java b/source/java/org/alfresco/wcm/sandbox/SandboxServiceImplTest.java index dfd1cbd0aa..8d21b51efc 100644 --- a/source/java/org/alfresco/wcm/sandbox/SandboxServiceImplTest.java +++ b/source/java/org/alfresco/wcm/sandbox/SandboxServiceImplTest.java @@ -964,7 +964,7 @@ public class SandboxServiceImplTest extends TestCase // Invite web users wpService.inviteWebUser(wpStoreId, USER_ONE, WCMUtil.ROLE_CONTENT_CONTRIBUTOR, true); - wpService.inviteWebUser(wpStoreId, USER_TWO, WCMUtil.ROLE_CONTENT_PUBLISHER, true); + wpService.inviteWebUser(wpStoreId, USER_TWO, WCMUtil.ROLE_CONTENT_MANAGER, true); // note: publisher does not have permission to delete // Switch to USER_ONE AuthenticationUtil.setCurrentUser(USER_ONE); @@ -1066,7 +1066,11 @@ public class SandboxServiceImplTest extends TestCase // Invite web users wpService.inviteWebUser(wpStoreId, USER_ONE, WCMUtil.ROLE_CONTENT_CONTRIBUTOR, true); - wpService.inviteWebUser(wpStoreId, USER_TWO, WCMUtil.ROLE_CONTENT_PUBLISHER, true); + + // TODO - pending fix for ETWOTWO-981 + //wpService.inviteWebUser(wpStoreId, USER_TWO, WCMUtil.ROLE_CONTENT_PUBLISHER, true); + + wpService.inviteWebUser(wpStoreId, USER_TWO, WCMUtil.ROLE_CONTENT_MANAGER, true); // Switch to USER_ONE AuthenticationUtil.setCurrentUser(USER_ONE);