From 8b8215fd83507e77f62f3ce404393713a74ef52e Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Tue, 7 Mar 2017 16:27:06 +0000 Subject: [PATCH] Merged 5.1.N (5.1.3) to 5.2.N (5.2.1) 135683 jvonka: Merged 5.0.N (5.0.5) to 5.1.N (5.1.3) 135681 jvonka: Merged V4.2-BUG-FIX (4.2.8) to 5.0.N (5.0.5) 135658 jvonka: Merged 5.0.N (5.0.5) to V4.2-BUG-FIX (4.2.8) REPO-2110 / MNT-17477: CMIS: SXSS+CSRF vulnerability (browser binding) - tweak test (for unexpected NPE in 4.2) - resolve backport conflict git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135685 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/test-java/org/alfresco/rest/api/tests/TestCMIS.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/test-java/org/alfresco/rest/api/tests/TestCMIS.java b/source/test-java/org/alfresco/rest/api/tests/TestCMIS.java index 74155335c9..2cb909a5d3 100644 --- a/source/test-java/org/alfresco/rest/api/tests/TestCMIS.java +++ b/source/test-java/org/alfresco/rest/api/tests/TestCMIS.java @@ -2424,17 +2424,17 @@ public class TestCMIS extends EnterpriseTestApi // note: Content-Disposition will always be "attachment" for content types that are not white-listed response = publicApiClient.get("/"+network1.getId()+"/public/cmis/versions/1.1/browser/root/Shared/"+name, null); + assertEquals(200, response.getStatusCode()); assertTrue(response.getHeaders().get("Content-Disposition").startsWith("attachment;")); - assertEquals(200, response.getStatusCode()); response = publicApiClient.get("/"+network1.getId()+"/public/cmis/versions/1.1/browser/root/Shared/"+name+"?download=inline", null); + assertEquals(200, response.getStatusCode()); assertTrue(response.getHeaders().get("Content-Disposition").startsWith("attachment;")); - assertEquals(200, response.getStatusCode()); // note: AtomPub binding (via OpenCMIS) does not support "download" query parameter response = publicApiClient.get("/"+network1.getId()+"/public/cmis/versions/1.1/atom/content?id="+docId, null); + assertEquals(200, response.getStatusCode()); assertTrue(response.getHeaders().get("Content-Disposition").startsWith("attachment;")); - assertEquals(200, response.getStatusCode()); } /**