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

Merge branch 'release/V2.3' into release/V2.4

Browse Source 
Conflicts:
	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/AllTestSuite.java
	rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/InplaceRecordPermissionTest.java
This commit is contained in:
Tuna Aksoy
2016-09-22 10:39:50 +01:00
parent 083c8a9d5d 44dbc31061
commit 96e9f8828f
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/AllTestSuite.java
View File

@@ -51,6 +51,7 @@ import org.junit.runner.RunWith;
"!.*RM2072Test",
"!.*RM2190Test",
"!.*RM981SystemTest",
"!.*RM3993Test",
"!.*RecordsManagementEventServiceImplTest",
"!.*RmRestApiTest",
"!.*NotificationServiceHelperSystemTest",

3
rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/InplaceRecordPermissionTest.java
View File

@@ -500,7 +500,8 @@ public class InplaceRecordPermissionTest extends BaseRMTestCase
* And it's metadata is maintained
* Then the inplace users will no longer see the record
*/
public void testDestroyedRecordInplacePermissions()
// FIXME: See RM-4095
public void ztestDestroyedRecordInplacePermissions()
{
test()
.given()