Trying to fix failing tests

rest-assured · Sep 8, 2023 · 36aa273 · 36aa273
1 parent b2c4bd2
commit 36aa273
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/...ck-mvc/src/main/java/io/restassured/module/mockmvc/internal/MockMvcRequestSenderImpl.java b/...ck-mvc/src/main/java/io/restassured/module/mockmvc/internal/MockMvcRequestSenderImpl.java
@@ -74,13 +74,7 @@
 import java.net.URL;
 import java.security.Principal;
 import java.time.ZonedDateTime;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;

diff --git a/rest-assured/src/main/groovy/io/restassured/assertion/DetailedCookieAssertion.groovy b/rest-assured/src/main/groovy/io/restassured/assertion/DetailedCookieAssertion.groovy
@@ -35,7 +35,7 @@ class DetailedCookieAssertion {
         Cookie cookie = cookiesInHeader.get(cookieName)
         if (cookie == null) {
             cookie = responseCookies.get(cookieName)
-        } else if (cookie.getExpiryDate() != null) {
+        } else if (cookie.getExpiryDate() == null && responseCookies.get(cookieName) != null) {
             Cookie cookieFromResponse = responseCookies.get(cookieName)
             cookie = new Cookie.Builder(cookie).setExpiryDate(cookieFromResponse.getExpiryDate()).build()
         }