From 92d6700919e87c81db4a42a4b286257f62566cbf Mon Sep 17 00:00:00 2001 From: Alexander Alexeev Date: Thu, 1 Dec 2016 00:34:25 +0700 Subject: remember-me for juick-api by request parameter --- .../test/java/com/juick/api/tests/MessagesTests.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'juick-api/src/test/java/com') diff --git a/juick-api/src/test/java/com/juick/api/tests/MessagesTests.java b/juick-api/src/test/java/com/juick/api/tests/MessagesTests.java index 33704fc5..05744a61 100644 --- a/juick-api/src/test/java/com/juick/api/tests/MessagesTests.java +++ b/juick-api/src/test/java/com/juick/api/tests/MessagesTests.java @@ -19,7 +19,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Primary; import org.springframework.http.MediaType; -import org.springframework.security.crypto.codec.Base64; import org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -29,7 +28,6 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; import javax.inject.Inject; -import javax.servlet.http.Cookie; import java.util.*; import static org.hamcrest.Matchers.hasSize; @@ -158,6 +156,8 @@ public class MessagesTests { User user = getUser(1, ugnichName, uginchPassword); Message msg = getMessage(user, msgText); + when(userService.getUIDbyName(ugnichName)) + .thenReturn(1); when(userService.getUserByName(ugnichName)) .thenReturn(user); when(userService.getUserByUID(1)) @@ -171,12 +171,17 @@ public class MessagesTests { when(userService.getUIDbyHash(hash)) .thenReturn(1); - Cookie cookie = new Cookie("hash", new String(Base64.encode(hash.getBytes()))); - cookie.setDomain("juick.com"); - cookie.setMaxAge(100); - mockMvc.perform( - get("/home").cookie(cookie)) + get("/home") + .with(httpBasic(ugnichName, uginchPassword))) + .andExpect(status().isOk()) + .andReturn(); + + when(userService.getUserByHash(hash)) + .thenReturn(user); + + mockMvc.perform(get("/home") + .param("hash", hash)) .andExpect(status().isOk()); } -- cgit v1.2.3