Implemented adding the room to the space after selection, and the editableSpace proxied API. Also updated and added tests.

2026-11-02 21:33:26 +00:00 · 2026-01-21 14:58:03 +01:00
parent 07243be949
commit 9dead7ed55
50 changed files with 406 additions and 83 deletions
@@ -15,6 +15,7 @@ import XCTest
 class CreateRoomScreenViewModelTests: XCTestCase {
    var viewModel: CreateRoomScreenViewModelProtocol!
    var clientProxy: ClientProxyMock!
+    var spaceService: SpaceServiceProxyMock!
    var userSession: UserSessionMock!
    
    private let usersSubject = CurrentValueSubject<[UserProfileProxy], Never>([])
@@ -23,39 +24,31 @@ class CreateRoomScreenViewModelTests: XCTestCase {
        viewModel.context
    }
    
-    override func setUpWithError() throws {
-        clientProxy = ClientProxyMock(.init(userIDServerName: "matrix.org", userID: "@a:b.com"))
-        clientProxy.roomForIdentifierClosure = { roomID in .joined(JoinedRoomProxyMock(.init(id: roomID))) }
-        userSession = UserSessionMock(.init(clientProxy: clientProxy))
-        ServiceLocator.shared.settings.knockingEnabled = true
-        let viewModel = CreateRoomScreenViewModel(isSpace: false,
-                                                  spaceSelectionMode: .list,
-                                                  shouldShowCancelButton: false,
-                                                  userSession: userSession,
-                                                  analytics: ServiceLocator.shared.analytics,
-                                                  userIndicatorController: UserIndicatorControllerMock(),
-                                                  appSettings: ServiceLocator.shared.settings)
-        self.viewModel = viewModel
-    }
-    
    override func tearDown() {
        AppSettings.resetAllSettings()
        viewModel = nil
        clientProxy = nil
+        spaceService = nil
        userSession = nil
    }
    
-    func testDefaultSecurity() {
+    func testDefaultState() {
+        setup()
        XCTAssertEqual(context.viewState.bindings.selectedAccessType, .private)
+        XCTAssertNil(context.selectedSpace)
+        XCTAssertEqual(context.viewState.availableAccessTypes, [.public, .askToJoin, .private])
+        XCTAssertTrue(context.viewState.canSelectSpace)
    }
    
    func testCreateRoomRequirements() {
+        setup()
        XCTAssertFalse(context.viewState.canCreateRoom)
        context.send(viewAction: .updateRoomName("A"))
        XCTAssertTrue(context.viewState.canCreateRoom)
    }
    
    func testCreateRoom() async throws {
+        setup()
        // Given a form with a blank topic.
        context.send(viewAction: .updateRoomName("A"))
        context.roomTopic = ""
@@ -76,9 +69,11 @@ class CreateRoomScreenViewModelTests: XCTestCase {
        XCTAssertEqual(clientProxy.createRoomNameTopicAccessTypeIsSpaceUserIDsAvatarURLAliasLocalPartReceivedArguments?.name, "A")
        XCTAssertNil(clientProxy.createRoomNameTopicAccessTypeIsSpaceUserIDsAvatarURLAliasLocalPartReceivedArguments?.topic,
                     "The topic should be sent as nil when it is empty.")
+        XCTAssertEqual(clientProxy.createRoomNameTopicAccessTypeIsSpaceUserIDsAvatarURLAliasLocalPartReceivedArguments?.accessType, .private)
    }
    
    func testCreateSpace() async throws {
+        setup(isSpace: true)
        clientProxy = ClientProxyMock(.init(userIDServerName: "matrix.org",
                                            userID: "@a:b.com",
                                            spaceServiceConfiguration: .init(spaceRoomLists: ["1": .init()])))
@@ -116,9 +111,11 @@ class CreateRoomScreenViewModelTests: XCTestCase {
        XCTAssertEqual(clientProxy.createRoomNameTopicAccessTypeIsSpaceUserIDsAvatarURLAliasLocalPartReceivedArguments?.name, "A")
        XCTAssertNil(clientProxy.createRoomNameTopicAccessTypeIsSpaceUserIDsAvatarURLAliasLocalPartReceivedArguments?.topic,
                     "The topic should be sent as nil when it is empty.")
+        XCTAssertEqual(clientProxy.createRoomNameTopicAccessTypeIsSpaceUserIDsAvatarURLAliasLocalPartReceivedArguments?.accessType, .private)
    }
    
    func testCreateKnockingRoom() async {
+        setup()
        context.send(viewAction: .updateRoomName("A"))
        context.roomTopic = "B"
        context.selectedAccessType = .askToJoin
@@ -139,6 +136,7 @@ class CreateRoomScreenViewModelTests: XCTestCase {
    }
    
    func testCreatePublicRoomFailsForInvalidAlias() async throws {
+        setup()
        context.send(viewAction: .updateRoomName("A"))
        context.roomTopic = "B"
        context.selectedAccessType = .public
@@ -161,6 +159,7 @@ class CreateRoomScreenViewModelTests: XCTestCase {
    }
    
    func testCreatePublicRoomFailsForExistingAlias() async throws {
+        setup()
        clientProxy.isAliasAvailableReturnValue = .success(false)
        context.send(viewAction: .updateRoomName("A"))
        context.roomTopic = "B"
@@ -192,6 +191,7 @@ class CreateRoomScreenViewModelTests: XCTestCase {
    }
    
    func testNameAndAddressSync() async {
+        setup()
        context.selectedAccessType = .private
        await Task.yield()
        context.send(viewAction: .updateRoomName("abc"))
@@ -221,4 +221,131 @@ class CreateRoomScreenViewModelTests: XCTestCase {
        XCTAssertEqual(context.viewState.aliasLocalPart, "hello-matrix!")
        XCTAssertEqual(context.viewState.roomName, "Hello# Matrix!")
    }
+    
+    func testCreateRoomInASelectedSpaceFromTheList() async throws {
+        let spaces = [SpaceServiceRoomProtocol].mockJoinedSpaces2
+        setup()
+        
+        // Given a form with a blank topic.
+        context.send(viewAction: .updateRoomName("A"))
+        context.roomTopic = ""
+        context.selectedAccessType = .public
+        XCTAssertTrue(context.viewState.canCreateRoom)
+        XCTAssertNil(context.selectedSpace)
+        XCTAssertEqual(context.viewState.availableAccessTypes, [.public, .askToJoin, .private])
+        XCTAssertTrue(context.viewState.canSelectSpace)
+        
+        var deferred = deferFulfillment(context.$viewState) { viewState in
+            viewState.editableSpaces.map(\.id) == spaces.map(\.id)
+        }
+        try await deferred.fulfill()
+        
+        context.selectedSpace = spaces[0]
+        deferred = deferFulfillment(context.$viewState) { viewState in
+            viewState.bindings.selectedSpace?.id == spaces[0].id &&
+                viewState.availableAccessTypes == [.spaceMembers, .askToJoinWithSpaceMembers, .private] &&
+                // The value should reset since the original one is not available anymore
+                viewState.bindings.selectedAccessType == .private
+        }
+        try await deferred.fulfill()
+        
+        // When creating the room.
+        clientProxy.createRoomNameTopicAccessTypeIsSpaceUserIDsAvatarURLAliasLocalPartReturnValue = .success("1")
+        let expectation = expectation(description: "Wait for the addChild function to be called")
+        spaceService.addChildToClosure = { roomID, spaceID in
+            defer { expectation.fulfill() }
+            XCTAssertEqual(roomID, "1")
+            XCTAssertEqual(spaceID, spaces[0].id)
+            return .success(())
+        }
+        
+        let deferredAction = deferFulfillment(viewModel.actions) { action in
+            guard case .createdRoom(let roomProxy, nil) = action, roomProxy.id == "1" else { return false }
+            return true
+        }
+        context.send(viewAction: .createRoom)
+        
+        await fulfillment(of: [expectation])
+        try await deferredAction.fulfill()
+        
+        // Then the room should be created and a topic should not be set.
+        XCTAssertTrue(clientProxy.createRoomNameTopicAccessTypeIsSpaceUserIDsAvatarURLAliasLocalPartCalled)
+        XCTAssertEqual(clientProxy.createRoomNameTopicAccessTypeIsSpaceUserIDsAvatarURLAliasLocalPartReceivedArguments?.name, "A")
+        XCTAssertEqual(clientProxy.createRoomNameTopicAccessTypeIsSpaceUserIDsAvatarURLAliasLocalPartReceivedArguments?.accessType, .private)
+        XCTAssertNil(clientProxy.createRoomNameTopicAccessTypeIsSpaceUserIDsAvatarURLAliasLocalPartReceivedArguments?.topic,
+                     "The topic should be sent as nil when it is empty.")
+    }
+    
+    func testCreateRoomInAnAlreadySelectedSpace() async throws {
+        let space = SpaceServiceRoomMock(.init(isSpace: true, joinRule: .private))
+        setup(spacesSelectionMode: .selected(space))
+        
+        // Given a form with a blank topic.
+        context.send(viewAction: .updateRoomName("A"))
+        context.roomTopic = ""
+        context.selectedAccessType = .spaceMembers
+        XCTAssertTrue(context.viewState.canCreateRoom)
+        XCTAssertEqual(context.selectedSpace?.id, space.id)
+        XCTAssertEqual(context.viewState.availableAccessTypes, [.spaceMembers, .askToJoinWithSpaceMembers, .private])
+        XCTAssertFalse(context.viewState.canSelectSpace)
+        
+        // When creating the room.
+        clientProxy.createRoomNameTopicAccessTypeIsSpaceUserIDsAvatarURLAliasLocalPartReturnValue = .success("1")
+        let expectation = expectation(description: "Wait for the addChild function to be called")
+        spaceService.addChildToClosure = { roomID, spaceID in
+            defer { expectation.fulfill() }
+            XCTAssertEqual(roomID, "1")
+            XCTAssertEqual(spaceID, space.id)
+            return .success(())
+        }
+        
+        let deferredAction = deferFulfillment(viewModel.actions) { action in
+            guard case .createdRoom(let roomProxy, nil) = action, roomProxy.id == "1" else { return false }
+            return true
+        }
+        context.send(viewAction: .createRoom)
+        
+        await fulfillment(of: [expectation])
+        try await deferredAction.fulfill()
+        
+        // Then the room should be created and a topic should not be set.
+        XCTAssertTrue(clientProxy.createRoomNameTopicAccessTypeIsSpaceUserIDsAvatarURLAliasLocalPartCalled)
+        XCTAssertEqual(clientProxy.createRoomNameTopicAccessTypeIsSpaceUserIDsAvatarURLAliasLocalPartReceivedArguments?.name, "A")
+        XCTAssertEqual(clientProxy.createRoomNameTopicAccessTypeIsSpaceUserIDsAvatarURLAliasLocalPartReceivedArguments?.accessType, .spaceMembers(spaceID: space.id))
+        XCTAssertNil(clientProxy.createRoomNameTopicAccessTypeIsSpaceUserIDsAvatarURLAliasLocalPartReceivedArguments?.topic,
+                     "The topic should be sent as nil when it is empty.")
+    }
+    
+    func testCreateRoomInAnPublicSpaceAvailableTypes() async throws {
+        let space = SpaceServiceRoomMock(.init(isSpace: true, joinRule: .public))
+        setup(spacesSelectionMode: .selected(space))
+        
+        // Given a form with a blank topic.
+        context.send(viewAction: .updateRoomName("A"))
+        context.roomTopic = ""
+        context.selectedAccessType = .spaceMembers
+        XCTAssertTrue(context.viewState.canCreateRoom)
+        XCTAssertEqual(context.selectedSpace?.id, space.id)
+        XCTAssertEqual(context.viewState.availableAccessTypes, [.public, .askToJoin, .private])
+        XCTAssertFalse(context.viewState.canSelectSpace)
+    }
+    
+    private func setup(isSpace: Bool = false, spacesSelectionMode: CreateRoomScreenSpaceSelectionMode = .list) {
+        spaceService = SpaceServiceProxyMock(.init(editableSpaces: .mockJoinedSpaces2,
+                                                   spaceRoomLists: ["1": .init()]))
+        clientProxy = ClientProxyMock(.init(userIDServerName: "matrix.org",
+                                            userID: "@a:b.com"))
+        clientProxy.spaceService = spaceService
+        clientProxy.roomForIdentifierClosure = { roomID in .joined(JoinedRoomProxyMock(.init(id: roomID))) }
+        userSession = UserSessionMock(.init(clientProxy: clientProxy))
+        ServiceLocator.shared.settings.knockingEnabled = true
+        let viewModel = CreateRoomScreenViewModel(isSpace: isSpace,
+                                                  spaceSelectionMode: spacesSelectionMode,
+                                                  shouldShowCancelButton: false,
+                                                  userSession: userSession,
+                                                  analytics: ServiceLocator.shared.analytics,
+                                                  userIndicatorController: UserIndicatorControllerMock(),
+                                                  appSettings: ServiceLocator.shared.settings)
+        self.viewModel = viewModel
+    }
 }