Spring/spring-restdocs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid duplicate cookies with Spring Framework 5's MockMvc

Browse Source 
Closes gh-390
This commit is contained in:
Andy Wilkinson
2017-04-26 11:57:18 +01:00
parent 3ea51f2afa
commit d6eacfd819
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-restdocs-mockmvc/src/main/java/org/springframework/restdocs/mockmvc/MockMvcRequestConverter.java
View File

@@ -70,7 +70,7 @@ class MockMvcRequestConverter implements RequestConverter<MockHttpServletRequest
HttpHeaders headers = extractHeaders(mockRequest);
Parameters parameters = extractParameters(mockRequest);
List<OperationRequestPart> parts = extractParts(mockRequest);
Collection<RequestCookie> cookies = extractCookies(mockRequest);
Collection<RequestCookie> cookies = extractCookies(mockRequest, headers);
String queryString = mockRequest.getQueryString();
if (!StringUtils.hasText(queryString)
&& "GET".equals(mockRequest.getMethod())) {
@@ -89,7 +89,8 @@ class MockMvcRequestConverter implements RequestConverter<MockHttpServletRequest
}
}
private Collection<RequestCookie> extractCookies(MockHttpServletRequest mockRequest) {
private Collection<RequestCookie> extractCookies(MockHttpServletRequest mockRequest,
HttpHeaders headers) {
if (mockRequest.getCookies() == null || mockRequest.getCookies().length == 0) {
return Collections.emptyList();
}
@@ -98,6 +99,7 @@ class MockMvcRequestConverter implements RequestConverter<MockHttpServletRequest
cookies.add(
new RequestCookie(servletCookie.getName(), servletCookie.getValue()));
}
headers.remove(HttpHeaders.COOKIE);
return cookies;
}