Fix Android WebView API access and mobile shell layout
This commit is contained in:
@@ -1,17 +1,14 @@
|
||||
package com.yoyuzh.auth;
|
||||
|
||||
import com.yoyuzh.config.FileStorageProperties;
|
||||
import com.yoyuzh.files.FileService;
|
||||
import com.yoyuzh.files.StoredFileRepository;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.io.TempDir;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.mockito.InjectMocks;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.jupiter.MockitoExtension;
|
||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||
|
||||
import java.nio.file.Path;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@@ -39,15 +36,9 @@ class DevBootstrapDataInitializerTest {
|
||||
@Mock
|
||||
private StoredFileRepository storedFileRepository;
|
||||
|
||||
@Mock
|
||||
private FileStorageProperties fileStorageProperties;
|
||||
|
||||
@InjectMocks
|
||||
private DevBootstrapDataInitializer initializer;
|
||||
|
||||
@TempDir
|
||||
Path tempDir;
|
||||
|
||||
@Test
|
||||
void shouldCreateInitialDevUsersWhenMissing() throws Exception {
|
||||
when(userRepository.findByUsername("portal-demo")).thenReturn(Optional.empty());
|
||||
@@ -57,7 +48,6 @@ class DevBootstrapDataInitializerTest {
|
||||
when(passwordEncoder.encode("study123456")).thenReturn("encoded-study-password");
|
||||
when(passwordEncoder.encode("design123456")).thenReturn("encoded-design-password");
|
||||
when(storedFileRepository.existsByUserIdAndPathAndFilename(anyLong(), anyString(), anyString())).thenReturn(false);
|
||||
when(fileStorageProperties.getRootDir()).thenReturn(tempDir.toString());
|
||||
List<User> savedUsers = new ArrayList<>();
|
||||
when(userRepository.save(any(User.class))).thenAnswer(invocation -> {
|
||||
User user = invocation.getArgument(0);
|
||||
@@ -71,9 +61,9 @@ class DevBootstrapDataInitializerTest {
|
||||
|
||||
verify(userRepository, times(3)).save(any(User.class));
|
||||
verify(fileService, times(3)).ensureDefaultDirectories(any(User.class));
|
||||
verify(fileService, times(9)).importExternalFile(any(User.class), anyString(), anyString(), anyString(), anyLong(), any());
|
||||
org.assertj.core.api.Assertions.assertThat(savedUsers)
|
||||
.extracting(User::getUsername)
|
||||
.containsExactly("portal-demo", "portal-study", "portal-design");
|
||||
verify(storedFileRepository, times(9)).save(any());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user