From e5bd194d060e67584a2874bf1b491d2cc85ded68 Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Mon, 4 Dec 2023 19:58:01 +0200 Subject: [PATCH] Specify default timelineProxy actions and fix unit tests --- .../Sources/RoomScreenViewModelTests.swift | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/UnitTests/Sources/RoomScreenViewModelTests.swift b/UnitTests/Sources/RoomScreenViewModelTests.swift index 6534359b4..35ced21fa 100644 --- a/UnitTests/Sources/RoomScreenViewModelTests.swift +++ b/UnitTests/Sources/RoomScreenViewModelTests.swift @@ -332,8 +332,11 @@ class RoomScreenViewModelTests: XCTestCase { func testRetrySend() async throws { let timelineController = MockRoomTimelineController() let roomProxyMock = RoomProxyMock(with: .init(displayName: "")) + let timelineProxy = TimelineProxyMock() - roomProxyMock.timeline = timelineProxy + timelineProxy.underlyingActions = Empty(completeImmediately: false).eraseToAnyPublisher() + + roomProxyMock.underlyingTimeline = timelineProxy timelineController.roomProxy = roomProxyMock let viewModel = RoomScreenViewModel(roomProxy: roomProxyMock, @@ -358,8 +361,11 @@ class RoomScreenViewModelTests: XCTestCase { func testRetrySendNoTransactionID() async { let timelineController = MockRoomTimelineController() let roomProxyMock = RoomProxyMock(with: .init(displayName: "")) + let timelineProxy = TimelineProxyMock() - roomProxyMock.timeline = timelineProxy + timelineProxy.underlyingActions = Empty(completeImmediately: false).eraseToAnyPublisher() + + roomProxyMock.underlyingTimeline = timelineProxy let viewModel = RoomScreenViewModel(roomProxy: roomProxyMock, timelineController: timelineController, @@ -382,8 +388,11 @@ class RoomScreenViewModelTests: XCTestCase { func testCancelSend() async { let timelineController = MockRoomTimelineController() let roomProxyMock = RoomProxyMock(with: .init(displayName: "")) + let timelineProxy = TimelineProxyMock() - roomProxyMock.timeline = timelineProxy + timelineProxy.underlyingActions = Empty(completeImmediately: false).eraseToAnyPublisher() + + roomProxyMock.underlyingTimeline = timelineProxy timelineController.roomProxy = roomProxyMock let viewModel = RoomScreenViewModel(roomProxy: roomProxyMock, @@ -408,8 +417,11 @@ class RoomScreenViewModelTests: XCTestCase { func testCancelSendNoTransactionID() async { let timelineController = MockRoomTimelineController() let roomProxyMock = RoomProxyMock(with: .init(displayName: "")) + let timelineProxy = TimelineProxyMock() - roomProxyMock.timeline = timelineProxy + timelineProxy.underlyingActions = Empty(completeImmediately: false).eraseToAnyPublisher() + + roomProxyMock.underlyingTimeline = timelineProxy let viewModel = RoomScreenViewModel(roomProxy: roomProxyMock, timelineController: timelineController, @@ -545,11 +557,15 @@ class RoomScreenViewModelTests: XCTestCase { NotificationCenterMock) { let notificationCenter = NotificationCenterMock() let roomProxy = RoomProxyMock(with: .init(displayName: "")) + let timelineProxy = TimelineProxyMock() + timelineProxy.underlyingActions = Empty(completeImmediately: false).eraseToAnyPublisher() + roomProxy.timeline = timelineProxy let timelineController = MockRoomTimelineController() timelineProxy.sendReadReceiptForReturnValue = .success(()) + roomProxy.underlyingHasUnreadNotifications = true timelineController.timelineItems = items timelineController.roomProxy = roomProxy