aboutsummaryrefslogtreecommitdiff
path: root/juick-server/src/test/java/com/juick
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2018-06-27 14:04:59 +0300
committerGravatar Vitaly Takmazov2018-06-27 14:04:59 +0300
commit0f0df74a6a0b069eabbf788d754389ee4c396f84 (patch)
treec25da351aec88eb5602ea35eb330376ae6d5a7d3 /juick-server/src/test/java/com/juick
parentdd605a1731cdcdf02317bedf7d946605a21e0bd8 (diff)
move hash to /me endpoint
Diffstat (limited to 'juick-server/src/test/java/com/juick')
-rw-r--r--juick-server/src/test/java/com/juick/server/tests/ServerTests.java15
1 files changed, 12 insertions, 3 deletions
diff --git a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
index 2c524eec..c43ed9bd 100644
--- a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
+++ b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
@@ -45,6 +45,7 @@ import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoCon
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.http.*;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -111,6 +112,8 @@ public class ServerTests {
@Inject
private MockMvc mockMvc;
@Inject
+ private TestRestTemplate restTemplate;
+ @Inject
private MessagesService messagesService;
@Inject
private UserService userService;
@@ -1019,9 +1022,8 @@ public class ServerTests {
map.add("body", "yo");
map.add("hash", userService.getHashByUID(ugnich.getUid()));
- RestTemplate rest = new RestTemplate();
- ResponseEntity<CommandResult> result = rest.postForEntity(
- "http://localhost:8080/post",
+ ResponseEntity<CommandResult> result = restTemplate.postForEntity(
+ "/post",
request, CommandResult.class);
assertThat(result.getStatusCode(), is(HttpStatus.OK));
}
@@ -1038,4 +1040,11 @@ public class ServerTests {
assertThat(attachment.getHeight(), is(1));
assertThat(attachment.getWidth(), is(1));
}
+ @Test
+ public void meContainsHash() throws Exception {
+ String hash = userService.getHashByUID(ugnich.getUid());
+ mockMvc.perform(get("/me")
+ .with(httpBasic(ugnichName, ugnichPassword)))
+ .andExpect(jsonPath("$.hash", is(hash)));
+ }
}