Commit 2d71c156 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

merge issues

parent 518c3ef7
Pipeline #29607 failed with stage
in 61 minutes and 54 seconds
......@@ -983,9 +983,7 @@ public class CommentControllerIntegrationTest extends ControllerIntegrationTest
@Test
public void testCommentsOnNonExistingModel() throws Exception {
createAdmin(TEST_ADMIN_LOGIN, TEST_ADMIN_PASSWORD);
MockHttpSession session = createSession(TEST_ADMIN_LOGIN, TEST_ADMIN_PASSWORD);
MockHttpSession session = createSession(BUILT_IN_TEST_ADMIN_LOGIN, BUILT_IN_TEST_ADMIN_PASSWORD);
createComments();
......@@ -999,9 +997,7 @@ public class CommentControllerIntegrationTest extends ControllerIntegrationTest
@Test
public void testRemoveFromSubmap() throws Exception {
createAdmin(TEST_ADMIN_LOGIN, TEST_ADMIN_PASSWORD);
MockHttpSession session = createSession(TEST_ADMIN_LOGIN, TEST_ADMIN_PASSWORD);
MockHttpSession session = createSession(BUILT_IN_TEST_ADMIN_LOGIN, BUILT_IN_TEST_ADMIN_PASSWORD);
ModelData submap = map.getSubmodels().iterator().next().getSubmodel();
......
......@@ -4,7 +4,6 @@ import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.docu
import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.*;
import static org.springframework.restdocs.request.RequestDocumentation.*;
import static org.junit.Assert.assertEquals;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import java.nio.file.Files;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment