From 1928e120dae6d3ee2b8b3e829d48a94d19b31cda Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Wed, 5 Oct 2016 23:58:05 +0100
Subject: [PATCH] Temp workaround to fix the failing integration tests

---
 .../test/util/BaseRMTestCase.java               | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java
index 7c369cc84a..a56ed08654 100644
--- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java
+++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java
@@ -106,6 +106,7 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
         return new String[]
         {
             "classpath:alfresco/application-context.xml",
+            "classpath:alfresco/web-scripts-application-context.xml",
             "classpath:test-context.xml"
         };
     }
@@ -424,7 +425,7 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
             public Object execute() throws Throwable
             {
                 // Do the tear down
-                AuthenticationUtil.runAsSystem(() -> 
+                AuthenticationUtil.runAsSystem(() ->
                 {
                     tearDownImpl();
                     return null;
@@ -603,20 +604,20 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
 
     protected void setupTestUsers(final NodeRef filePlan)
     {
-        AuthenticationUtil.runAs(() -> 
+        AuthenticationUtil.runAs(() ->
         {
             retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<Object>()
             {
                 @Override
                 public Object execute() throws Throwable
-                {                    
+                {
                     setupTestUsersImpl(filePlan);
-                    return null;                    
+                    return null;
                 }
             });
-            
+
             return null;
-        }, 
+        },
         AuthenticationUtil.getAdminUserName());
     }
 
@@ -703,7 +704,7 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
                 {
                     // Do setup
                     setupMultiHierarchyTestDataImpl();
-                    
+
                     return null;
                 });
             }
@@ -781,7 +782,7 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
         dmConsumer = GUID.generate();
         dmConsumerNodeRef = createPerson(dmConsumer);
         siteService.setMembership(collabSiteId, dmConsumer, SiteModel.SITE_CONSUMER);
-        
+
         dmContributor = GUID.generate();
         dmContributorNodeRef = createPerson(dmContributor);
         siteService.setMembership(collabSiteId, dmContributor, SiteModel.SITE_CONTRIBUTOR);