Merge branch 'Develop' into 'Test'

Develop







See merge request !899

mooctest-site-server/src/test/java/cn/iselab/mooctest/site/web/logic/impl/UserLogicImplTest.java

@@ -2,6 +2,7 @@ package cn.iselab.mooctest.site.web.logic.impl;
 
 import cn.iselab.mooctest.rpc.user.data.UserIntegralDTO;
 import cn.iselab.mooctest.site.AbstractShiroTest;
+import cn.iselab.mooctest.site.configure.ClientFeatureConfiguration;
 import cn.iselab.mooctest.site.dao.UserDao;
 import cn.iselab.mooctest.site.data.UserDTOForMT;
 import cn.iselab.mooctest.site.models.*;
@@ -80,6 +81,8 @@ public class UserLogicImplTest extends AbstractShiroTest {
     private MenuVOWrapper menuVOWrapper;
     @Mock
     private IntegralService integralService;
+    @Mock
+    private ClientFeatureConfiguration clientFeatureConfiguration;
 
     private UserVO userVO = new UserVO();
     private UserDTOForMT user = new UserDTOForMT();
@@ -404,6 +407,7 @@ public class UserLogicImplTest extends AbstractShiroTest {
         when(menuService.getMenuListByRoleId(role.getId())).thenReturn(Arrays.asList(new Menu()));
         when(openId2UserIdService.findOpenIdByUserId(userVO.getId())).thenReturn("openID");
         when(integralService.getUserIntegral(anyLong())).thenReturn(integralDTO);
+        when(clientFeatureConfiguration.isMedal()).thenReturn(true);
 
         UserVO result = userLogic.initialForUserVO(userVO);