aboutsummaryrefslogtreecommitdiff
path: root/juick-api/src/test/java/com/juick
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2017-09-06 12:04:40 +0300
committerGravatar Vitaly Takmazov2017-09-06 12:04:40 +0300
commit346c39037d6e5e9c2d006ac43439f865f418a62c (patch)
treec09726aaa433e10aaa6b529940008646fa5c80e9 /juick-api/src/test/java/com/juick
parent09b1795a7ab08b334dfd3ce94f343caa86f926a6 (diff)
api and www: cleanup tests and tests configuration
Diffstat (limited to 'juick-api/src/test/java/com/juick')
-rw-r--r--juick-api/src/test/java/com/juick/api/tests/MessagesTests.java5
1 files changed, 3 insertions, 2 deletions
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 6840d453..be21c3fc 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
@@ -25,7 +25,6 @@ import com.juick.api.TGBot;
import com.juick.server.configuration.BaseWebConfiguration;
import com.juick.api.configuration.ApiSecurityConfig;
import com.juick.api.configuration.MessengerConfiguration;
-import com.juick.api.configuration.TelegramConfiguration;
import com.juick.configuration.MockDataConfiguration;
import com.juick.server.helpers.TagStats;
import com.juick.service.MessagesService;
@@ -48,6 +47,7 @@ import org.springframework.test.context.web.WebAppConfiguration;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.socket.client.WebSocketConnectionManager;
import javax.inject.Inject;
@@ -68,9 +68,10 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@WebAppConfiguration
public class MessagesTests {
@Configuration
+ @EnableWebMvc
@ComponentScan(basePackages = "com.juick.api.controllers")
@Import(value = {BaseWebConfiguration.class, ApiSecurityConfig.class,
- MockDataConfiguration.class, MessengerConfiguration.class, TelegramConfiguration.class})
+ MockDataConfiguration.class, MessengerConfiguration.class})
static class Config {
@Bean
WebSocketConnectionManager connectionManager() {