ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 06:55:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up mock creation. (#5627)

Browse Source 
* Use our standard XYZMock(.init()) pattern everywhere instead of XYZMock.default.

* Remove the configuration parameter label on mock convenience inits.

* Update the enterprise submodule.
This commit is contained in:
Doug
2026-05-22 17:34:35 +01:00
committed by GitHub
parent edd7130a97
commit 08d02001bf
146 changed files with 540 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/Authentication/LoginScreen/View/LoginScreen.swift
+1 -1
View File
@@ -162,7 +162,7 @@ struct LoginScreen_Previews: PreviewProvider, TestablePreview {
loginHint: nil,
userIndicatorController: UserIndicatorControllerMock(),
appSettings: .volatile(),
analytics: AnalyticsServiceMock.default)
analytics: AnalyticsServiceMock(.init()))
if withCredentials {
viewModel.context.username = "alice"
ElementX/Sources/Screens/Authentication/ServerConfirmationScreen/View/ServerConfirmationScreen.swift
+1 -1
View File
@@ -164,6 +164,6 @@ struct ServerConfirmationScreen_Previews: PreviewProvider, TestablePreview {
mode: mode,
authenticationFlow: flow,
appSettings: .volatile(),
userIndicatorController: UserIndicatorControllerMock.default)
userIndicatorController: UserIndicatorControllerMock())
}
}
ElementX/Sources/Screens/Authentication/ServerSelectionScreen/View/ServerSelectionScreen.swift
+1 -1
View File
@@ -117,7 +117,7 @@ struct ServerSelection_Previews: PreviewProvider, TestablePreview {
let viewModel = ServerSelectionScreenViewModel(authenticationService: authenticationService,
authenticationFlow: .login,
appSettings: .volatile(),
userIndicatorController: UserIndicatorControllerMock.default)
userIndicatorController: UserIndicatorControllerMock())
viewModel.context.homeserverAddress = homeserverAddress
if homeserverAddress == "thisisbad" {
viewModel.context.send(viewAction: .confirm)
ElementX/Sources/Screens/Authentication/StartScreen/View/AuthenticationClassicAppAccountView.swift
+1 -1
View File
@@ -152,7 +152,7 @@ struct AuthenticationClassicAppAccountView_Previews: PreviewProvider { // Not Te
isBugReportServiceEnabled: false,
appMediator: AppMediatorMock(),
appSettings: .volatile(),
mediaProvider: MediaProviderMock(configuration: .init()),
mediaProvider: MediaProviderMock(.init()),
userIndicatorController: UserIndicatorControllerMock())
}
}
ElementX/Sources/Screens/Authentication/StartScreen/View/AuthenticationStartScreen.swift
+1 -1
View File
@@ -196,7 +196,7 @@ struct AuthenticationStartScreen_Previews: PreviewProvider, TestablePreview {
isBugReportServiceEnabled: true,
appMediator: AppMediatorMock(),
appSettings: .volatile(),
mediaProvider: MediaProviderMock(configuration: .init()),
mediaProvider: MediaProviderMock(.init()),
userIndicatorController: UserIndicatorControllerMock())
}
}
ElementX/Sources/Screens/CallScreen/View/CallScreen.swift
+1 -1
View File
@@ -374,6 +374,6 @@ struct CallScreen_Previews: PreviewProvider {
colorScheme: .light),
allowPictureInPicture: false,
appSettings: .volatile(),
analyticsService: AnalyticsServiceMock.default)
analyticsService: AnalyticsServiceMock(.init()))
}
}
ElementX/Sources/Screens/ChatsSpaceFiltersScreen/View/ChatsSpaceFilterCell.swift
+1 -1
View File
@@ -96,7 +96,7 @@ struct ChatsSpaceFilterCell: View {
}
struct ChatsSpaceFilterCell_Previews: PreviewProvider, TestablePreview {
static let mediaProvider = MediaProviderMock(configuration: .init())
static let mediaProvider = MediaProviderMock(.init())
static let spaces = [SpaceServiceRoom].mockJoinedSpaces2
ElementX/Sources/Screens/ChatsSpaceFiltersScreen/View/ChatsSpaceFiltersScreen.swift
+1 -1
View File
@@ -54,6 +54,6 @@ struct ChatsSpaceFiltersScreen_Previews: PreviewProvider, TestablePreview {
static func makeViewModel() -> ChatsSpaceFiltersScreenViewModel {
ChatsSpaceFiltersScreenViewModel(spaceService: SpaceServiceProxyMock(.populated),
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
}
}
ElementX/Sources/Screens/CreatePollScreen/View/PollFormScreen.swift
+2 -2
View File
@@ -227,8 +227,8 @@ struct PollFormScreen_Previews: PreviewProvider, TestablePreview {
static func makeViewModel(mode: PollFormMode) -> PollFormScreenViewModel {
PollFormScreenViewModel(mode: mode,
timelineController: MockTimelineController(),
analytics: AnalyticsServiceMock.default,
userIndicatorController: UserIndicatorControllerMock.default)
analytics: AnalyticsServiceMock(.init()),
userIndicatorController: UserIndicatorControllerMock())
}
}
ElementX/Sources/Screens/CreateRoomScreen/View/CreateRoomScreen.swift
+2 -2
View File
@@ -460,8 +460,8 @@ struct CreateRoom_Previews: PreviewProvider, TestablePreview {
spaceSelectionMode: selectionMode,
shouldShowCancelButton: isSpace,
userSession: userSession,
analytics: AnalyticsServiceMock.default,
userIndicatorController: UserIndicatorControllerMock.default,
analytics: AnalyticsServiceMock(.init()),
userIndicatorController: UserIndicatorControllerMock(),
appSettings: appSettings)
}
}
ElementX/Sources/Screens/CreateRoomScreen/View/CreateRoomSpaceSelectionSheet.swift
+2 -2
View File
@@ -73,8 +73,8 @@ struct CreateRoomSpaceSelectionSheet_Previews: PreviewProvider, TestablePreview
spaceSelectionMode: .editableSpacesList(preSelectedSpace: nil),
shouldShowCancelButton: false,
userSession: userSession,
analytics: AnalyticsServiceMock.default,
userIndicatorController: UserIndicatorControllerMock.default,
analytics: AnalyticsServiceMock(.init()),
userIndicatorController: UserIndicatorControllerMock(),
appSettings: appSettings)
}()
ElementX/Sources/Screens/FilePreviewScreen/TimelineMediaPreviewModifier.swift
+1 -1
View File
@@ -166,7 +166,7 @@ struct TimelineMediaPreviewModifier_Previews: PreviewProvider {
let timelineController = MockTimelineController(timelineKind: .media(.mediaFilesScreen))
timelineController.timelineItems = [item]
let mediaProvider = MediaProviderMock(configuration: .init())
let mediaProvider = MediaProviderMock(.init())
if isDownloading {
mediaProvider.loadFileFromSourceFilenameClosure = { _, _ in
ElementX/Sources/Screens/FilePreviewScreen/View/TimelineMediaPreviewDetailsView.swift
+1 -1
View File
@@ -230,7 +230,7 @@ struct TimelineMediaPreviewDetailsView_Previews: PreviewProvider, TestablePrevie
let viewModel = TimelineMediaPreviewViewModel(initialItem: item,
timelineViewModel: TimelineViewModel.mock(timelineKind: timelineKind,
timelineController: timelineController),
mediaProvider: MediaProviderMock(configuration: .init()),
mediaProvider: MediaProviderMock(.init()),
photoLibraryManager: PhotoLibraryManagerMock(.init()),
userIndicatorController: UserIndicatorControllerMock(),
appMediator: AppMediatorMock())
ElementX/Sources/Screens/FilePreviewScreen/View/TimelineMediaPreviewRedactConfirmationView.swift
+1 -1
View File
@@ -147,7 +147,7 @@ struct TimelineMediaPreviewRedactConfirmationView_Previews: PreviewProvider, Tes
return TimelineMediaPreviewViewModel(initialItem: item,
timelineViewModel: TimelineViewModel.mock(timelineKind: timelineController.timelineKind,
timelineController: timelineController),
mediaProvider: MediaProviderMock(configuration: .init()),
mediaProvider: MediaProviderMock(.init()),
photoLibraryManager: PhotoLibraryManagerMock(.init()),
userIndicatorController: UserIndicatorControllerMock(),
appMediator: AppMediatorMock())
ElementX/Sources/Screens/GlobalSearchScreen/View/GlobalSearchScreen.swift
+1 -1
View File
@@ -207,7 +207,7 @@ private class GlobalSearchTextField: UITextField {
struct GlobalSearchScreen_Previews: PreviewProvider, TestablePreview {
static let viewModel = GlobalSearchScreenViewModel(roomSummaryProvider: RoomSummaryProviderMock(.init(state: .loaded(.mockRooms))),
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
static var previews: some View {
ElementNavigationStack {
ElementX/Sources/Screens/GlobalSearchScreen/View/GlobalSearchScreenCell.swift
+1 -1
View File
@@ -38,7 +38,7 @@ struct GlobalSearchScreenListRow: View {
struct GlobalSearchScreenListRow_Previews: PreviewProvider, TestablePreview {
static let viewModel = GlobalSearchScreenViewModel(roomSummaryProvider: RoomSummaryProviderMock(.init(state: .loaded(.mockRooms))),
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
static var previews: some View {
List {
ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift
+2 -2
View File
@@ -225,8 +225,8 @@ struct HomeScreen_Previews: PreviewProvider, TestablePreview {
return HomeScreenViewModel(userSession: userSession,
selectedRoomPublisher: CurrentValueSubject<String?, Never>(nil).asCurrentValuePublisher(),
appSettings: .volatile(),
analyticsService: AnalyticsServiceMock.default,
analyticsService: AnalyticsServiceMock(.init()),
notificationManager: NotificationManagerMock(),
userIndicatorController: UserIndicatorControllerMock.default)
userIndicatorController: UserIndicatorControllerMock())
}
}
ElementX/Sources/Screens/HomeScreen/View/HomeScreenEmptyStateView.swift
+2 -2
View File
@@ -146,8 +146,8 @@ struct HomeScreenEmptyStateView_Previews: PreviewProvider, TestablePreview {
return HomeScreenViewModel(userSession: userSession,
selectedRoomPublisher: CurrentValueSubject<String?, Never>(nil).asCurrentValuePublisher(),
appSettings: .volatile(),
analyticsService: AnalyticsServiceMock.default,
analyticsService: AnalyticsServiceMock(.init()),
notificationManager: NotificationManagerMock(),
userIndicatorController: UserIndicatorControllerMock.default)
userIndicatorController: UserIndicatorControllerMock())
}()
}
ElementX/Sources/Screens/HomeScreen/View/HomeScreenInviteCell.swift
+2 -2
View File
@@ -203,9 +203,9 @@ struct HomeScreenInviteCell_Previews: PreviewProvider, TestablePreview {
return HomeScreenViewModel(userSession: userSession,
selectedRoomPublisher: CurrentValueSubject<String?, Never>(nil).asCurrentValuePublisher(),
appSettings: .volatile(),
analyticsService: AnalyticsServiceMock.default,
analyticsService: AnalyticsServiceMock(.init()),
notificationManager: NotificationManagerMock(),
userIndicatorController: UserIndicatorControllerMock.default)
userIndicatorController: UserIndicatorControllerMock())
}
}
ElementX/Sources/Screens/HomeScreen/View/HomeScreenKnockedCell.swift
+2 -2
View File
@@ -135,9 +135,9 @@ struct HomeScreenKnockedCell_Previews: PreviewProvider, TestablePreview {
return HomeScreenViewModel(userSession: userSession,
selectedRoomPublisher: CurrentValueSubject<String?, Never>(nil).asCurrentValuePublisher(),
appSettings: .volatile(),
analyticsService: AnalyticsServiceMock.default,
analyticsService: AnalyticsServiceMock(.init()),
notificationManager: NotificationManagerMock(),
userIndicatorController: UserIndicatorControllerMock.default)
userIndicatorController: UserIndicatorControllerMock())
}
}
ElementX/Sources/Screens/HomeScreen/View/HomeScreenRecoveryKeyConfirmationBanner.swift
+2 -2
View File
@@ -124,8 +124,8 @@ struct HomeScreenRecoveryKeyConfirmationBanner_Previews: PreviewProvider, Testab
return HomeScreenViewModel(userSession: userSession,
selectedRoomPublisher: CurrentValueSubject<String?, Never>(nil).asCurrentValuePublisher(),
appSettings: .volatile(),
analyticsService: AnalyticsServiceMock.default,
analyticsService: AnalyticsServiceMock(.init()),
notificationManager: NotificationManagerMock(),
userIndicatorController: UserIndicatorControllerMock.default)
userIndicatorController: UserIndicatorControllerMock())
}
}
ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomCell.swift
+6 -6
View File
@@ -221,17 +221,17 @@ struct HomeScreenRoomCell_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
VStack(spacing: 0) {
ForEach(genericRooms) { room in
HomeScreenRoomCell(room: room, isSelected: false, mediaProvider: MediaProviderMock(configuration: .init())) { _ in }
HomeScreenRoomCell(room: room, isSelected: false, mediaProvider: MediaProviderMock(.init())) { _ in }
}
HomeScreenRoomCell(room: .placeholder(), isSelected: false, mediaProvider: MediaProviderMock(configuration: .init())) { _ in }
HomeScreenRoomCell(room: .placeholder(), isSelected: false, mediaProvider: MediaProviderMock(.init())) { _ in }
.redacted(reason: .placeholder)
}
.previewDisplayName("Generic")
VStack(spacing: 0) {
ForEach(notificationsStateRooms) { room in
HomeScreenRoomCell(room: room, isSelected: false, mediaProvider: MediaProviderMock(configuration: .init())) { _ in }
HomeScreenRoomCell(room: room, isSelected: false, mediaProvider: MediaProviderMock(.init())) { _ in }
}
}
.previewLayout(.sizeThatFits)
@@ -239,7 +239,7 @@ struct HomeScreenRoomCell_Previews: PreviewProvider, TestablePreview {
VStack(spacing: 0) {
ForEach(lastMessageStateRooms) { room in
HomeScreenRoomCell(room: room, isSelected: false, mediaProvider: MediaProviderMock(configuration: .init())) { _ in }
HomeScreenRoomCell(room: room, isSelected: false, mediaProvider: MediaProviderMock(.init())) { _ in }
}
}
.previewLayout(.sizeThatFits)
@@ -256,9 +256,9 @@ struct HomeScreenRoomCell_Previews: PreviewProvider, TestablePreview {
return HomeScreenViewModel(userSession: userSession,
selectedRoomPublisher: CurrentValueSubject<String?, Never>(nil).asCurrentValuePublisher(),
appSettings: .volatile(),
analyticsService: AnalyticsServiceMock.default,
analyticsService: AnalyticsServiceMock(.init()),
notificationManager: NotificationManagerMock(),
userIndicatorController: UserIndicatorControllerMock.default)
userIndicatorController: UserIndicatorControllerMock())
}
static func makeRoom(lastMessageState: RoomSummary.LastMessageState) -> HomeScreenRoom {
ElementX/Sources/Screens/InviteUsersScreen/View/InviteUsersScreenSelectedItem.swift
+1 -1
View File
@@ -64,7 +64,7 @@ struct InviteUsersScreenSelectedItem_Previews: PreviewProvider, TestablePreview
ScrollView(.horizontal) {
HStack(spacing: 8) {
ForEach(people, id: \.userID) { user in
InviteUsersScreenSelectedItem(user: user, mediaProvider: MediaProviderMock(configuration: .init())) { }
InviteUsersScreenSelectedItem(user: user, mediaProvider: MediaProviderMock(.init())) { }
.frame(width: 80)
}
}
ElementX/Sources/Screens/JoinRoomScreen/View/JoinRoomScreen.swift
+1 -1
View File
@@ -458,7 +458,7 @@ struct JoinRoomScreenPreviewWrapper: Identifiable {
viewModel = JoinRoomScreenViewModel(source: source,
appSettings: appSettings,
userSession: UserSessionMock(.init(clientProxy: clientProxy)),
userIndicatorController: UserIndicatorControllerMock.default)
userIndicatorController: UserIndicatorControllerMock())
}
var previewDisplayName: String {
ElementX/Sources/Screens/LocationSharing/LocationSharingScreenViewModel.swift
+2 -2
View File
@@ -394,8 +394,8 @@ extension LocationSharingScreenViewModel {
roomProxy: roomProxy,
timelineController: MockTimelineController(),
liveLocationManager: LiveLocationManagerMock(),
analytics: AnalyticsServiceMock.default,
analytics: AnalyticsServiceMock(.init()),
userIndicatorController: UserIndicatorControllerMock(),
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
}
}
ElementX/Sources/Screens/LocationSharing/View/UserLocationCell.swift
+3 -3
View File
@@ -90,19 +90,19 @@ struct UserLocationCell_Previews: PreviewProvider, TestablePreview {
UserLocationCell(profile: .mockDan,
isOwnUser: true,
kind: .static(isUserLocation: true, timestamp: .mock),
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
.previewDisplayName("Stiatc user locaton")
.previewLayout(.sizeThatFits)
UserLocationCell(profile: .mockDan,
isOwnUser: false,
kind: .static(isUserLocation: false, timestamp: .mock),
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
.previewDisplayName("Static pin location")
.previewLayout(.sizeThatFits)
UserLocationCell(profile: .mockDan,
isOwnUser: true,
kind: .live,
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
.previewDisplayName("Live location")
.previewLayout(.sizeThatFits)
}
ElementX/Sources/Screens/ManageAuthorizedSpacesScreen/View/ManageAuthorizedSpacesScreen.swift
+1 -1
View File
@@ -109,7 +109,7 @@ struct ManageAuthorizedSpacesScreen_Previews: PreviewProvider, TestablePreview {
initialSelectedIDs: ["space1",
"space3",
"!unknown-space-id-2"]),
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
static var previews: some View {
ElementNavigationStack {
ElementX/Sources/Screens/ManageRoomMemberSheet/View/ManageRoomMemberSheetView.swift
+2 -2
View File
@@ -120,7 +120,7 @@ private extension ManageRoomMemberSheetViewModel {
ownPowerLevel: powerLevel),
roomProxy: JoinedRoomProxyMock(.init()),
userIndicatorController: UserIndicatorControllerMock(),
analyticsService: AnalyticsServiceMock.default,
mediaProvider: MediaProviderMock(configuration: .init()))
analyticsService: AnalyticsServiceMock(.init()),
mediaProvider: MediaProviderMock(.init()))
}
}
ElementX/Sources/Screens/MediaEventsTimelineScreen/View/MediaEventsTimelineScreen.swift
+3 -3
View File
@@ -298,7 +298,7 @@ struct MediaEventsTimelineScreen_Previews: PreviewProvider, TestablePreview {
MediaEventsTimelineScreenViewModel(mediaTimelineViewModel: makeTimelineViewModel(empty: empty),
filesTimelineViewModel: makeTimelineViewModel(empty: empty),
initialScreenMode: screenMode,
mediaProvider: MediaProviderMock(configuration: .init()),
mediaProvider: MediaProviderMock(.init()),
userIndicatorController: UserIndicatorControllerMock(),
appMediator: AppMediatorMock())
}
@@ -316,9 +316,9 @@ struct MediaEventsTimelineScreen_Previews: PreviewProvider, TestablePreview {
userSession: UserSessionMock(.init()),
mediaPlayerProvider: MediaPlayerProviderMock(),
userIndicatorController: UserIndicatorControllerMock(),
appMediator: AppMediatorMock.default,
appMediator: AppMediatorMock(.init()),
appSettings: appSettings,
analyticsService: AnalyticsServiceMock.default,
analyticsService: AnalyticsServiceMock(.init()),
emojiProvider: EmojiProvider(appSettings: appSettings),
linkMetadataProvider: LinkMetadataProvider(),
timelineControllerFactory: TimelineControllerFactoryMock(.init()))
ElementX/Sources/Screens/MediaUploadPreviewScreen/View/MediaUploadPreviewScreen.swift
+1 -1
View File
@@ -374,7 +374,7 @@ struct MediaUploadPreviewScreen_Previews: PreviewProvider, TestablePreview {
mediaUploadingPreprocessor: MediaUploadingPreprocessor(appSettings: .volatile()),
timelineController: MockTimelineController(),
clientProxy: ClientProxyMock(.init()),
userIndicatorController: UserIndicatorControllerMock.default)
userIndicatorController: UserIndicatorControllerMock())
static var previews: some View {
ElementNavigationStack {
MediaUploadPreviewScreen(context: viewModel.context)
ElementX/Sources/Screens/Onboarding/IdentityConfirmationScreen/View/IdentityConfirmationScreen.swift
+1 -1
View File
@@ -141,6 +141,6 @@ struct IdentityConfirmationScreen_Previews: PreviewProvider, TestablePreview {
return IdentityConfirmationScreenViewModel(userSession: userSession,
appSettings: .volatile(),
userIndicatorController: UserIndicatorControllerMock.default)
userIndicatorController: UserIndicatorControllerMock())
}
}
ElementX/Sources/Screens/Onboarding/SessionVerificationScreen/View/SessionVerificationRequestDetailsView.swift
+2 -2
View File
@@ -121,13 +121,13 @@ struct SessionVerificationRequestDetailsView_Previews: PreviewProvider, Testable
static var previews: some View {
SessionVerificationRequestDetailsView(details: details,
isUserVerification: true,
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
.padding()
.previewDisplayName("User")
SessionVerificationRequestDetailsView(details: details,
isUserVerification: false,
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
.padding()
.previewDisplayName("Device")
}
ElementX/Sources/Screens/Onboarding/SessionVerificationScreen/View/SessionVerificationScreen.swift
+1 -1
View File
@@ -290,7 +290,7 @@ struct SessionVerification_Previews: PreviewProvider, TestablePreview {
let viewModel = SessionVerificationScreenViewModel(sessionVerificationControllerProxy: SessionVerificationControllerProxyMock.configureMock(),
flow: flow,
appSettings: .volatile(),
mediaProvider: MediaProviderMock(configuration: .init()),
mediaProvider: MediaProviderMock(.init()),
verificationState: state)
return SessionVerificationScreen(context: viewModel.context)
ElementX/Sources/Screens/PinnedEventsTimelineScreen/View/PinnedEventsTimelineScreen.swift
+3 -3
View File
@@ -69,7 +69,7 @@ struct PinnedEventsTimelineScreen_Previews: PreviewProvider, TestablePreview {
static let viewModel = PinnedEventsTimelineScreenViewModel(roomProxy: JoinedRoomProxyMock(.init()),
userIndicatorController: UserIndicatorControllerMock(),
appSettings: .volatile(),
analyticsService: AnalyticsServiceMock.default)
analyticsService: AnalyticsServiceMock(.init()))
static let emptyTimelineViewModel: TimelineViewModel = {
let timelineController = MockTimelineController(timelineKind: .pinned)
@@ -82,9 +82,9 @@ struct PinnedEventsTimelineScreen_Previews: PreviewProvider, TestablePreview {
userSession: UserSessionMock(.init()),
mediaPlayerProvider: MediaPlayerProviderMock(),
userIndicatorController: UserIndicatorControllerMock(),
appMediator: AppMediatorMock.default,
appMediator: AppMediatorMock(.init()),
appSettings: appSettings,
analyticsService: AnalyticsServiceMock.default,
analyticsService: AnalyticsServiceMock(.init()),
emojiProvider: EmojiProvider(appSettings: appSettings),
linkMetadataProvider: LinkMetadataProvider(),
timelineControllerFactory: TimelineControllerFactoryMock(.init()))
ElementX/Sources/Screens/QRCodeLoginScreen/QRCodeLoginScreenViewModel.swift
+1 -1
View File
@@ -340,7 +340,7 @@ class QRCodeLoginScreenViewModel: QRCodeLoginScreenViewModelType, QRCodeLoginScr
/// Only for mocking initial states
fileprivate init(state: QRCodeLoginState, mode: QRCodeLoginScreenMode, canSignInManually: Bool, checkCodeInput: String) {
appMediator = AppMediatorMock.default
appMediator = AppMediatorMock(.init())
super.init(initialViewState: .init(state: state,
mode: mode,
canSignInManually: canSignInManually,
ElementX/Sources/Screens/RoomChangePermissionsScreen/View/RoomChangePermissionsScreen.swift
+1 -1
View File
@@ -91,6 +91,6 @@ struct RoomChangePermissionsScreen_Previews: PreviewProvider, TestablePreview {
ownPowerLevel: ownPowerLevel,
roomProxy: JoinedRoomProxyMock(.init(isSpace: isSpace)),
userIndicatorController: UserIndicatorControllerMock(),
analytics: AnalyticsServiceMock.default)
analytics: AnalyticsServiceMock(.init()))
}
}
ElementX/Sources/Screens/RoomChangeRolesScreen/View/RoomChangeRolesScreen.swift
+2 -2
View File
@@ -149,8 +149,8 @@ struct RoomChangeRolesScreen_Previews: PreviewProvider, TestablePreview {
return RoomChangeRolesScreenViewModel(mode: mode,
roomProxy: JoinedRoomProxyMock(.init(members: members)),
mediaProvider: MediaProviderMock(configuration: .init()),
mediaProvider: MediaProviderMock(.init()),
userIndicatorController: UserIndicatorControllerMock(),
analytics: AnalyticsServiceMock.default)
analytics: AnalyticsServiceMock(.init()))
}
}
ElementX/Sources/Screens/RoomChangeRolesScreen/View/RoomChangeRolesScreenRow.swift
+6 -6
View File
@@ -40,34 +40,34 @@ struct RoomChangeRolesScreenRow_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
Form {
RoomChangeRolesScreenRow(member: .init(withProxy: RoomMemberProxyMock.mockAlice),
mediaProvider: MediaProviderMock(configuration: .init()),
mediaProvider: MediaProviderMock(.init()),
isSelected: true,
action: action)
RoomChangeRolesScreenRow(member: .init(withProxy: RoomMemberProxyMock.mockBob),
mediaProvider: MediaProviderMock(configuration: .init()),
mediaProvider: MediaProviderMock(.init()),
isSelected: false,
action: action)
RoomChangeRolesScreenRow(member: .init(withProxy: RoomMemberProxyMock.mockInvited),
mediaProvider: MediaProviderMock(configuration: .init()),
mediaProvider: MediaProviderMock(.init()),
isSelected: false,
action: action)
RoomChangeRolesScreenRow(member: .init(withProxy: RoomMemberProxyMock.mockCharlie),
mediaProvider: MediaProviderMock(configuration: .init()),
mediaProvider: MediaProviderMock(.init()),
isSelected: true,
action: action)
.disabled(true)
RoomChangeRolesScreenRow(member: .init(withProxy: RoomMemberProxyMock(with: .init(userID: "@someone:matrix.org", membership: .join))),
mediaProvider: MediaProviderMock(configuration: .init()),
mediaProvider: MediaProviderMock(.init()),
isSelected: false,
action: action)
.disabled(true)
RoomChangeRolesScreenRow(member: .init(withProxy: RoomMemberProxyMock(with: .init(userID: "@someone:matrix.org", membership: .join))),
mediaProvider: MediaProviderMock(configuration: .init()),
mediaProvider: MediaProviderMock(.init()),
isSelected: false,
action: action)
}
ElementX/Sources/Screens/RoomChangeRolesScreen/View/RoomChangeRolesScreenSelectedItem.swift
+1 -1
View File
@@ -76,7 +76,7 @@ struct RoomChangeRolesScreenSelectedItem_Previews: PreviewProvider, TestablePrev
HStack(spacing: 12) {
ForEach(members, id: \.id) { member in
RoomChangeRolesScreenSelectedItem(member: member,
mediaProvider: MediaProviderMock(configuration: .init())) { }
mediaProvider: MediaProviderMock(.init())) { }
.frame(width: 72)
}
}
ElementX/Sources/Screens/RoomDetailsEditScreen/View/RoomDetailsEditScreen.swift
+1 -1
View File
@@ -178,6 +178,6 @@ struct RoomDetailsEditScreen_Previews: PreviewProvider, TestablePreview {
return RoomDetailsEditScreenViewModel(roomProxy: roomProxy,
userSession: UserSessionMock(.init()),
mediaUploadingPreprocessor: MediaUploadingPreprocessor(appSettings: .volatile()),
userIndicatorController: UserIndicatorControllerMock.default)
userIndicatorController: UserIndicatorControllerMock())
}
}
ElementX/Sources/Screens/RoomDetailsScreen/View/RoomDetailsScreen.swift
+8 -8
View File
@@ -420,8 +420,8 @@ struct RoomDetailsScreen_Previews: PreviewProvider, TestablePreview {
return .init(roomProxy: roomProxy,
userSession: UserSessionMock(.init()),
analyticsService: AnalyticsServiceMock.default,
userIndicatorController: UserIndicatorControllerMock.default,
analyticsService: AnalyticsServiceMock(.init()),
userIndicatorController: UserIndicatorControllerMock(),
notificationSettingsProxy: notificationSettingsProxy,
attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
appSettings: .volatile())
@@ -448,8 +448,8 @@ struct RoomDetailsScreen_Previews: PreviewProvider, TestablePreview {
return .init(roomProxy: roomProxy,
userSession: UserSessionMock(.init()),
analyticsService: AnalyticsServiceMock.default,
userIndicatorController: UserIndicatorControllerMock.default,
analyticsService: AnalyticsServiceMock(.init()),
userIndicatorController: UserIndicatorControllerMock(),
notificationSettingsProxy: notificationSettingsProxy,
attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
appSettings: .volatile())
@@ -474,9 +474,9 @@ struct RoomDetailsScreen_Previews: PreviewProvider, TestablePreview {
clientProxyMock.userIdentityForFallBackToServerClosure = { userID, _ in
let identity = switch userID {
case RoomMemberProxyMock.mockDan.userID:
UserIdentityProxyMock(configuration: .init(verificationState: verificationState))
UserIdentityProxyMock(.init(verificationState: verificationState))
default:
UserIdentityProxyMock(configuration: .init())
UserIdentityProxyMock(.init())
}
return .success(identity)
@@ -486,8 +486,8 @@ struct RoomDetailsScreen_Previews: PreviewProvider, TestablePreview {
return .init(roomProxy: roomProxy,
userSession: UserSessionMock(.init(clientProxy: clientProxyMock)),
analyticsService: AnalyticsServiceMock.default,
userIndicatorController: UserIndicatorControllerMock.default,
analyticsService: AnalyticsServiceMock(.init()),
userIndicatorController: UserIndicatorControllerMock(),
notificationSettingsProxy: notificationSettingsProxy,
attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
appSettings: .volatile())
ElementX/Sources/Screens/RoomDirectorySearchScreen/View/RoomDirectoryCell.swift
+8 -8
View File
@@ -56,7 +56,7 @@ struct RoomDirectorySearchCell_Previews: PreviewProvider, TestablePreview {
name: "Test title",
avatarURL: nil),
canBeJoined: true),
mediaProvider: MediaProviderMock(configuration: .init())) { }
mediaProvider: MediaProviderMock(.init())) { }
RoomDirectorySearchCell(result: .init(id: "!test_id_2:matrix.org",
alias: "#test:example.com",
@@ -66,7 +66,7 @@ struct RoomDirectorySearchCell_Previews: PreviewProvider, TestablePreview {
name: nil,
avatarURL: nil),
canBeJoined: true),
mediaProvider: MediaProviderMock(configuration: .init())) { }
mediaProvider: MediaProviderMock(.init())) { }
RoomDirectorySearchCell(result: .init(id: "!test_id_3:example.com",
alias: "#test_no_topic:example.com",
@@ -76,7 +76,7 @@ struct RoomDirectorySearchCell_Previews: PreviewProvider, TestablePreview {
name: "Test title no topic",
avatarURL: nil),
canBeJoined: true),
mediaProvider: MediaProviderMock(configuration: .init())) { }
mediaProvider: MediaProviderMock(.init())) { }
RoomDirectorySearchCell(result: .init(id: "!test_id_4:example.com",
alias: "#test_no_topic:example.com",
@@ -86,7 +86,7 @@ struct RoomDirectorySearchCell_Previews: PreviewProvider, TestablePreview {
name: nil,
avatarURL: nil),
canBeJoined: true),
mediaProvider: MediaProviderMock(configuration: .init())) { }
mediaProvider: MediaProviderMock(.init())) { }
RoomDirectorySearchCell(result: .init(id: "!test_id_5:example.com",
alias: nil,
@@ -96,7 +96,7 @@ struct RoomDirectorySearchCell_Previews: PreviewProvider, TestablePreview {
name: "Test title no alias",
avatarURL: nil),
canBeJoined: false),
mediaProvider: MediaProviderMock(configuration: .init())) { }
mediaProvider: MediaProviderMock(.init())) { }
RoomDirectorySearchCell(result: .init(id: "!test_id_6:example.com",
alias: nil,
@@ -106,7 +106,7 @@ struct RoomDirectorySearchCell_Previews: PreviewProvider, TestablePreview {
name: "Test title no alias",
avatarURL: nil),
canBeJoined: false),
mediaProvider: MediaProviderMock(configuration: .init())) { }
mediaProvider: MediaProviderMock(.init())) { }
RoomDirectorySearchCell(result: .init(id: "!test_id_7:example.com",
alias: nil,
@@ -116,7 +116,7 @@ struct RoomDirectorySearchCell_Previews: PreviewProvider, TestablePreview {
name: nil,
avatarURL: nil),
canBeJoined: false),
mediaProvider: MediaProviderMock(configuration: .init())) { }
mediaProvider: MediaProviderMock(.init())) { }
RoomDirectorySearchCell(result: .init(id: "!test_id_8:example.com",
alias: nil,
name: nil,
@@ -125,7 +125,7 @@ struct RoomDirectorySearchCell_Previews: PreviewProvider, TestablePreview {
name: nil,
avatarURL: nil),
canBeJoined: false),
mediaProvider: MediaProviderMock(configuration: .init())) { }
mediaProvider: MediaProviderMock(.init())) { }
}
.compoundList()
}
ElementX/Sources/Screens/RoomDirectorySearchScreen/View/RoomDirectorySearchScreen.swift
+1 -1
View File
@@ -88,7 +88,7 @@ struct RoomDirectorySearchScreen_Previews: PreviewProvider, TestablePreview {
avatarURL: .mockMXCAvatar),
canBeJoined: false)]
let roomDirectorySearchProxy = RoomDirectorySearchProxyMock(configuration: .init(results: results))
let roomDirectorySearchProxy = RoomDirectorySearchProxyMock(.init(results: results))
let clientProxy = ClientProxyMock(.init(roomDirectorySearchProxy: roomDirectorySearchProxy))
ElementX/Sources/Screens/RoomMemberDetailsScreen/View/RoomMemberDetailsScreen.swift
+5 -5
View File
@@ -221,11 +221,11 @@ struct RoomMemberDetailsScreen_Previews: PreviewProvider, TestablePreview {
clientProxyMock.userIdentityForFallBackToServerClosure = { userID, _ in
let identity = switch userID {
case RoomMemberProxyMock.mockDan.userID:
UserIdentityProxyMock(configuration: .init(verificationState: .verified))
UserIdentityProxyMock(.init(verificationState: .verified))
case RoomMemberProxyMock.mockBob.userID:
UserIdentityProxyMock(configuration: .init(verificationState: .verificationViolation))
UserIdentityProxyMock(.init(verificationState: .verificationViolation))
default:
UserIdentityProxyMock(configuration: .init())
UserIdentityProxyMock(.init())
}
return .success(identity)
@@ -239,8 +239,8 @@ struct RoomMemberDetailsScreen_Previews: PreviewProvider, TestablePreview {
return RoomMemberDetailsScreenViewModel(userID: member.userID,
roomProxy: roomProxyMock,
userSession: UserSessionMock(.init(clientProxy: clientProxyMock)),
userIndicatorController: UserIndicatorControllerMock.default,
analytics: AnalyticsServiceMock.default,
userIndicatorController: UserIndicatorControllerMock(),
analytics: AnalyticsServiceMock(.init()),
appSettings: .volatile())
}
}
ElementX/Sources/Screens/RoomMemberListScreen/View/RoomMembersListScreen.swift
+5 -5
View File
@@ -245,11 +245,11 @@ struct RoomMembersListScreen_Previews: PreviewProvider, TestablePreview {
clientProxyMock.userIdentityForFallBackToServerClosure = { userID, _ in
let identity = switch userID {
case RoomMemberProxyMock.mockAlice.userID:
UserIdentityProxyMock(configuration: .init(verificationState: .verified))
UserIdentityProxyMock(.init(verificationState: .verified))
case RoomMemberProxyMock.mockBob.userID:
UserIdentityProxyMock(configuration: .init(verificationState: .verificationViolation))
UserIdentityProxyMock(.init(verificationState: .verificationViolation))
default:
UserIdentityProxyMock(configuration: .init())
UserIdentityProxyMock(.init())
}
return .success(identity)
@@ -261,7 +261,7 @@ struct RoomMembersListScreen_Previews: PreviewProvider, TestablePreview {
members: members,
ownUserID: ownUserID,
powerLevelsConfiguration: .init(canUserInvite: false))),
userIndicatorController: UserIndicatorControllerMock.default,
analytics: AnalyticsServiceMock.default)
userIndicatorController: UserIndicatorControllerMock(),
analytics: AnalyticsServiceMock(.init()))
}
}
ElementX/Sources/Screens/RoomMemberListScreen/View/RoomMembersListScreenMemberCell.swift
+2 -2
View File
@@ -131,8 +131,8 @@ struct RoomMembersListMemberCell_Previews: PreviewProvider, TestablePreview {
static let viewModel = RoomMembersListScreenViewModel(userSession: UserSessionMock(.init()),
roomProxy: JoinedRoomProxyMock(.init(name: "Some room", members: [])),
userIndicatorController: UserIndicatorControllerMock.default,
analytics: AnalyticsServiceMock.default)
userIndicatorController: UserIndicatorControllerMock(),
analytics: AnalyticsServiceMock(.init()))
static var previews: some View {
VStack(spacing: 0) {
Section("Invited/Joined") {
ElementX/Sources/Screens/RoomRolesAndPermissionsScreen/View/RoomRolesAndPermissionsScreen.swift
+2 -2
View File
@@ -121,12 +121,12 @@ struct RoomRolesAndPermissionsScreen_Previews: PreviewProvider, TestablePreview
static let viewModel = RoomRolesAndPermissionsScreenViewModel(initialPermissions: RoomPermissions(powerLevels: .mock),
roomProxy: JoinedRoomProxyMock(.init(members: .allMembersAsAdmin)),
userIndicatorController: UserIndicatorControllerMock(),
analytics: AnalyticsServiceMock.default)
analytics: AnalyticsServiceMock(.init()))
static let creatorViewModel = RoomRolesAndPermissionsScreenViewModel(initialPermissions: RoomPermissions(powerLevels: .mock),
roomProxy: JoinedRoomProxyMock(.init(members: .allMembersAsCreator)),
userIndicatorController: UserIndicatorControllerMock(),
analytics: AnalyticsServiceMock.default)
analytics: AnalyticsServiceMock(.init()))
static var previews: some View {
ElementNavigationStack {
RoomRolesAndPermissionsScreen(context: viewModel.context)
ElementX/Sources/Screens/RoomScreen/ComposerToolbar/ComposerToolbarViewModel.swift
+2 -2
View File
@@ -824,10 +824,10 @@ extension ComposerToolbarViewModel {
let viewModel = ComposerToolbarViewModel(roomProxy: roomProxy,
wysiwygViewModel: wysiwygViewModel,
completionSuggestionService: CompletionSuggestionServiceMock(configuration: .init(suggestions: suggestions)),
mediaProvider: MediaProviderMock(configuration: .init()),
mediaProvider: MediaProviderMock(.init()),
mentionDisplayHelper: ComposerMentionDisplayHelper.mock,
appSettings: .volatile(),
analyticsService: AnalyticsServiceMock.default,
analyticsService: AnalyticsServiceMock(.init()),
composerDraftService: ComposerDraftServiceMock(.init()))
viewModel.state.bindings.composerFocused = focused
viewModel.state.bindings.plainComposerText = NSAttributedString(string: message)
ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/CompletionSuggestionView.swift
+2 -2
View File
@@ -109,13 +109,13 @@ struct CompletionSuggestion_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
// Putting them is VStack allows the preview to work properly in tests
VStack(spacing: 8) {
CompletionSuggestionView(mediaProvider: MediaProviderMock(configuration: .init()),
CompletionSuggestionView(mediaProvider: MediaProviderMock(.init()),
items: [.init(suggestionType: .user(.init(id: "@user_mention_1:matrix.org", displayName: "User 1", avatarURL: nil)), range: .init(), rawSuggestionText: ""),
.init(suggestionType: .user(.init(id: "@user_mention_2:matrix.org", displayName: "User 2", avatarURL: .mockMXCUserAvatar)), range: .init(), rawSuggestionText: "")]) { _ in }
}
VStack(spacing: 8) {
CompletionSuggestionView(mediaProvider: MediaProviderMock(configuration: .init()),
CompletionSuggestionView(mediaProvider: MediaProviderMock(.init()),
items: multipleItems) { _ in }
}
}
ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/MentionSuggestionItemView.swift
+1 -1
View File
@@ -46,7 +46,7 @@ struct MentionSuggestionItemView: View {
}
struct MentionSuggestionItemView_Previews: PreviewProvider, TestablePreview {
static let mockMediaProvider = MediaProviderMock(configuration: .init())
static let mockMediaProvider = MediaProviderMock(.init())
static var previews: some View {
MentionSuggestionItemView(mediaProvider: mockMediaProvider, item: .init(suggestionType: .user(.init(id: "test", displayName: "Test", avatarURL: .mockMXCUserAvatar)), range: .init(), rawSuggestionText: ""))
ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/RoomAttachmentPicker.swift
+2 -2
View File
@@ -86,10 +86,10 @@ struct RoomAttachmentPicker_Previews: PreviewProvider, TestablePreview {
return ComposerToolbarViewModel(roomProxy: JoinedRoomProxyMock(.init()),
wysiwygViewModel: WysiwygComposerViewModel(),
completionSuggestionService: CompletionSuggestionServiceMock(configuration: .init()),
mediaProvider: MediaProviderMock(configuration: .init()),
mediaProvider: MediaProviderMock(.init()),
mentionDisplayHelper: ComposerMentionDisplayHelper.mock,
appSettings: appSettings,
analyticsService: AnalyticsServiceMock.default,
analyticsService: AnalyticsServiceMock(.init()),
composerDraftService: ComposerDraftServiceMock(.init()))
}
ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
+2 -2
View File
@@ -463,8 +463,8 @@ extension RoomScreenViewModel {
ongoingCallRoomIDPublisher: .init(.init(nil)),
appSettings: .volatile(),
appHooks: appHooks,
analyticsService: AnalyticsServiceMock.default,
userIndicatorController: UserIndicatorControllerMock.default)
analyticsService: AnalyticsServiceMock(.init()),
userIndicatorController: UserIndicatorControllerMock())
}
}
ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift
+3 -3
View File
@@ -367,10 +367,10 @@ struct RoomScreen_Previews: PreviewProvider, TestablePreview {
timelineController: MockTimelineController(),
userSession: UserSessionMock(.init()),
mediaPlayerProvider: MediaPlayerProviderMock(),
userIndicatorController: UserIndicatorControllerMock.default,
appMediator: AppMediatorMock.default,
userIndicatorController: UserIndicatorControllerMock(),
appMediator: AppMediatorMock(.init()),
appSettings: appSettings,
analyticsService: AnalyticsServiceMock.default,
analyticsService: AnalyticsServiceMock(.init()),
emojiProvider: EmojiProvider(appSettings: appSettings),
linkMetadataProvider: LinkMetadataProvider(),
timelineControllerFactory: TimelineControllerFactoryMock(.init()))
ElementX/Sources/Screens/RoomScreen/View/RoomScreenFooterView.swift
+3 -3
View File
@@ -165,11 +165,11 @@ struct RoomScreenFooterView_Previews: PreviewProvider, TestablePreview {
learnMoreURL: "https://element.io/")
static var previews: some View {
RoomScreenFooterView(details: bobDetails, mediaProvider: MediaProviderMock(configuration: .init())) { _ in }
RoomScreenFooterView(details: bobDetails, mediaProvider: MediaProviderMock(.init())) { _ in }
.previewDisplayName("With displayname")
RoomScreenFooterView(details: noNameDetails, mediaProvider: MediaProviderMock(configuration: .init())) { _ in }
RoomScreenFooterView(details: noNameDetails, mediaProvider: MediaProviderMock(.init())) { _ in }
.previewDisplayName("Without displayname")
RoomScreenFooterView(details: verificationViolationDetails, mediaProvider: MediaProviderMock(configuration: .init())) { _ in }
RoomScreenFooterView(details: verificationViolationDetails, mediaProvider: MediaProviderMock(.init())) { _ in }
.previewDisplayName("Verification Violation")
}
}
ElementX/Sources/Screens/RoomThreadListScreen/View/RoomThreadListScreen.swift
+1 -1
View File
@@ -161,6 +161,6 @@ struct RoomThreadListScreen_Previews: PreviewProvider, TestablePreview {
static func makeViewModel() -> RoomThreadListScreenViewModel {
RoomThreadListScreenViewModel(threadListServiceProxy: RoomThreadListServiceProxyMock(.init()),
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
}
}
ElementX/Sources/Screens/Settings/AdvancedSettingsScreen/View/AdvancedSettingsScreen.swift
+2 -2
View File
@@ -163,9 +163,9 @@ struct AdvancedSettingsScreen_Previews: PreviewProvider, TestablePreview {
static let viewModel = {
let appSettings = AppSettings.volatile()
return AdvancedSettingsScreenViewModel(advancedSettings: appSettings,
analytics: AnalyticsServiceMock.default,
analytics: AnalyticsServiceMock(.init()),
clientProxy: ClientProxyMock(.init()),
userIndicatorController: UserIndicatorControllerMock.default)
userIndicatorController: UserIndicatorControllerMock())
}()
static var previews: some View {
ElementX/Sources/Screens/Settings/AnalyticsSettingsScreen/View/AnalyticsSettingsScreen.swift
+1 -1
View File
@@ -41,7 +41,7 @@ struct AnalyticsSettingsScreen_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
let appSettings = AppSettings.volatile()
let viewModel = AnalyticsSettingsScreenViewModel(appSettings: appSettings,
analytics: AnalyticsServiceMock.default)
analytics: AnalyticsServiceMock(.init()))
AnalyticsSettingsScreen(context: viewModel.context)
}
}
ElementX/Sources/Screens/Settings/NotificationSettingsScreen/View/NotificationSettingsScreen.swift
+3 -3
View File
@@ -283,9 +283,9 @@ struct NotificationSettingsScreen_Previews: PreviewProvider, TestablePreview {
var viewModel = NotificationSettingsScreenViewModel(appSettings: appSettings,
userNotificationCenter: notificationCenter,
notificationToneManager: NotificationToneManagerMock.default,
notificationToneManager: NotificationToneManagerMock(.init()),
notificationSettingsProxy: notificationSettingsProxy,
userIndicatorController: UserIndicatorControllerMock.default,
userIndicatorController: UserIndicatorControllerMock(),
isModallyPresented: true)
viewModel.fetchInitialContent()
return viewModel
@@ -313,7 +313,7 @@ struct NotificationSettingsScreen_Previews: PreviewProvider, TestablePreview {
var viewModel = NotificationSettingsScreenViewModel(appSettings: appSettings,
userNotificationCenter: notificationCenter,
notificationToneManager: NotificationToneManagerMock.default,
notificationToneManager: NotificationToneManagerMock(.init()),
notificationSettingsProxy: notificationSettingsProxy,
userIndicatorController: UserIndicatorControllerMock(),
isModallyPresented: true)
ElementX/Sources/Screens/Settings/UserDetailsEditScreen/View/UserDetailsEditScreen.swift
+1 -1
View File
@@ -142,6 +142,6 @@ struct UserDetailsEditScreen_Previews: PreviewProvider, TestablePreview {
canChangeAvatar: canChangeProfile,
canChangeDisplayName: canChangeProfile)))),
mediaUploadingPreprocessor: .init(appSettings: .volatile()),
userIndicatorController: UserIndicatorControllerMock.default)
userIndicatorController: UserIndicatorControllerMock())
}
}
ElementX/Sources/Screens/Spaces/Common/SpaceHeaderView.swift
+1 -1
View File
@@ -101,7 +101,7 @@ struct SpaceHeaderView: View {
// MARK: - Previews
struct SpaceHeaderView_Previews: PreviewProvider, TestablePreview {
static let mediaProvider = MediaProviderMock(configuration: .init())
static let mediaProvider = MediaProviderMock(.init())
static let spaces = makeSpaceRooms()
ElementX/Sources/Screens/Spaces/Common/SpaceRoomCell.swift
+1 -1
View File
@@ -167,7 +167,7 @@ struct SpaceRoomCellButtonStyle: ButtonStyle {
}
struct SpaceRoomCell_Previews: PreviewProvider, TestablePreview {
static let mediaProvider = MediaProviderMock(configuration: .init())
static let mediaProvider = MediaProviderMock(.init())
static let spaces = [SpaceServiceRoom].mockSpaceList
ElementX/Sources/Screens/Spaces/LeaveSpace/View/LeaveSpaceRoomDetailsCell.swift
+6 -6
View File
@@ -96,14 +96,14 @@ struct LeaveSpaceRoomDetailsCell_Previews: PreviewProvider, TestablePreview {
isLastOwner: false,
areCreatorsPrivileged: false,
isSelected: true),
mediaProvider: MediaProviderMock(configuration: .init())) { }
mediaProvider: MediaProviderMock(.init())) { }
LeaveSpaceRoomDetailsCell(room: .init(spaceServiceRoom: SpaceServiceRoom.mock(id: "2",
name: "My Space",
isSpace: true),
isLastOwner: true,
areCreatorsPrivileged: false,
isSelected: false),
mediaProvider: MediaProviderMock(configuration: .init())) { }
mediaProvider: MediaProviderMock(.init())) { }
LeaveSpaceRoomDetailsCell(room: .init(spaceServiceRoom: SpaceServiceRoom.mock(id: "2",
name: "My Space",
isSpace: true),
@@ -111,21 +111,21 @@ struct LeaveSpaceRoomDetailsCell_Previews: PreviewProvider, TestablePreview {
areCreatorsPrivileged: false,
isSelected: false),
hideSelection: true,
mediaProvider: MediaProviderMock(configuration: .init())) { }
mediaProvider: MediaProviderMock(.init())) { }
LeaveSpaceRoomDetailsCell(room: .init(spaceServiceRoom: SpaceServiceRoom.mock(id: "3",
name: "Room",
isSpace: false),
isLastOwner: false,
areCreatorsPrivileged: false,
isSelected: true),
mediaProvider: MediaProviderMock(configuration: .init())) { }
mediaProvider: MediaProviderMock(.init())) { }
LeaveSpaceRoomDetailsCell(room: .init(spaceServiceRoom: SpaceServiceRoom.mock(id: "4",
name: "My Room",
isSpace: false),
isLastOwner: true,
areCreatorsPrivileged: false,
isSelected: false),
mediaProvider: MediaProviderMock(configuration: .init())) { }
mediaProvider: MediaProviderMock(.init())) { }
LeaveSpaceRoomDetailsCell(room: .init(spaceServiceRoom: SpaceServiceRoom.mock(id: "4",
name: "My Room",
isSpace: false),
@@ -133,7 +133,7 @@ struct LeaveSpaceRoomDetailsCell_Previews: PreviewProvider, TestablePreview {
areCreatorsPrivileged: false,
isSelected: false),
hideSelection: true,
mediaProvider: MediaProviderMock(configuration: .init())) { }
mediaProvider: MediaProviderMock(.init())) { }
}
}
}
ElementX/Sources/Screens/Spaces/LeaveSpace/View/LeaveSpaceView.swift
+1 -1
View File
@@ -177,6 +177,6 @@ struct LeaveSpaceView_Previews: PreviewProvider, TestablePreview {
canEditRolesAndPermissions: true,
leaveHandle: leaveHandle,
userIndicatorController: UserIndicatorControllerMock(),
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
}
}
ElementX/Sources/Screens/Spaces/SpaceAddRoomsScreen/View/SpaceAddRoomsScreenSelectedItem.swift
+1 -1
View File
@@ -46,7 +46,7 @@ struct SpaceAddRoomsScreenSelectedItem_Previews: PreviewProvider, TestablePrevie
avatar: .room(id: "",
name: "Selected Room",
avatarURL: .mockMXCAvatar)),
mediaProvider: MediaProviderMock(configuration: .init())) { }
mediaProvider: MediaProviderMock(.init())) { }
.frame(width: 80)
}
}
ElementX/Sources/Screens/Spaces/SpaceSettingsScreen/View/SpaceSettingsScreen.swift
+2 -2
View File
@@ -132,8 +132,8 @@ struct SpaceSettingsScreen_Previews: PreviewProvider, TestablePreview {
canonicalAlias: "#space:matrix.org",
members: members)),
userSession: UserSessionMock(.init()),
analyticsService: AnalyticsServiceMock.default,
userIndicatorController: UserIndicatorControllerMock.default,
analyticsService: AnalyticsServiceMock(.init()),
userIndicatorController: UserIndicatorControllerMock(),
notificationSettingsProxy: NotificationSettingsProxyMock(with: NotificationSettingsProxyMockConfiguration()),
attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
appSettings: .volatile())
ElementX/Sources/Screens/StartChatScreen/View/JoinRoomByAddressView.swift
+1 -1
View File
@@ -84,7 +84,7 @@ struct JoinRoomByAddressView_Previews: PreviewProvider, TestablePreview {
userDiscoveryService.searchProfilesWithReturnValue = .success([.mockAlice])
return StartChatScreenViewModel(userSession: userSession,
analytics: AnalyticsServiceMock.default,
analytics: AnalyticsServiceMock(.init()),
userIndicatorController: UserIndicatorControllerMock(),
userDiscoveryService: userDiscoveryService,
appSettings: .volatile())
ElementX/Sources/Screens/StartChatScreen/View/StartChatScreen.swift
+1 -1
View File
@@ -159,7 +159,7 @@ struct StartChatScreen_Previews: PreviewProvider, TestablePreview {
let userDiscoveryService = UserDiscoveryServiceMock()
userDiscoveryService.searchProfilesWithReturnValue = .success([.mockAlice])
return StartChatScreenViewModel(userSession: userSession,
analytics: AnalyticsServiceMock.default,
analytics: AnalyticsServiceMock(.init()),
userIndicatorController: UserIndicatorControllerMock(),
userDiscoveryService: userDiscoveryService,
appSettings: appSettings)
ElementX/Sources/Screens/Timeline/TimelineViewModel.swift
+3 -3
View File
@@ -1128,10 +1128,10 @@ extension TimelineViewModel {
timelineController: timelineController ?? MockTimelineController(timelineKind: timelineKind),
userSession: UserSessionMock(.init(clientProxy: clientProxyMock)),
mediaPlayerProvider: MediaPlayerProviderMock(),
userIndicatorController: UserIndicatorControllerMock.default,
appMediator: AppMediatorMock.default,
userIndicatorController: UserIndicatorControllerMock(),
appMediator: AppMediatorMock(.init()),
appSettings: appSettings,
analyticsService: AnalyticsServiceMock.default,
analyticsService: AnalyticsServiceMock(.init()),
emojiProvider: EmojiProvider(appSettings: appSettings),
linkMetadataProvider: LinkMetadataProvider(),
timelineControllerFactory: TimelineControllerFactoryMock(.init()))
ElementX/Sources/Screens/Timeline/View/ReadReceipts/ReadReceiptCell.swift
+3 -3
View File
@@ -64,18 +64,18 @@ struct ReadReceiptCell_Previews: PreviewProvider, TestablePreview {
formattedTimestamp: "10:00"),
memberState: .init(displayName: "Test",
avatarURL: nil),
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
.previewDisplayName("No Image")
ReadReceiptCell(readReceipt: .init(userID: "@test:matrix.org",
formattedTimestamp: "10:00"),
memberState: .init(displayName: "Test",
avatarURL: .mockMXCUserAvatar),
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
.previewDisplayName("With Image")
ReadReceiptCell(readReceipt: .init(userID: "@test:matrix.org",
formattedTimestamp: "10:00"),
memberState: nil,
mediaProvider: MediaProviderMock(configuration: .init()))
mediaProvider: MediaProviderMock(.init()))
.previewDisplayName("Loading Member")
}
}
ElementX/Sources/Screens/Timeline/View/ReadReceipts/ReadReceiptsSummaryView.swift
+2 -2
View File
@@ -52,9 +52,9 @@ struct ReadReceiptsSummaryView_Previews: PreviewProvider, TestablePreview {
userSession: UserSessionMock(.init()),
mediaPlayerProvider: MediaPlayerProviderMock(),
userIndicatorController: UserIndicatorControllerMock(),
appMediator: AppMediatorMock.default,
appMediator: AppMediatorMock(.init()),
appSettings: appSettings,
analyticsService: AnalyticsServiceMock.default,
analyticsService: AnalyticsServiceMock(.init()),
emojiProvider: EmojiProvider(appSettings: appSettings),
linkMetadataProvider: LinkMetadataProvider(),
timelineControllerFactory: TimelineControllerFactoryMock(.init()))
ElementX/Sources/Screens/Timeline/View/Style/TimelineItemBubbledStylerView.swift
+6 -6
View File
@@ -343,10 +343,10 @@ struct TimelineItemBubbledStylerView_Previews: PreviewProvider, TestablePreview
timelineController: MockTimelineController(),
userSession: UserSessionMock(.init()),
mediaPlayerProvider: MediaPlayerProviderMock(),
userIndicatorController: UserIndicatorControllerMock.default,
appMediator: AppMediatorMock.default,
userIndicatorController: UserIndicatorControllerMock(),
appMediator: AppMediatorMock(.init()),
appSettings: appSettings,
analyticsService: AnalyticsServiceMock.default,
analyticsService: AnalyticsServiceMock(.init()),
emojiProvider: EmojiProvider(appSettings: appSettings),
linkMetadataProvider: LinkMetadataProvider(),
timelineControllerFactory: TimelineControllerFactoryMock(.init()))
@@ -362,10 +362,10 @@ struct TimelineItemBubbledStylerView_Previews: PreviewProvider, TestablePreview
timelineController: MockTimelineController(),
userSession: UserSessionMock(.init()),
mediaPlayerProvider: MediaPlayerProviderMock(),
userIndicatorController: UserIndicatorControllerMock.default,
appMediator: AppMediatorMock.default,
userIndicatorController: UserIndicatorControllerMock(),
appMediator: AppMediatorMock(.init()),
appSettings: appSettings,
analyticsService: AnalyticsServiceMock.default,
analyticsService: AnalyticsServiceMock(.init()),
emojiProvider: EmojiProvider(appSettings: appSettings),
linkMetadataProvider: LinkMetadataProvider(),
timelineControllerFactory: TimelineControllerFactoryMock(.init()))
ElementX/Sources/Screens/Timeline/View/Supplementary/ReactionsSummaryView.swift
+1 -1
View File
@@ -140,7 +140,7 @@ struct ReactionsSummaryView_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
ReactionsSummaryView(reactions: AggregatedReaction.mockReactions,
members: [:],
mediaProvider: MediaProviderMock(configuration: .init()),
mediaProvider: MediaProviderMock(.init()),
selectedReactionKey: AggregatedReaction.mockReactions[0].key)
}
}
ElementX/Sources/Screens/Timeline/View/Supplementary/TimelineReadReceiptsView.swift
+3 -3
View File
@@ -86,10 +86,10 @@ struct TimelineReadReceiptsView_Previews: PreviewProvider, TestablePreview {
timelineController: MockTimelineController(),
userSession: UserSessionMock(.init()),
mediaPlayerProvider: MediaPlayerProviderMock(),
userIndicatorController: UserIndicatorControllerMock.default,
appMediator: AppMediatorMock.default,
userIndicatorController: UserIndicatorControllerMock(),
appMediator: AppMediatorMock(.init()),
appSettings: appSettings,
analyticsService: AnalyticsServiceMock.default,
analyticsService: AnalyticsServiceMock(.init()),
emojiProvider: EmojiProvider(appSettings: appSettings),
linkMetadataProvider: LinkMetadataProvider(),
timelineControllerFactory: TimelineControllerFactoryMock(.init()))
ElementX/Sources/Screens/Timeline/View/TimelineItemViews/HighlightedTimelineItemModifier.swift
+3 -3
View File
@@ -97,10 +97,10 @@ struct HighlightedTimelineItemTimeline_Previews: PreviewProvider {
timelineController: MockTimelineController(),
userSession: UserSessionMock(.init()),
mediaPlayerProvider: MediaPlayerProviderMock(),
userIndicatorController: UserIndicatorControllerMock.default,
appMediator: AppMediatorMock.default,
userIndicatorController: UserIndicatorControllerMock(),
appMediator: AppMediatorMock(.init()),
appSettings: appSettings,
analyticsService: AnalyticsServiceMock.default,
analyticsService: AnalyticsServiceMock(.init()),
emojiProvider: EmojiProvider(appSettings: appSettings),
linkMetadataProvider: LinkMetadataProvider(),
timelineControllerFactory: TimelineControllerFactoryMock(.init()))
ElementX/Sources/Screens/Timeline/View/TimelineView.swift
+3 -3
View File
@@ -159,10 +159,10 @@ struct TimelineView_Previews: PreviewProvider { // Not testable as this preview
timelineController: MockTimelineController(),
userSession: UserSessionMock(.init()),
mediaPlayerProvider: MediaPlayerProviderMock(),
userIndicatorController: UserIndicatorControllerMock.default,
appMediator: AppMediatorMock.default,
userIndicatorController: UserIndicatorControllerMock(),
appMediator: AppMediatorMock(.init()),
appSettings: appSettings,
analyticsService: AnalyticsServiceMock.default,
analyticsService: AnalyticsServiceMock(.init()),
emojiProvider: EmojiProvider(appSettings: appSettings),
linkMetadataProvider: LinkMetadataProvider(),
timelineControllerFactory: TimelineControllerFactoryMock(.init()))
ElementX/Sources/Screens/UserProfileScreen/View/UserProfileScreen.swift
+4 -4
View File
@@ -131,9 +131,9 @@ struct UserProfileScreen_Previews: PreviewProvider, TestablePreview {
clientProxyMock.userIdentityForFallBackToServerClosure = { userID, _ in
let identity = switch userID {
case RoomMemberProxyMock.mockDan.userID:
UserIdentityProxyMock(configuration: .init(verificationState: .verified))
UserIdentityProxyMock(.init(verificationState: .verified))
default:
UserIdentityProxyMock(configuration: .init())
UserIdentityProxyMock(.init())
}
return .success(identity)
@@ -146,8 +146,8 @@ struct UserProfileScreen_Previews: PreviewProvider, TestablePreview {
return UserProfileScreenViewModel(userID: userID,
isPresentedModally: false,
userSession: UserSessionMock(.init(clientProxy: clientProxyMock)),
userIndicatorController: UserIndicatorControllerMock.default,
analytics: AnalyticsServiceMock.default,
userIndicatorController: UserIndicatorControllerMock(),
analytics: AnalyticsServiceMock(.init()),
appSettings: .volatile())
}
}