From 704257e93b63d6ae01f58e1faab5e2798671ab2c Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Fri, 7 Apr 2017 16:59:49 +0100
Subject: [PATCH] Align generated Set-Cookie header with RFC 6265

Closes gh-378
---
 .../restdocs/mockmvc/MockMvcResponseConverter.java        | 8 ++++----
 .../restdocs/mockmvc/MockMvcResponseConverterTests.java   | 2 +-
 .../mockmvc/MockMvcRestDocumentationIntegrationTests.java | 2 +-
 spring-restdocs-restassured/build.gradle                  | 2 +-
 .../RestAssuredRestDocumentationIntegrationTests.java     | 2 +-
 .../RestAssuredRestDocumentationIntegrationTests.java     | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/spring-restdocs-mockmvc/src/main/java/org/springframework/restdocs/mockmvc/MockMvcResponseConverter.java b/spring-restdocs-mockmvc/src/main/java/org/springframework/restdocs/mockmvc/MockMvcResponseConverter.java
index 8d5f580d..dc85f490 100644
--- a/spring-restdocs-mockmvc/src/main/java/org/springframework/restdocs/mockmvc/MockMvcResponseConverter.java
+++ b/spring-restdocs-mockmvc/src/main/java/org/springframework/restdocs/mockmvc/MockMvcResponseConverter.java
@@ -73,15 +73,15 @@ class MockMvcResponseConverter implements ResponseConverter<MockHttpServletRespo
 			header.append(maxAge);
 		}
 
-		appendIfAvailable(header, ";domain=", cookie.getDomain());
-		appendIfAvailable(header, ";path=", cookie.getPath());
+		appendIfAvailable(header, "; Domain=", cookie.getDomain());
+		appendIfAvailable(header, "; Path=", cookie.getPath());
 
 		if (cookie.getSecure()) {
-			header.append(";Secure");
+			header.append("; Secure");
 		}
 
 		if (cookie.isHttpOnly()) {
-			header.append(";HttpOnly");
+			header.append("; HttpOnly");
 		}
 
 		return header.toString();
diff --git a/spring-restdocs-mockmvc/src/test/java/org/springframework/restdocs/mockmvc/MockMvcResponseConverterTests.java b/spring-restdocs-mockmvc/src/test/java/org/springframework/restdocs/mockmvc/MockMvcResponseConverterTests.java
index 9b74bc36..c34a840d 100644
--- a/spring-restdocs-mockmvc/src/test/java/org/springframework/restdocs/mockmvc/MockMvcResponseConverterTests.java
+++ b/spring-restdocs-mockmvc/src/test/java/org/springframework/restdocs/mockmvc/MockMvcResponseConverterTests.java
@@ -68,6 +68,6 @@ public class MockMvcResponseConverterTests {
 		assertThat(operationResponse.getHeaders().size(), is(1));
 		assertTrue(operationResponse.getHeaders().containsKey(HttpHeaders.SET_COOKIE));
 		assertThat(operationResponse.getHeaders().get(HttpHeaders.SET_COOKIE), equalTo(
-				Collections.singletonList("name=value;domain=localhost;HttpOnly")));
+				Collections.singletonList("name=value; Domain=localhost; HttpOnly")));
 	}
 }
diff --git a/spring-restdocs-mockmvc/src/test/java/org/springframework/restdocs/mockmvc/MockMvcRestDocumentationIntegrationTests.java b/spring-restdocs-mockmvc/src/test/java/org/springframework/restdocs/mockmvc/MockMvcRestDocumentationIntegrationTests.java
index cd516696..f4de4f3e 100644
--- a/spring-restdocs-mockmvc/src/test/java/org/springframework/restdocs/mockmvc/MockMvcRestDocumentationIntegrationTests.java
+++ b/spring-restdocs-mockmvc/src/test/java/org/springframework/restdocs/mockmvc/MockMvcRestDocumentationIntegrationTests.java
@@ -388,7 +388,7 @@ public class MockMvcRestDocumentationIntegrationTests {
 				is(snippet(asciidoctor())
 						.withContents(httpResponse(asciidoctor(), HttpStatus.OK).header(
 								HttpHeaders.SET_COOKIE,
-								"name=value;domain=localhost;HttpOnly"))));
+								"name=value; Domain=localhost; HttpOnly"))));
 	}
 
 	@Test
diff --git a/spring-restdocs-restassured/build.gradle b/spring-restdocs-restassured/build.gradle
index 68beb38f..0f52014c 100644
--- a/spring-restdocs-restassured/build.gradle
+++ b/spring-restdocs-restassured/build.gradle
@@ -7,7 +7,7 @@ dependencies {
 
 	testCompile 'com.jayway.restassured:rest-assured'
 	testCompile 'io.rest-assured:rest-assured'
-	testCompile 'org.apache.tomcat.embed:tomcat-embed-core:8.5.11'
+	testCompile 'org.apache.tomcat.embed:tomcat-embed-core:8.5.13'
 	testCompile 'org.mockito:mockito-core'
 	testCompile 'org.hamcrest:hamcrest-library'
 	testCompile project(path: ':spring-restdocs-core', configuration: 'testArtifacts')
diff --git a/spring-restdocs-restassured/src/test/java/org/springframework/restdocs/restassured/RestAssuredRestDocumentationIntegrationTests.java b/spring-restdocs-restassured/src/test/java/org/springframework/restdocs/restassured/RestAssuredRestDocumentationIntegrationTests.java
index 68cceb17..68eff6f7 100644
--- a/spring-restdocs-restassured/src/test/java/org/springframework/restdocs/restassured/RestAssuredRestDocumentationIntegrationTests.java
+++ b/spring-restdocs-restassured/src/test/java/org/springframework/restdocs/restassured/RestAssuredRestDocumentationIntegrationTests.java
@@ -289,7 +289,7 @@ public class RestAssuredRestDocumentationIntegrationTests {
 				is(snippet(asciidoctor())
 						.withContents(httpResponse(asciidoctor(), HttpStatus.OK).header(
 								HttpHeaders.SET_COOKIE,
-								"name=value;domain=localhost;HttpOnly"))));
+								"name=value; Domain=localhost; HttpOnly"))));
 	}
 
 	@Test
diff --git a/spring-restdocs-restassured/src/test/java/org/springframework/restdocs/restassured3/RestAssuredRestDocumentationIntegrationTests.java b/spring-restdocs-restassured/src/test/java/org/springframework/restdocs/restassured3/RestAssuredRestDocumentationIntegrationTests.java
index d7286ff6..b71a1504 100644
--- a/spring-restdocs-restassured/src/test/java/org/springframework/restdocs/restassured3/RestAssuredRestDocumentationIntegrationTests.java
+++ b/spring-restdocs-restassured/src/test/java/org/springframework/restdocs/restassured3/RestAssuredRestDocumentationIntegrationTests.java
@@ -288,7 +288,7 @@ public class RestAssuredRestDocumentationIntegrationTests {
 				is(snippet(asciidoctor())
 						.withContents(httpResponse(asciidoctor(), HttpStatus.OK).header(
 								HttpHeaders.SET_COOKIE,
-								"name=value;domain=localhost;HttpOnly"))));
+								"name=value; Domain=localhost; HttpOnly"))));
 	}
 
 	@Test