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

Align generated Set-Cookie header with RFC 6265

Browse Source 
Closes gh-378
This commit is contained in:
Andy Wilkinson
2017-04-07 16:59:49 +01:00
parent 93f4f11260
commit 704257e93b
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-restdocs-mockmvc/src/main/java/org/springframework/restdocs/mockmvc/MockMvcResponseConverter.java
View File

@@ -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();

2
spring-restdocs-mockmvc/src/test/java/org/springframework/restdocs/mockmvc/MockMvcResponseConverterTests.java
View File

@@ -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")));
}
}

2
spring-restdocs-mockmvc/src/test/java/org/springframework/restdocs/mockmvc/MockMvcRestDocumentationIntegrationTests.java
View File

@@ -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

2
spring-restdocs-restassured/build.gradle
View File

@@ -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')

2
spring-restdocs-restassured/src/test/java/org/springframework/restdocs/restassured/RestAssuredRestDocumentationIntegrationTests.java
View File

@@ -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

2
spring-restdocs-restassured/src/test/java/org/springframework/restdocs/restassured3/RestAssuredRestDocumentationIntegrationTests.java
View File

@@ -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