Merge pull request #947 from izeye

* gh-947:
  Use single Cookie header in HttpRequestSnippet

Closes gh-947

Author: wilkinsona

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)) {

spring-restdocs-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