Skip to content
Snippets Groups Projects
Commit 4e2a0a8f authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '2265-removing-user-and-their-projects-caues-an-error' into...

Merge branch '2265-removing-user-and-their-projects-caues-an-error' into 2256-view-privileges-for-automatically-logged-users
parents 02fabf90 21da62e4
No related branches found
No related tags found
4 merge requests!1897Allow to remove group with overlays,!1896Master,!1895Devel 18.2.x,!1894Resolve "View privileges for automatically logged users"
Pipeline #103562 failed
......@@ -5,7 +5,6 @@ import lcsb.mapviewer.model.security.Privilege;
import lcsb.mapviewer.model.security.PrivilegeType;
import lcsb.mapviewer.model.user.ConfigurationElementType;
import lcsb.mapviewer.model.user.User;
import lcsb.mapviewer.persist.dao.security.PrivilegeDao;
import lcsb.mapviewer.services.ServiceTestFunctionsNoTransaction;
import lcsb.mapviewer.services.interfaces.IUserService;
import org.junit.After;
......@@ -25,9 +24,6 @@ public class UserServiceNoTransactionTest extends ServiceTestFunctionsNoTransact
@Autowired
private IUserService userService;
@Autowired
private PrivilegeDao privilegeDao;
private GreenMail mailServer;
@Before
......@@ -44,6 +40,14 @@ public class UserServiceNoTransactionTest extends ServiceTestFunctionsNoTransact
public void tearDown() throws Exception {
mailServer.stop();
configurationService.setConfigurationValue(ConfigurationElementType.EMAIL_SMTP_SERVER, "");
User user1 = userService.getUserByLogin(TEST_LOGIN_1);
if (user1 != null) {
userService.deleteUser(user1);
}
User user2 = userService.getUserByLogin(TEST_LOGIN_1);
if (user2 != null) {
userService.deleteUser(user2);
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment