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

Accept space invites from a home screen cell. (#4554)

Browse Source 
* Push the SpaceScreen after accepting an invite from the room list.

* Add a test for accepting a space invite.
This commit is contained in:
Doug
2025-09-30 10:43:48 +01:00
committed by GitHub
parent 8b7b1b5a37
commit 89c9e3112f
10 changed files with 339 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UnitTests/Sources/HomeScreenViewModelTests.swift
+87 -10
View File
@@ -265,7 +265,7 @@ class HomeScreenViewModelTests: XCTestCase {
}
func testInviteUnreadBadge() async throws {
setupViewModel(withInvites: true)
setupViewModel(invites: .rooms)
var invites = context.viewState.rooms.invites
XCTAssertEqual(invites.count, 2)
@@ -288,7 +288,7 @@ class HomeScreenViewModelTests: XCTestCase {
}
func testAcceptInvite() async throws {
setupViewModel(withInvites: true)
setupViewModel(invites: .rooms)
let invitedRoomIDs = context.viewState.rooms.invites.compactMap(\.roomID)
appSettings.seenInvites = Set(invitedRoomIDs)
@@ -302,8 +302,25 @@ class HomeScreenViewModelTests: XCTestCase {
XCTAssertFalse(notificationManager.removeDeliveredMessageNotificationsForCalled, "The notification will be dismissed when opening the room.")
}
func testAcceptSpaceInvite() async throws {
setupViewModel(invites: .spaces)
let invitedRoomIDs = context.viewState.rooms.invites.compactMap(\.roomID)
appSettings.seenInvites = Set(invitedRoomIDs)
XCTAssertEqual(invitedRoomIDs.count, 2)
let deferred = deferFulfillment(viewModel.actions) {
$0 == .presentSpace(SpaceRoomListProxyMock(.init(spaceRoomProxy: SpaceRoomProxyMock(.init(id: invitedRoomIDs[0], isSpace: true)))))
}
context.send(viewAction: .acceptInvite(roomIdentifier: invitedRoomIDs[0]))
try await deferred.fulfill()
XCTAssertEqual(appSettings.seenInvites, [invitedRoomIDs[1]])
XCTAssertFalse(notificationManager.removeDeliveredMessageNotificationsForCalled, "The notification will be dismissed when opening the room.")
}
func testDeclineInvite() async throws {
setupViewModel(withInvites: true)
setupViewModel(invites: .rooms)
let invitedRoomIDs = context.viewState.rooms.invites.compactMap(\.roomID)
appSettings.seenInvites = Set(invitedRoomIDs)
XCTAssertEqual(invitedRoomIDs.count, 2)
@@ -331,7 +348,7 @@ class HomeScreenViewModelTests: XCTestCase {
}
func testDeclineAndBlockInvite() async throws {
setupViewModel(withInvites: true)
setupViewModel(invites: .rooms)
let invitedRoomIDs = context.viewState.rooms.invites.compactMap(\.roomID)
appSettings.seenInvites = Set(invitedRoomIDs)
XCTAssertEqual(invitedRoomIDs.count, 2)
@@ -347,20 +364,41 @@ class HomeScreenViewModelTests: XCTestCase {
// MARK: - Helpers
private func setupViewModel(securityStatePublisher: CurrentValuePublisher<SessionSecurityState, Never>? = nil, withInvites: Bool = false) {
enum InviteType { case rooms, spaces }
private func setupViewModel(securityStatePublisher: CurrentValuePublisher<SessionSecurityState, Never>? = nil, invites: InviteType? = nil) {
var rooms: [RoomSummary] = .mockRooms
if withInvites {
switch invites {
case .rooms:
rooms += .mockInvites
case .spaces:
rooms += .mockSpaceInvites
case nil:
break
}
roomSummaryProvider = RoomSummaryProviderMock(.init(state: .loaded(rooms)))
clientProxy = ClientProxyMock(.init(userID: "@mock:client.com",
roomSummaryProvider: roomSummaryProvider))
if withInvites {
clientProxy.joinRoomViaReturnValue = .success(())
clientProxy.joinRoomAliasReturnValue = .success(())
clientProxy.roomForIdentifierClosure = { _ in .invited(InvitedRoomProxyMock(.init())) }
clientProxy.joinRoomViaReturnValue = .success(())
clientProxy.joinRoomAliasReturnValue = .success(())
switch invites {
case .rooms:
clientProxy.roomForIdentifierClosure = { roomID in .invited(InvitedRoomProxyMock(.init(id: roomID))) }
case .spaces:
clientProxy.roomForIdentifierClosure = { spaceID in .invited(InvitedRoomProxyMock(.init(id: spaceID, isSpace: true))) }
let spaceServiceProxy = SpaceServiceProxyMock(.init())
spaceServiceProxy.spaceRoomListSpaceIDParentClosure = { spaceID, _ in
.success(SpaceRoomListProxyMock(.init(spaceRoomProxy: SpaceRoomProxyMock(.init(id: spaceID, isSpace: true)))))
}
clientProxy.underlyingSpaceService = spaceServiceProxy
case nil:
break
}
let userSession = UserSessionMock(.init(clientProxy: clientProxy))
@@ -390,3 +428,42 @@ private extension [HomeScreenRoom] {
}
}
}
extension HomeScreenViewModelAction: @retroactive Equatable {
public static func == (lhs: HomeScreenViewModelAction, rhs: HomeScreenViewModelAction) -> Bool {
switch (lhs, rhs) {
case (.presentRoom(let lhsID), .presentRoom(let rhsID)):
lhsID == rhsID
case (.presentRoomDetails(let lhsID), .presentRoomDetails(let rhsID)):
lhsID == rhsID
case (.presentReportRoom(let lhsID), .presentReportRoom(let rhsID)):
lhsID == rhsID
case (.presentDeclineAndBlock(let lhsUserID, let lhsRoomID), .presentDeclineAndBlock(let rhsUserID, let rhsRoomID)):
lhsUserID == rhsUserID && lhsRoomID == rhsRoomID
case (.presentSpace(let lhsSpaceRoomListProxy), .presentSpace(let rhsSpaceRoomListProxy)):
lhsSpaceRoomListProxy.spaceRoomProxy.id == rhsSpaceRoomListProxy.spaceRoomProxy.id
case (.roomLeft(let lhsID), .roomLeft(let rhsID)):
lhsID == rhsID
case (.transferOwnership(let lhsID), .transferOwnership(let rhsID)):
lhsID == rhsID
case (.presentSecureBackupSettings, .presentSecureBackupSettings):
true
case (.presentRecoveryKeyScreen, .presentRecoveryKeyScreen):
true
case (.presentEncryptionResetScreen, .presentEncryptionResetScreen):
true
case (.presentSettingsScreen, .presentSettingsScreen):
true
case (.presentFeedbackScreen, .presentFeedbackScreen):
true
case (.presentStartChatScreen, .presentStartChatScreen):
true
case (.presentGlobalSearch, .presentGlobalSearch):
true
case (.logout, .logout):
true
default:
false
}
}
}