diff --git a/backend/src/test/java/com/zl/mjga/integration/mvc/UserRolePermissionMvcTest.java b/backend/src/test/java/com/zl/mjga/integration/mvc/UserRolePermissionMvcTest.java index 6006de1..3ad73b1 100644 --- a/backend/src/test/java/com/zl/mjga/integration/mvc/UserRolePermissionMvcTest.java +++ b/backend/src/test/java/com/zl/mjga/integration/mvc/UserRolePermissionMvcTest.java @@ -46,6 +46,7 @@ class UserRolePermissionMvcTest { stubUserRolePermissionDto.setUsername(stubUsername); User stubUser = new User(); stubUser.setId(1L); + stubUser.setEnable(Boolean.TRUE); when(userRepository.fetchOneByUsername(anyString())).thenReturn(stubUser); when(identityAccessService.queryUniqueUserWithRolePermission(anyLong())) .thenReturn(stubUserRolePermissionDto); diff --git a/backend/src/test/java/com/zl/mjga/security/AuthenticationAndAuthorityTest.java b/backend/src/test/java/com/zl/mjga/security/AuthenticationAndAuthorityTest.java index 681d177..90f670b 100644 --- a/backend/src/test/java/com/zl/mjga/security/AuthenticationAndAuthorityTest.java +++ b/backend/src/test/java/com/zl/mjga/security/AuthenticationAndAuthorityTest.java @@ -14,6 +14,7 @@ import com.zl.mjga.controller.IdentityAccessController; import com.zl.mjga.controller.SignController; import com.zl.mjga.dto.sign.SignInDto; import com.zl.mjga.model.urp.EPermission; +import com.zl.mjga.repository.PermissionRepository; import com.zl.mjga.repository.RoleRepository; import com.zl.mjga.repository.UserRepository; import com.zl.mjga.service.IdentityAccessService; @@ -47,6 +48,7 @@ public class AuthenticationAndAuthorityTest { @MockBean private UserRepository userRepository; @MockBean private RoleRepository roleRepository; + @MockBean private PermissionRepository permissionRepository; @Test public void givenRequestOnPublicService_shouldSucceedWith200() throws Exception { diff --git a/backend/src/test/java/com/zl/mjga/unit/PageRequestDtoUnitTest.java b/backend/src/test/java/com/zl/mjga/unit/PageRequestDtoUnitTest.java index 2da7882..7601223 100644 --- a/backend/src/test/java/com/zl/mjga/unit/PageRequestDtoUnitTest.java +++ b/backend/src/test/java/com/zl/mjga/unit/PageRequestDtoUnitTest.java @@ -14,9 +14,9 @@ public class PageRequestDtoUnitTest { @Test void setSortBy_whenSortByFieldIsExpectFormat_thenDeserializeCorrect() { - String sortBy1 = "id asc,name desc"; - String sortBy2 = "id asc"; - String sortBy3 = "id asc,"; + String sortBy1 = "id:asc,name:desc"; + String sortBy2 = "id:asc"; + String sortBy3 = "id:asc,"; String sortBy4 = ","; String sortBy5 = ""; PageRequestDto pageRequestDto1 = new PageRequestDto(); diff --git a/backend/src/test/java/com/zl/mjga/unit/SignUnitTest.java b/backend/src/test/java/com/zl/mjga/unit/SignUnitTest.java index 2bca40f..37e0d5a 100644 --- a/backend/src/test/java/com/zl/mjga/unit/SignUnitTest.java +++ b/backend/src/test/java/com/zl/mjga/unit/SignUnitTest.java @@ -36,6 +36,7 @@ public class SignUnitTest { // arrange User stubUser = new User(); stubUser.setId(1L); + stubUser.setEnable(true); stubUser.setUsername("testUserName"); stubUser.setPassword("GjFH2fzRB2y7DDrO"); when(userRepository.fetchOneByUsername("testUserName")).thenReturn(stubUser); diff --git a/frontend/src/views/UserView.vue b/frontend/src/views/UserView.vue index fdd9c75..d3b74c3 100644 --- a/frontend/src/views/UserView.vue +++ b/frontend/src/views/UserView.vue @@ -41,10 +41,15 @@ -