From ae77c261d50f3905c1991bfd1015f8bfaea40f92 Mon Sep 17 00:00:00 2001 From: Ramona Popa Date: Wed, 29 Jan 2020 15:21:14 +0000 Subject: [PATCH 1/3] Merge branch 'feature/mergeto33_RM-7099' into 'release/V3.3' Merge branch 'feature/RM-7099_UpdateOrIgnoreQuarantinedTests' into 'master' See merge request records-management/records-management!1355 --- .../files/DeclareAndFileDocumentAsRecordTests.java | 1 + .../community/hold/PreventActionsOnFrozenContentTests.java | 6 ++++-- .../rest/rm/community/recordfolders/RecordFolderTests.java | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/files/DeclareAndFileDocumentAsRecordTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/files/DeclareAndFileDocumentAsRecordTests.java index 53dacef98e..d1268da1ff 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/files/DeclareAndFileDocumentAsRecordTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/files/DeclareAndFileDocumentAsRecordTests.java @@ -463,6 +463,7 @@ public class DeclareAndFileDocumentAsRecordTests extends BaseRMRestTest public void declareAndFileDocumentAsRecordCleanup() { //delete rm items + holdsAPI.deleteHold(getAdminUser().getUsername(), getAdminUser().getPassword(), HOLD_NAME); deleteRecordCategory(recordCategory.getId()); getRestAPIFactory().getUnfiledRecordFoldersAPI().deleteUnfiledRecordFolder(unfiledContainerFolder.getId()); diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/hold/PreventActionsOnFrozenContentTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/hold/PreventActionsOnFrozenContentTests.java index ad7aca175d..b2082940dc 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/hold/PreventActionsOnFrozenContentTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/hold/PreventActionsOnFrozenContentTests.java @@ -36,6 +36,7 @@ import static org.alfresco.utility.data.RandomData.getRandomName; import static org.alfresco.utility.report.log.Step.STEP; import static org.springframework.http.HttpStatus.CREATED; import static org.springframework.http.HttpStatus.FORBIDDEN; +import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; import static org.springframework.http.HttpStatus.OK; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; @@ -159,7 +160,8 @@ public class PreventActionsOnFrozenContentTests extends BaseRMRestTest restClient.authenticateUser(getAdminUser()).withCoreAPI().usingNode(contentHeld).updateNodeContent(updatedFile); STEP("Check the request failed."); - restClient.assertStatusCodeIs(FORBIDDEN); + //TODO change this to FORBIDDEN when REPO-4632 is fixed + restClient.assertStatusCodeIs(INTERNAL_SERVER_ERROR); restClient.assertLastError().containsSummary("Frozen content can't be updated."); } @@ -194,7 +196,7 @@ public class PreventActionsOnFrozenContentTests extends BaseRMRestTest STEP("Check the request failed."); assertStatusCode(FORBIDDEN); - getRestAPIFactory().getRmRestWrapper().assertLastError().containsSummary("Frozen nodes can not be copied."); + getRestAPIFactory().getRmRestWrapper().assertLastError().containsSummary("Permission was denied"); } /** diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordfolders/RecordFolderTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordfolders/RecordFolderTests.java index 7ec72a7022..e0266535af 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordfolders/RecordFolderTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordfolders/RecordFolderTests.java @@ -137,8 +137,10 @@ public class RecordFolderTests extends BaseRMRestTest * Then the operation fails * */ + //TODO enable this test when REPO-2454 is fixed @Test ( + enabled = false, description = "Create invalid types as children for a record folder", dataProvider = "childrenNotAllowedForFolder" ) From 353520afd3cdd78ebbc7d8b8befcd2dbeea05a7b Mon Sep 17 00:00:00 2001 From: Ramona Popa Date: Fri, 31 Jan 2020 09:52:55 +0000 Subject: [PATCH 2/3] RM-7099: Update or Ignore Quarantined Tests - removed delete hold from test --- .../rm/community/files/DeclareAndFileDocumentAsRecordTests.java | 1 + .../rest/rm/community/recordfolders/RecordFolderTests.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/files/DeclareAndFileDocumentAsRecordTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/files/DeclareAndFileDocumentAsRecordTests.java index e668be1734..35ef1c43a0 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/files/DeclareAndFileDocumentAsRecordTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/files/DeclareAndFileDocumentAsRecordTests.java @@ -459,6 +459,7 @@ public class DeclareAndFileDocumentAsRecordTests extends BaseRMRestTest public void declareAndFileDocumentAsRecordCleanup() { //delete rm items + rmRolesAndActionsAPI.deleteHold(getAdminUser().getUsername(), getAdminUser().getPassword(), HOLD_NAME); deleteRecordCategory(recordCategory.getId()); getRestAPIFactory().getUnfiledRecordFoldersAPI().deleteUnfiledRecordFolder(unfiledContainerFolder.getId()); diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordfolders/RecordFolderTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordfolders/RecordFolderTests.java index 7ec72a7022..e0266535af 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordfolders/RecordFolderTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordfolders/RecordFolderTests.java @@ -137,8 +137,10 @@ public class RecordFolderTests extends BaseRMRestTest * Then the operation fails * */ + //TODO enable this test when REPO-2454 is fixed @Test ( + enabled = false, description = "Create invalid types as children for a record folder", dataProvider = "childrenNotAllowedForFolder" ) From 852c77477e9ff5ccfb6769f504731ea178f287ff Mon Sep 17 00:00:00 2001 From: Ramona Popa Date: Fri, 31 Jan 2020 16:13:09 +0000 Subject: [PATCH 3/3] merge RM-7099 into V3.0 --- .../rest/rm/community/recordfolders/RecordFolderTests.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordfolders/RecordFolderTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordfolders/RecordFolderTests.java index 7ec72a7022..e0266535af 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordfolders/RecordFolderTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordfolders/RecordFolderTests.java @@ -137,8 +137,10 @@ public class RecordFolderTests extends BaseRMRestTest * Then the operation fails * */ + //TODO enable this test when REPO-2454 is fixed @Test ( + enabled = false, description = "Create invalid types as children for a record folder", dataProvider = "childrenNotAllowedForFolder" )