Use single Cookie header in HttpRequestSnippet

See https://www.rfc-editor.org/rfc/rfc6265#section-5.4 See gh-947
spring-projects · Oct 18, 2024 · 5d9b7ec · 5d9b7ec
1 parent 1dcd748
commit 5d9b7ec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/spring-restdocs-core/src/main/java/org/springframework/restdocs/http/HttpRequestSnippet.java b/spring-restdocs-core/src/main/java/org/springframework/restdocs/http/HttpRequestSnippet.java
@@ -103,8 +103,12 @@ private List<Map<String, String>> getHeaders(OperationRequest request) {
 			}
 		}
 
+		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)) {

diff --git a/...estdocs-core/src/test/java/org/springframework/restdocs/http/HttpRequestSnippetTests.java b/...estdocs-core/src/test/java/org/springframework/restdocs/http/HttpRequestSnippetTests.java
@@ -82,8 +82,7 @@ public void getRequestWithCookies() throws IOException {
 			.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