Make the AnalyticsServiceMock default a variable as well, for consistency.

This commit is contained in:
Stefan Ceriu
2026-05-20 20:13:15 +03:00
parent 13128d9869
commit ab82068740
63 changed files with 129 additions and 129 deletions
@@ -6,7 +6,7 @@
//
extension AnalyticsServiceMock {
static func `default`() -> AnalyticsServiceMock {
static var `default`: AnalyticsServiceMock {
let mock = AnalyticsServiceMock()
mock.isEnabled = false
mock.shouldShowAnalyticsPrompt = false
@@ -162,7 +162,7 @@ struct LoginScreen_Previews: PreviewProvider, TestablePreview {
loginHint: nil,
userIndicatorController: UserIndicatorControllerMock(),
appSettings: AppSettings(),
analytics: AnalyticsServiceMock.default())
analytics: AnalyticsServiceMock.default)
if withCredentials {
viewModel.context.username = "alice"
@@ -375,7 +375,7 @@ struct CallScreen_Previews: PreviewProvider {
allowPictureInPicture: false,
appHooks: AppHooks(),
appSettings: AppSettings(),
analyticsService: AnalyticsServiceMock.default())
analyticsService: AnalyticsServiceMock.default)
}()
static var previews: some View {
@@ -227,7 +227,7 @@ struct PollFormScreen_Previews: PreviewProvider, TestablePreview {
static func makeViewModel(mode: PollFormMode) -> PollFormScreenViewModel {
PollFormScreenViewModel(mode: mode,
timelineController: MockTimelineController(),
analytics: AnalyticsServiceMock.default(),
analytics: AnalyticsServiceMock.default,
userIndicatorController: UserIndicatorControllerMock.default)
}
}
@@ -461,7 +461,7 @@ struct CreateRoom_Previews: PreviewProvider, TestablePreview {
spaceSelectionMode: selectionMode,
shouldShowCancelButton: isSpace,
userSession: userSession,
analytics: AnalyticsServiceMock.default(),
analytics: AnalyticsServiceMock.default,
userIndicatorController: UserIndicatorControllerMock.default,
appSettings: appSettings)
}
@@ -72,7 +72,7 @@ struct CreateRoomSpaceSelectionSheet_Previews: PreviewProvider, TestablePreview
spaceSelectionMode: .editableSpacesList(preSelectedSpace: nil),
shouldShowCancelButton: false,
userSession: userSession,
analytics: AnalyticsServiceMock.default(),
analytics: AnalyticsServiceMock.default,
userIndicatorController: UserIndicatorControllerMock.default,
appSettings: appSettings)
}()
@@ -225,7 +225,7 @@ struct HomeScreen_Previews: PreviewProvider, TestablePreview {
return HomeScreenViewModel(userSession: userSession,
selectedRoomPublisher: CurrentValueSubject<String?, Never>(nil).asCurrentValuePublisher(),
appSettings: AppSettings(),
analyticsService: AnalyticsServiceMock.default(),
analyticsService: AnalyticsServiceMock.default,
notificationManager: NotificationManagerMock(),
userIndicatorController: UserIndicatorControllerMock.default)
}
@@ -146,7 +146,7 @@ struct HomeScreenEmptyStateView_Previews: PreviewProvider, TestablePreview {
return HomeScreenViewModel(userSession: userSession,
selectedRoomPublisher: CurrentValueSubject<String?, Never>(nil).asCurrentValuePublisher(),
appSettings: AppSettings(),
analyticsService: AnalyticsServiceMock.default(),
analyticsService: AnalyticsServiceMock.default,
notificationManager: NotificationManagerMock(),
userIndicatorController: UserIndicatorControllerMock.default)
}()
@@ -203,7 +203,7 @@ struct HomeScreenInviteCell_Previews: PreviewProvider, TestablePreview {
return HomeScreenViewModel(userSession: userSession,
selectedRoomPublisher: CurrentValueSubject<String?, Never>(nil).asCurrentValuePublisher(),
appSettings: AppSettings(),
analyticsService: AnalyticsServiceMock.default(),
analyticsService: AnalyticsServiceMock.default,
notificationManager: NotificationManagerMock(),
userIndicatorController: UserIndicatorControllerMock.default)
}
@@ -135,7 +135,7 @@ struct HomeScreenKnockedCell_Previews: PreviewProvider, TestablePreview {
return HomeScreenViewModel(userSession: userSession,
selectedRoomPublisher: CurrentValueSubject<String?, Never>(nil).asCurrentValuePublisher(),
appSettings: AppSettings(),
analyticsService: AnalyticsServiceMock.default(),
analyticsService: AnalyticsServiceMock.default,
notificationManager: NotificationManagerMock(),
userIndicatorController: UserIndicatorControllerMock.default)
}
@@ -124,7 +124,7 @@ struct HomeScreenRecoveryKeyConfirmationBanner_Previews: PreviewProvider, Testab
return HomeScreenViewModel(userSession: userSession,
selectedRoomPublisher: CurrentValueSubject<String?, Never>(nil).asCurrentValuePublisher(),
appSettings: AppSettings(),
analyticsService: AnalyticsServiceMock.default(),
analyticsService: AnalyticsServiceMock.default,
notificationManager: NotificationManagerMock(),
userIndicatorController: UserIndicatorControllerMock.default)
}
@@ -256,7 +256,7 @@ struct HomeScreenRoomCell_Previews: PreviewProvider, TestablePreview {
return HomeScreenViewModel(userSession: userSession,
selectedRoomPublisher: CurrentValueSubject<String?, Never>(nil).asCurrentValuePublisher(),
appSettings: AppSettings(),
analyticsService: AnalyticsServiceMock.default(),
analyticsService: AnalyticsServiceMock.default,
notificationManager: NotificationManagerMock(),
userIndicatorController: UserIndicatorControllerMock.default)
}
@@ -394,7 +394,7 @@ extension LocationSharingScreenViewModel {
roomProxy: roomProxy,
timelineController: MockTimelineController(),
liveLocationManager: LiveLocationManagerMock(),
analytics: AnalyticsServiceMock.default(),
analytics: AnalyticsServiceMock.default,
userIndicatorController: UserIndicatorControllerMock(),
mediaProvider: MediaProviderMock(configuration: .init()))
}
@@ -120,7 +120,7 @@ private extension ManageRoomMemberSheetViewModel {
ownPowerLevel: powerLevel),
roomProxy: JoinedRoomProxyMock(.init()),
userIndicatorController: UserIndicatorControllerMock(),
analyticsService: AnalyticsServiceMock.default(),
analyticsService: AnalyticsServiceMock.default,
mediaProvider: MediaProviderMock(configuration: .init()))
}
}
@@ -318,7 +318,7 @@ struct MediaEventsTimelineScreen_Previews: PreviewProvider, TestablePreview {
userIndicatorController: UserIndicatorControllerMock(),
appMediator: AppMediatorMock.default,
appSettings: appSettings,
analyticsService: AnalyticsServiceMock.default(),
analyticsService: AnalyticsServiceMock.default,
emojiProvider: EmojiProvider(appSettings: appSettings),
linkMetadataProvider: LinkMetadataProvider(),
timelineControllerFactory: TimelineControllerFactoryMock(.init()))
@@ -69,7 +69,7 @@ struct PinnedEventsTimelineScreen_Previews: PreviewProvider, TestablePreview {
static let viewModel = PinnedEventsTimelineScreenViewModel(roomProxy: JoinedRoomProxyMock(.init()),
userIndicatorController: UserIndicatorControllerMock(),
appSettings: AppSettings(),
analyticsService: AnalyticsServiceMock.default())
analyticsService: AnalyticsServiceMock.default)
static let emptyTimelineViewModel: TimelineViewModel = {
let timelineController = MockTimelineController(timelineKind: .pinned)
@@ -83,7 +83,7 @@ struct PinnedEventsTimelineScreen_Previews: PreviewProvider, TestablePreview {
userIndicatorController: UserIndicatorControllerMock(),
appMediator: AppMediatorMock.default,
appSettings: appSettings,
analyticsService: AnalyticsServiceMock.default(),
analyticsService: AnalyticsServiceMock.default,
emojiProvider: EmojiProvider(appSettings: appSettings),
linkMetadataProvider: LinkMetadataProvider(),
timelineControllerFactory: TimelineControllerFactoryMock(.init()))
@@ -91,6 +91,6 @@ struct RoomChangePermissionsScreen_Previews: PreviewProvider, TestablePreview {
ownPowerLevel: ownPowerLevel,
roomProxy: JoinedRoomProxyMock(.init(isSpace: isSpace)),
userIndicatorController: UserIndicatorControllerMock(),
analytics: AnalyticsServiceMock.default())
analytics: AnalyticsServiceMock.default)
}
}
@@ -151,6 +151,6 @@ struct RoomChangeRolesScreen_Previews: PreviewProvider, TestablePreview {
roomProxy: JoinedRoomProxyMock(.init(members: members)),
mediaProvider: MediaProviderMock(configuration: .init()),
userIndicatorController: UserIndicatorControllerMock(),
analytics: AnalyticsServiceMock.default())
analytics: AnalyticsServiceMock.default)
}
}
@@ -420,7 +420,7 @@ struct RoomDetailsScreen_Previews: PreviewProvider, TestablePreview {
return .init(roomProxy: roomProxy,
userSession: UserSessionMock(.init()),
analyticsService: AnalyticsServiceMock.default(),
analyticsService: AnalyticsServiceMock.default,
userIndicatorController: UserIndicatorControllerMock.default,
notificationSettingsProxy: notificationSettingsProxy,
attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
@@ -448,7 +448,7 @@ struct RoomDetailsScreen_Previews: PreviewProvider, TestablePreview {
return .init(roomProxy: roomProxy,
userSession: UserSessionMock(.init()),
analyticsService: AnalyticsServiceMock.default(),
analyticsService: AnalyticsServiceMock.default,
userIndicatorController: UserIndicatorControllerMock.default,
notificationSettingsProxy: notificationSettingsProxy,
attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
@@ -486,7 +486,7 @@ struct RoomDetailsScreen_Previews: PreviewProvider, TestablePreview {
return .init(roomProxy: roomProxy,
userSession: UserSessionMock(.init(clientProxy: clientProxyMock)),
analyticsService: AnalyticsServiceMock.default(),
analyticsService: AnalyticsServiceMock.default,
userIndicatorController: UserIndicatorControllerMock.default,
notificationSettingsProxy: notificationSettingsProxy,
attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
@@ -240,7 +240,7 @@ struct RoomMemberDetailsScreen_Previews: PreviewProvider, TestablePreview {
roomProxy: roomProxyMock,
userSession: UserSessionMock(.init(clientProxy: clientProxyMock)),
userIndicatorController: UserIndicatorControllerMock.default,
analytics: AnalyticsServiceMock.default(),
analytics: AnalyticsServiceMock.default,
appSettings: AppSettings())
}
}
@@ -262,6 +262,6 @@ struct RoomMembersListScreen_Previews: PreviewProvider, TestablePreview {
ownUserID: ownUserID,
powerLevelsConfiguration: .init(canUserInvite: false))),
userIndicatorController: UserIndicatorControllerMock.default,
analytics: AnalyticsServiceMock.default())
analytics: AnalyticsServiceMock.default)
}
}
@@ -132,7 +132,7 @@ 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())
analytics: AnalyticsServiceMock.default)
static var previews: some View {
VStack(spacing: 0) {
Section("Invited/Joined") {
@@ -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.default)
static let creatorViewModel = RoomRolesAndPermissionsScreenViewModel(initialPermissions: RoomPermissions(powerLevels: .mock),
roomProxy: JoinedRoomProxyMock(.init(members: .allMembersAsCreator)),
userIndicatorController: UserIndicatorControllerMock(),
analytics: AnalyticsServiceMock.default())
analytics: AnalyticsServiceMock.default)
static var previews: some View {
ElementNavigationStack {
RoomRolesAndPermissionsScreen(context: viewModel.context)
@@ -827,7 +827,7 @@ extension ComposerToolbarViewModel {
mediaProvider: MediaProviderMock(configuration: .init()),
mentionDisplayHelper: ComposerMentionDisplayHelper.mock,
appSettings: AppSettings(),
analyticsService: AnalyticsServiceMock.default(),
analyticsService: AnalyticsServiceMock.default,
composerDraftService: ComposerDraftServiceMock(.init()))
viewModel.state.bindings.composerFocused = focused
viewModel.state.bindings.plainComposerText = NSAttributedString(string: message)
@@ -89,7 +89,7 @@ struct RoomAttachmentPicker_Previews: PreviewProvider, TestablePreview {
mediaProvider: MediaProviderMock(configuration: .init()),
mentionDisplayHelper: ComposerMentionDisplayHelper.mock,
appSettings: appSettings,
analyticsService: AnalyticsServiceMock.default(),
analyticsService: AnalyticsServiceMock.default,
composerDraftService: ComposerDraftServiceMock(.init()))
}
@@ -463,7 +463,7 @@ extension RoomScreenViewModel {
ongoingCallRoomIDPublisher: .init(.init(nil)),
appSettings: AppSettings(),
appHooks: appHooks,
analyticsService: AnalyticsServiceMock.default(),
analyticsService: AnalyticsServiceMock.default,
userIndicatorController: UserIndicatorControllerMock.default)
}
}
@@ -265,7 +265,7 @@ struct RoomScreen_Previews: PreviewProvider, TestablePreview {
userIndicatorController: UserIndicatorControllerMock.default,
appMediator: AppMediatorMock.default,
appSettings: appSettings,
analyticsService: AnalyticsServiceMock.default(),
analyticsService: AnalyticsServiceMock.default,
emojiProvider: EmojiProvider(appSettings: appSettings),
linkMetadataProvider: LinkMetadataProvider(),
timelineControllerFactory: TimelineControllerFactoryMock(.init()))
@@ -164,7 +164,7 @@ struct AdvancedSettingsScreen_Previews: PreviewProvider, TestablePreview {
AppSettings.resetAllSettings()
let appSettings = AppSettings()
return AdvancedSettingsScreenViewModel(advancedSettings: appSettings,
analytics: AnalyticsServiceMock.default(),
analytics: AnalyticsServiceMock.default,
clientProxy: ClientProxyMock(.init()),
userIndicatorController: UserIndicatorControllerMock.default)
}()
@@ -41,7 +41,7 @@ struct AnalyticsSettingsScreen_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
let appSettings = AppSettings()
let viewModel = AnalyticsSettingsScreenViewModel(appSettings: appSettings,
analytics: AnalyticsServiceMock.default())
analytics: AnalyticsServiceMock.default)
AnalyticsSettingsScreen(context: viewModel.context)
}
}
@@ -313,7 +313,7 @@ struct NotificationSettingsScreen_Previews: PreviewProvider, TestablePreview {
var viewModel = NotificationSettingsScreenViewModel(appSettings: appSettings,
userNotificationCenter: notificationCenter,
notificationToneManager: NotificationToneManagerMock(),
notificationToneManager: NotificationToneManagerMock.default,
notificationSettingsProxy: notificationSettingsProxy,
userIndicatorController: UserIndicatorControllerMock(),
isModallyPresented: true)
@@ -132,7 +132,7 @@ struct SpaceSettingsScreen_Previews: PreviewProvider, TestablePreview {
canonicalAlias: "#space:matrix.org",
members: members)),
userSession: UserSessionMock(.init()),
analyticsService: AnalyticsServiceMock.default(),
analyticsService: AnalyticsServiceMock.default,
userIndicatorController: UserIndicatorControllerMock.default,
notificationSettingsProxy: NotificationSettingsProxyMock(with: NotificationSettingsProxyMockConfiguration()),
attributedStringBuilder: AttributedStringBuilder(mentionBuilder: MentionBuilder()),
@@ -84,7 +84,7 @@ struct JoinRoomByAddressView_Previews: PreviewProvider, TestablePreview {
userDiscoveryService.searchProfilesWithReturnValue = .success([.mockAlice])
return StartChatScreenViewModel(userSession: userSession,
analytics: AnalyticsServiceMock.default(),
analytics: AnalyticsServiceMock.default,
userIndicatorController: UserIndicatorControllerMock(),
userDiscoveryService: userDiscoveryService,
appSettings: AppSettings())
@@ -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.default,
userIndicatorController: UserIndicatorControllerMock(),
userDiscoveryService: userDiscoveryService,
appSettings: appSettings)
@@ -1067,7 +1067,7 @@ extension TimelineViewModel {
userIndicatorController: UserIndicatorControllerMock.default,
appMediator: AppMediatorMock.default,
appSettings: appSettings,
analyticsService: AnalyticsServiceMock.default(),
analyticsService: AnalyticsServiceMock.default,
emojiProvider: EmojiProvider(appSettings: appSettings),
linkMetadataProvider: LinkMetadataProvider(),
timelineControllerFactory: TimelineControllerFactoryMock(.init()))
@@ -54,7 +54,7 @@ struct ReadReceiptsSummaryView_Previews: PreviewProvider, TestablePreview {
userIndicatorController: UserIndicatorControllerMock(),
appMediator: AppMediatorMock.default,
appSettings: appSettings,
analyticsService: AnalyticsServiceMock.default(),
analyticsService: AnalyticsServiceMock.default,
emojiProvider: EmojiProvider(appSettings: appSettings),
linkMetadataProvider: LinkMetadataProvider(),
timelineControllerFactory: TimelineControllerFactoryMock(.init()))
@@ -346,7 +346,7 @@ struct TimelineItemBubbledStylerView_Previews: PreviewProvider, TestablePreview
userIndicatorController: UserIndicatorControllerMock.default,
appMediator: AppMediatorMock.default,
appSettings: appSettings,
analyticsService: AnalyticsServiceMock.default(),
analyticsService: AnalyticsServiceMock.default,
emojiProvider: EmojiProvider(appSettings: appSettings),
linkMetadataProvider: LinkMetadataProvider(),
timelineControllerFactory: TimelineControllerFactoryMock(.init()))
@@ -365,7 +365,7 @@ struct TimelineItemBubbledStylerView_Previews: PreviewProvider, TestablePreview
userIndicatorController: UserIndicatorControllerMock.default,
appMediator: AppMediatorMock.default,
appSettings: appSettings,
analyticsService: AnalyticsServiceMock.default(),
analyticsService: AnalyticsServiceMock.default,
emojiProvider: EmojiProvider(appSettings: appSettings),
linkMetadataProvider: LinkMetadataProvider(),
timelineControllerFactory: TimelineControllerFactoryMock(.init()))
@@ -88,7 +88,7 @@ struct TimelineReadReceiptsView_Previews: PreviewProvider, TestablePreview {
userIndicatorController: UserIndicatorControllerMock.default,
appMediator: AppMediatorMock.default,
appSettings: appSettings,
analyticsService: AnalyticsServiceMock.default(),
analyticsService: AnalyticsServiceMock.default,
emojiProvider: EmojiProvider(appSettings: appSettings),
linkMetadataProvider: LinkMetadataProvider(),
timelineControllerFactory: TimelineControllerFactoryMock(.init()))
@@ -99,7 +99,7 @@ struct HighlightedTimelineItemTimeline_Previews: PreviewProvider {
userIndicatorController: UserIndicatorControllerMock.default,
appMediator: AppMediatorMock.default,
appSettings: appSettings,
analyticsService: AnalyticsServiceMock.default(),
analyticsService: AnalyticsServiceMock.default,
emojiProvider: EmojiProvider(appSettings: appSettings),
linkMetadataProvider: LinkMetadataProvider(),
timelineControllerFactory: TimelineControllerFactoryMock(.init()))
@@ -155,7 +155,7 @@ struct TimelineView_Previews: PreviewProvider { // Not testable as this preview
userIndicatorController: UserIndicatorControllerMock.default,
appMediator: AppMediatorMock.default,
appSettings: appSettings,
analyticsService: AnalyticsServiceMock.default(),
analyticsService: AnalyticsServiceMock.default,
emojiProvider: EmojiProvider(appSettings: appSettings),
linkMetadataProvider: LinkMetadataProvider(),
timelineControllerFactory: TimelineControllerFactoryMock(.init()))
@@ -147,7 +147,7 @@ struct UserProfileScreen_Previews: PreviewProvider, TestablePreview {
isPresentedModally: false,
userSession: UserSessionMock(.init(clientProxy: clientProxyMock)),
userIndicatorController: UserIndicatorControllerMock.default,
analytics: AnalyticsServiceMock.default(),
analytics: AnalyticsServiceMock.default,
appSettings: AppSettings())
}
}
@@ -42,7 +42,7 @@ class UITestsAppCoordinator: AppCoordinatorProtocol, SecureWindowManagerDelegate
let analyticsClient = AnalyticsClientMock()
analyticsClient.isRunning = false
analytics = AnalyticsServiceMock.default()
analytics = AnalyticsServiceMock.default
userIndicatorController = UserIndicatorController()
windowManager.delegate = self