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

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

Browse Source 
129182 mmuller: Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
      128651 jvonka: V1 REST API test improvements: minor fix to re-comment out known issue (see REPO-907)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129356 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alexandru Epure
2016-08-09 14:14:52 +00:00
parent 19ed99e63a
commit d0f3990dcc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java
View File

@@ -1446,12 +1446,12 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
Node nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class); Node nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
assertEquals(user2, ((Map)nodeResp.getProperties().get(PROP_OWNER)).get("id")); assertEquals(user2, ((Map)nodeResp.getProperties().get(PROP_OWNER)).get("id"));
// TODO apparently returns 204 here in tenant context ?? (eg. if useDefaultNetwork=false) // TODO see REPO-907. Apparently returns 204 here in tenant context ?? (eg. if useDefaultNetwork=false)
//if (useDefaultNetwork) if (useDefaultNetwork)
//{ {
// -ve test - user1 can no longer delete // -ve test - user1 can no longer delete
deleteNode(folder5Id, 403); deleteNode(folder5Id, 403);
//} }
// TODO refactor with remote permission api calls (maybe use v0 until we have v1 ?) // TODO refactor with remote permission api calls (maybe use v0 until we have v1 ?)
final String tenantDomain = (networkOne != null ? networkOne.getId() : TenantService.DEFAULT_DOMAIN); final String tenantDomain = (networkOne != null ? networkOne.getId() : TenantService.DEFAULT_DOMAIN);