inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pick up acs-packaging changes too.

Browse Source 
ACS-525: org.alfresco.surf:spring-webscripts:8.8 & acs-packaging test failure (#1705)

* Bump alfresco-sprint-webscripts to 8.10,

* Remove extra / in alfresco url due to empty RestAssured.basePath and adjust it accordingly

* Bump alfresco-repository and surf-webscripts which include fix for CSRF Filter

* Bump alfresco-data-model version that contain revert of cmis 1.1.0 to 1.0.0 to avoid conflicts with alfresco-repository

(cherry picked from commit 8b26c99c6b072e32a26650d89ad86270668bcdb7)
This commit is contained in:
Alan Davis
2020-10-13 09:10:14 +01:00
parent 30892c28d1
commit 3d3a02a697
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packaging/tests/tas-integration/src/test/java/org/alfresco/tas/integration/IntegrationWithWebScriptsTests.java
View File

@@ -1,29 +1,22 @@
package org.alfresco.tas.integration;
import static org.alfresco.utility.report.log.Step.STEP;
import io.restassured.RestAssured;
import io.restassured.http.Cookie;
import io.restassured.response.Response;
import java.net.URLDecoder;
import java.util.HashMap;
import java.util.List;
import org.alfresco.rest.core.JsonBodyGenerator;
import org.alfresco.rest.core.RestRequest;
import org.alfresco.rest.model.RestPersonModel;
import org.alfresco.utility.Utility;
import org.alfresco.utility.model.TestGroup;
import org.alfresco.utility.model.UserModel;
import org.alfresco.utility.report.Bug;
import org.alfresco.utility.testrail.ExecutionType;
import org.alfresco.utility.testrail.annotation.TestRail;
import org.apache.commons.codec.binary.Base64;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.testng.Assert;
import org.testng.annotations.Test;
import java.util.HashMap;
import static org.alfresco.utility.report.log.Step.STEP;
public class IntegrationWithWebScriptsTests extends IntegrationTest
{
@Test(groups = { TestGroup.INTEGRATION, TestGroup.REST_API, TestGroup.FULL })
@@ -34,9 +27,9 @@ public class IntegrationWithWebScriptsTests extends IntegrationTest
STEP("1.Upload the CSV File that contains the users.");
restAPI.authenticateUser(dataUser.getAdminUser()).configureRequestSpec().addMultiPart("filedata",
Utility.getResourceTestDataFile("userCSV.csv"));
String fileCreationWebScript = "alfresco/s/api/people/upload";
RestAssured.basePath = "";
RestAssured.basePath = "alfresco";
restAPI.configureRequestSpec().setBasePath(RestAssured.basePath);
String fileCreationWebScript = "s/api/people/upload";
RestRequest request = RestRequest.simpleRequest(HttpMethod.POST, fileCreationWebScript);
restAPI.authenticateUser(dataUser.getAdminUser()).process(request);
restAPI.assertStatusCodeIs(HttpStatus.OK);