Commit Graph

4257 Commits

Author SHA1 Message Date
Ana Bozianu
c9a501052a RM-5416 - revert auto formatting of BaseAPI class 2017-09-18 21:25:27 +03:00
Ana Bozianu
84eb116fd8 RM-5416 - api tests for searching folders, record folders and record categories 2017-09-18 21:09:13 +03:00
Rodica Sutu
c13f38b5de add the missing class 2017-09-18 16:21:44 +03:00
Rodica Sutu
0786add34e fix the community rest api tests that use data providers from TestData.class 2017-09-18 16:11:36 +03:00
Rodica Sutu
e16fb0ab71 Merge branch 'feature/RM-5391_UI_Test_Classifcation_Mark_Indicator' into 'master'
Feature/rm 5391 ui test classifcation mark indicator

See merge request !531
2017-09-18 08:09:16 +01:00
jcule
c7b106cff4 RM-5416: REST API Tests for Folder Classification - added tests for classified folders search 2017-09-17 18:25:33 +01:00
jcule
9222483aed RM-5416: REST API Tests for Folder Classification - added tests for classified folders search 2017-09-17 10:56:19 +01:00
Rodica Sutu
38f69fab50 Merge remote-tracking branch 'remotes/origin/master' into feature/RM-5391_UI_Test_Classifcation_Mark_Indicator
# Conflicts:
#	rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java
2017-09-11 12:47:21 +03:00
Rodica Sutu
a8123895ae data prep dependency update and modification to address the issues encounter
add a helper method to retrieve the rm node id based on the relative path using the core api
2017-09-11 08:58:07 +03:00
jcule
b3e8d59f50 RM-5416: API Tests for REST API for Folder Classification 2017-09-09 11:44:01 +01:00
jcule
b123971187 RM-5416: API Tests for REST API for Folder Classification 2017-09-09 10:05:54 +01:00
Tom Page
9383eaae70 Merge branch 'feature/RM-5611_UITestsEditGuidedClassif_cg' into 'master'
Feature/rm 5611 ui tests edit guided classif cg

See merge request !524
2017-09-08 15:27:43 +01:00
Tom Page
8adcb63232 RM-5611 Code review fixes.
Remove nested try catch. Add additional check that we don't have duplicate
topics selected.
2017-09-08 14:10:47 +01:00
Rodica Sutu
c769ad7b80 Merge branch 'master' into feature/RM-5391_UI_Test_Classifcation_Mark_Indicator 2017-09-08 11:38:59 +03:00
Tom Page
652c88e815 Merge branch 'feature/RM-3379_FilterJavadoc_no' into 'master'
Feature/rm 3379 filter javadoc no

See merge request !526
2017-09-07 14:31:14 +01:00
Rodica Sutu
53ca5e68ed exclude the initialization of web driver from the tas utility (issue introduce after upgrade the rest api tas dependency) 2017-09-07 15:06:32 +03:00
alfresco-build
fe91e98166 [maven-release-plugin] prepare for next development iteration 2017-09-07 11:17:16 +01:00
alfresco-build
27e292aee4 [maven-release-plugin] prepare release V2.6.b ags-2.6.b 2017-09-07 11:17:13 +01:00
Ross Gale
01f1aae3f5 RM-5612 Changing versions and fixing failing tests 2017-09-07 10:33:56 +01:00
Rodica Sutu
6c46470592 update TAS dependency
updates for tests for RM-5391(1)
2017-09-07 10:02:53 +03:00
Tom Page
2ac3615fd6 RM-5611 Create data setup method for edit with guides tests.
Also add a new helper method in BaseTest to create a document in
a site and return the noderef.
2017-09-04 15:52:02 +01:00
Tom Page
de933fa348 Merge master into feature/RM-3379_FilterJavadoc. 2017-08-31 15:04:53 +01:00
Rodica Sutu
9521dacdb0 Merge branch 'feature/RM-4370_API_Tests' into 'master'
Feature/rm 4370 api tests

See merge request !480
2017-08-23 06:59:37 +01:00
Rodica Sutu
4b53a48736 Merge remote-tracking branch 'remotes/origin/master' into feature/RM-4370_API_Tests
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/rm/rest/api/settings/SecurityControlSettingsEntityResource.java
2017-08-22 12:48:43 +03:00
Ramona Popa
347f197b29 Merge branch 'feature/RM-4729_Declassification_Timeframe_REST_API' into 'master'
Feature/rm 4729 declassification timeframe rest api

See merge request !471
2017-08-22 09:19:03 +01:00
Ramona Popa
0917a23dee Feature/rm 4729 declassification timeframe rest api 2017-08-22 09:19:03 +01:00
Rodica Sutu
ff8e157528 Merge first test version branch 'feature/RM-4730_APITests' into feature/RM-4370_API_Tests 2017-08-21 11:18:51 +03:00
Ramona Popa
5db0559f83 RM-4729 - Modified implementation in order to match the refactored swagger api 2017-08-16 15:41:28 +03:00
Ramona Popa
affa584b71 Merge branch 'feature/RM-4727_Declassification_Time_Frame_Swagger_Api' into feature/RM-4729_Declassification_Timeframe_REST_API 2017-08-16 10:39:01 +03:00
Ramona Popa
77cbf15001 Merge branch 'master' into feature/RM-4729_Declassification_Timeframe_REST_API 2017-08-15 11:51:52 +03:00
jcule
785031985e Merge branch 'feature/RM-4714_Classification_Reasons_API_Tests_1' of https://git.alfresco.com/records-management/records-management into feature/RM-4714_Classification_Reasons_API_Tests_1 2017-08-11 20:03:30 +01:00
Tom Page
bd6321e87d RM-4714: Classification Reasons REST API Tests: added new test for creating multiple classification reasons 2017-08-11 20:03:02 +01:00
Tom Page
b2489bdaa4 Merge branch 'merge/Merge25RulesTestsApiFixes' into 'master'
Merge/merge25 rules tests api fixes

See merge request !457
2017-08-10 15:50:27 +01:00
Oana Nechiforescu
e0389a7850 Merge remote-tracking branch 'origin/release/V2.5' into merge/Merge25RulesTestsApiFixes
# Conflicts:
#	rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/level2/rules/CopyToRuleOnFolders.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/level2/rules/FileToRuleAppliedOnUnfiledRecords.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/level2/rules/LinkToRuleOnFolders.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/level2/rules/MoveToRuleOnFolders.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/level2/rules/SetPropertyValueCollSiteAndFilePlan.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/level2/rules/FileToRuleAppliedOnClassifiedUnfiledRecords.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/level2/rules/RulesAppliedOnWholeFilePlanClassifiedContent.java
#	rm-automation/rm-automation-ui/src/test/resources/level2Tests.xml
#	rm-automation/src/test/java/org/alfresco/dataprep/RecordsManagementService.java
2017-08-09 23:26:29 +03:00
Ana Bozianu
4068000a27 Merge master into feature/RM-4707_Classification_Reason_CRUD_REST_API 2017-08-08 17:59:59 +03:00
Ana Bozianu
bffa718143 Merge branch 'feature/RM-4717_ClassificationReasonsJavaApiTests' into 'master'
Feature/rm 4717 classification reasons java api tests

See merge request !437
2017-08-08 15:25:19 +01:00
Richard Smith
39f26c88ef Merge branch 'feature/RM-5332_Classification_Topic_Picker_Automation_sm' into 'master'
Feature/rm 5332 classification topic picker automation sm

See merge request !422
2017-08-08 08:59:46 +01:00
Tuna Aksoy
f6b3bf9c34 Merge branch 'master' into feature/RM-4707_Classification_Reason_CRUD_REST_API
# Conflicts:
#	rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/classification/guides/CombinedInstructionsTest.java
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationSchemeServiceImpl.java
2017-08-08 08:40:23 +01:00
Richard Smith
a9909912ec Merge branch 'master' into feature/RM-5332_Classification_Topic_Picker_Automation_sm 2017-08-08 08:12:58 +01:00
Ana Bozianu
2e07dbfb9b Merge remote-tracking branch 'origin/feature/RM-4717_ClassificationReasonJavaApi' into feature/RM-4717_ClassificationReasonsJavaApiTests 2017-08-08 09:12:05 +03:00
Ana Bozianu
d6bf364f9a Merge branch 'feature/RM-4717_ClassificationReasonJavaApi' into 'master'
Feature/rm 4717 classification reason java api

See merge request !400
2017-08-08 06:41:28 +01:00
Ana Bozianu
986e30eec3 Merge branch 'feature/RM-4717_MergeFromMaster_cg' into 'feature/RM-4717_ClassificationReasonJavaApi'
Feature/rm 4717 merge from master cg

See merge request !444
2017-08-07 10:00:23 +01:00
Tuna Aksoy
642e8b2ac8 Merge remote-tracking branch 'origin/feature/RM-4717_ClassificationReasonsJavaApiTests' into feature/RM-4707_Classification_Reason_CRUD_REST_API
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/ClassificationReasonsTest.java
2017-08-04 15:09:02 +01:00
Richard Smith
d0a650b357 Merge branch 'feature/RM-4613_Select_Single_Instruction' into feature/RM-5332_Classification_Topic_Picker_Automation_sm 2017-08-04 14:47:12 +01:00
Rodica Sutu
ec48fcc45c add rest api tests for declassificationTimeFrame 2017-08-04 15:04:34 +03:00
Richard Smith
f79f27824b Merge branch 'master' into feature/RM-4613_Select_Single_Instruction 2017-08-04 10:48:47 +01:00
Ana Bozianu
bae4d0c394 RM-4717 - tests, one failing 2017-08-03 20:28:13 +03:00
Tom Page
f957a60a5c Merge branch 'feature/RM-5841_EmptyReasonId_cg' into 'master'
RM-5481 Handle empty string as a reason or exemption id.

See merge request !431
2017-08-03 13:18:49 +01:00
Tom Page
277d9aabbd RM-5481 Handle empty string as a reason or exemption id.
If the empty string is passed as a classification reason or exemption id then the API framework
converts it to null for us. We should throw a 404 (not found) error, because there are no reasons
or exemptions with the empty string as their id (or null for that matter).  Add two new REST API
tests for these cases.

Also stopped using the helper method addParam in TopicsWithInstructionsTest, as it is only saving us
about ten characters, causes an extra import and includes an explicit mention of the topicsApi
inside it (i.e. it doesn't work at all with the guidesAPI).
2017-08-03 13:10:37 +01:00
Tuna Aksoy
9aeb46f9f2 Merge remote-tracking branch 'origin/feature/RM-4729_Declassification_Timeframe_REST_API' into feature/RM-4709_Declassification_Time_Frame_REST_API
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/declassification/DeclassificationTimeFrameService.java
2017-08-02 13:32:25 +01:00