Merged 5.2.N (5.2.1) to HEAD (5.2)

129173 mmuller: Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
      128583 jvonka: V1 REST API: Node Version History - tweak "delete version" operation
      - cannot delete last version for now (return 422)
      REPO-835


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129347 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alexandru Epure
2016-08-09 14:13:29 +00:00
parent 6084cc72b5
commit 575183a5ac
4 changed files with 112 additions and 17 deletions

View File

@@ -2713,7 +2713,8 @@ public class NodeApiTest extends AbstractBaseApiTest
response = put(URL_NODES, user1, dId, toJsonAsStringNonNull(dUpdate), null, 200);
documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
//d1.getProperties().put("cm:versionLabel","1.0"); // TODO ... fix api ?!
d1.getProperties().put("cm:versionLabel","1.0");
d1.getProperties().put("cm:versionType","MAJOR");
d1.setAspectNames(Arrays.asList("cm:auditable","cm:titled","cm:versionable"));
d1.expected(documentResp);