From 40661d62c108ed3fa9474fbbae8f466ad6fbee9b Mon Sep 17 00:00:00 2001 From: Koos Gadellaa Date: Wed, 17 Feb 2021 09:46:04 +0100 Subject: [PATCH] Support cookie w/ only Expires attribute in MockHttpServletResponse Prior to this commit, MockHttpServletResponse only included the Expires attribute in the generated Cookie header if the Max-Age attribute had also been set. This commit supports including the Expires attribute in the generated Cookie Header even when the Max-Age attribute has not been set. Closes gh-26558 --- .../mock/web/MockHttpServletResponse.java | 7 ++++++- .../mock/web/MockHttpServletResponseTests.java | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java index 695c1277dcf..6b12e65e667 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java @@ -378,10 +378,10 @@ public class MockHttpServletResponse implements HttpServletResponse { buf.append("; Domain=").append(cookie.getDomain()); } int maxAge = cookie.getMaxAge(); + ZonedDateTime expires = (cookie instanceof MockCookie ? ((MockCookie) cookie).getExpires() : null); if (maxAge >= 0) { buf.append("; Max-Age=").append(maxAge); buf.append("; Expires="); - ZonedDateTime expires = (cookie instanceof MockCookie ? ((MockCookie) cookie).getExpires() : null); if (expires != null) { buf.append(expires.format(DateTimeFormatter.RFC_1123_DATE_TIME)); } @@ -391,6 +391,11 @@ public class MockHttpServletResponse implements HttpServletResponse { buf.append(headers.getFirst(HttpHeaders.EXPIRES)); } } + else if (expires != null) { + buf.append("; Expires="); + buf.append(expires.format(DateTimeFormatter.RFC_1123_DATE_TIME)); + } + if (cookie.getSecure()) { buf.append("; Secure"); diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java index 08fda3f7237..c7317fb8c31 100644 --- a/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java +++ b/spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java @@ -475,6 +475,17 @@ class MockHttpServletResponseTests { assertThat(header).startsWith("SESSION=123; Path=/; Max-Age=100; Expires="); } + /** + * @since 5.1.12 + */ + @Test + void addCookieHeaderWithOnlyExpiresAttribute() { + String cookieValue = "SESSION=123; Path=/; Expires=Tue, 8 Oct 2019 19:50:00 GMT"; + response.addHeader(SET_COOKIE, cookieValue); + assertNumCookies(1); + assertThat(response.getHeader(SET_COOKIE)).isEqualTo(cookieValue); + } + @Test void addCookie() { MockCookie mockCookie = new MockCookie("SESSION", "123");