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

Merge pull request #947 from izeye

Browse Source 
* gh-947:
  Use single Cookie header in HttpRequestSnippet

Closes gh-947
This commit is contained in:
Andy Wilkinson
2024-10-18 12:36:13 +01:00
parent 1dcd7480f3 5d9b7ec575
commit d34584bbde
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-restdocs-core/src/main/java/org/springframework/restdocs/http/HttpRequestSnippet.java
View File

@@ -103,8 +103,12 @@ public class HttpRequestSnippet extends TemplatedSnippet {
}
}
List<String> cookies = new ArrayList<>();
for (RequestCookie cookie : request.getCookies()) {
headers.add(header(HttpHeaders.COOKIE, String.format("%s=%s", cookie.getName(), cookie.getValue())));
cookies.add(String.format("%s=%s", cookie.getName(), cookie.getValue()));
}
if (!cookies.isEmpty()) {
headers.add(header(HttpHeaders.COOKIE, String.join("; ", cookies)));
}
if (requiresFormEncodingContentTypeHeader(request)) {

3
spring-restdocs-core/src/test/java/org/springframework/restdocs/http/HttpRequestSnippetTests.java
View File

@@ -82,8 +82,7 @@ public class HttpRequestSnippetTests extends AbstractSnippetTests {
.build());
assertThat(this.generatedSnippets.httpRequest())
.is(httpRequest(RequestMethod.GET, "/foo").header(HttpHeaders.HOST, "localhost")
.header(HttpHeaders.COOKIE, "name1=value1")
.header(HttpHeaders.COOKIE, "name2=value2"));
.header(HttpHeaders.COOKIE, "name1=value1; name2=value2"));
}
@Test