From 3ae430ebafdf2fe4d38fd423329d0d643b3ddccb Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 17 Jul 2020 09:01:33 +0300 Subject: [PATCH] Merge pull request #1173 from Alfresco/feature-2.7/APPS-236_RunCRTests_no Apps 236 run community rest api tests # Conflicts: # rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/SearchRecordsV1CmisTests.java --- .travis.yml | 5 +---- .../rest/rm/community/recordfolders/RecordFolderTests.java | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 578c3ad808..e0b302e6de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,10 +75,7 @@ jobs: - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_COMMUNITY_PATH/target install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-community -q -f $AUTOMATION_COMMUNITY_PATH/pom.xml script: - - echo "Community Rest API Tests" -# Uncomment following line to start alfresco env using run-alfresco profile and run the tests. -# Currently commented because running tests is part of APPS-236 task -# travis_wait 90 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_COMMUNITY_PATH/pom.xml + - travis_wait 60 mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_COMMUNITY_PATH/pom.xml - name: "Enterprise Rest API Tests" stage: Tests before_install: 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" )