Merge branch '7.0.x'

This commit is contained in:
Sam Brannen
2026-08-31 17:17:01 +02:00
4 changed files with 31 additions and 2 deletions
@@ -109,6 +109,17 @@ class MockMvcWebClientBuilderTests {
assertThat(getResponse(client, "http://localhost/").getContentAsString()).isEqualTo("NA");
}
@Test
void cookieWithLargeMaxAgeIsStored() throws Exception {
this.mockMvc = MockMvcBuilders.standaloneSetup(new CookieController()).build();
WebClient client = MockMvcWebClientBuilder.mockMvcSetup(this.mockMvc).build();
assertThat(getResponse(client, "http://localhost/").getContentAsString()).isEqualTo("NA");
assertThat(postResponse(client, "http://localhost/long-lived", "cookie=foo")
.getContentAsString()).isEqualTo("Set");
assertThat(getResponse(client, "http://localhost/").getContentAsString()).isEqualTo("foo");
}
private void assertMockMvcUsed(WebClient client, String url) throws Exception {
assertThat(getResponse(client, url).getContentAsString()).isEqualTo("mvc");
}
@@ -162,6 +173,15 @@ class MockMvcWebClientBuilderTests {
return "Set";
}
@PostMapping(path = "/long-lived", produces = "text/plain")
String setLongLivedCookie(@RequestParam String cookie, HttpServletResponse response) {
jakarta.servlet.http.Cookie longLived = new jakarta.servlet.http.Cookie(COOKIE_NAME, cookie);
longLived.setMaxAge(Integer.MAX_VALUE);
longLived.setPath("/");
response.addCookie(longLived);
return "Set";
}
@DeleteMapping(path = "/", produces = "text/plain")
String deleteCookie(HttpServletResponse response) {
jakarta.servlet.http.Cookie cookie = new jakarta.servlet.http.Cookie(COOKIE_NAME, "");