From d6eacfd81900f80b68c5bc3bff8981a5b9465b6d Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Wed, 26 Apr 2017 11:57:18 +0100
Subject: [PATCH] Avoid duplicate cookies with Spring Framework 5's MockMvc

Closes gh-390
---
 .../restdocs/mockmvc/MockMvcRequestConverter.java           | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/spring-restdocs-mockmvc/src/main/java/org/springframework/restdocs/mockmvc/MockMvcRequestConverter.java b/spring-restdocs-mockmvc/src/main/java/org/springframework/restdocs/mockmvc/MockMvcRequestConverter.java
index af66e401..45e0a9ba 100644
--- a/spring-restdocs-mockmvc/src/main/java/org/springframework/restdocs/mockmvc/MockMvcRequestConverter.java
+++ b/spring-restdocs-mockmvc/src/main/java/org/springframework/restdocs/mockmvc/MockMvcRequestConverter.java
@@ -70,7 +70,7 @@ class MockMvcRequestConverter implements RequestConverter<MockHttpServletRequest
 			HttpHeaders headers = extractHeaders(mockRequest);
 			Parameters parameters = extractParameters(mockRequest);
 			List<OperationRequestPart> parts = extractParts(mockRequest);
-			Collection<RequestCookie> cookies = extractCookies(mockRequest);
+			Collection<RequestCookie> cookies = extractCookies(mockRequest, headers);
 			String queryString = mockRequest.getQueryString();
 			if (!StringUtils.hasText(queryString)
 					&& "GET".equals(mockRequest.getMethod())) {
@@ -89,7 +89,8 @@ class MockMvcRequestConverter implements RequestConverter<MockHttpServletRequest
 		}
 	}
 
-	private Collection<RequestCookie> extractCookies(MockHttpServletRequest mockRequest) {
+	private Collection<RequestCookie> extractCookies(MockHttpServletRequest mockRequest,
+			HttpHeaders headers) {
 		if (mockRequest.getCookies() == null || mockRequest.getCookies().length == 0) {
 			return Collections.emptyList();
 		}
@@ -98,6 +99,7 @@ class MockMvcRequestConverter implements RequestConverter<MockHttpServletRequest
 			cookies.add(
 					new RequestCookie(servletCookie.getName(), servletCookie.getValue()));
 		}
+		headers.remove(HttpHeaders.COOKIE);
 		return cookies;
 	}