letro/letro-ios
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases 2 Wiki Activity

Use our own JoinRule type which doesn't include the reserved .private case. (#5056)

Browse Source 
* Stop using Rust's JoinRule.private in mocks.

It isn't used anywhere else (see MSC4413 for more context).

* Use our own JoinRule (and AllowRule) types.

* Update ElementX/Sources/Services/Room/JoinRule.swift

Co-authored-by: Stefan Ceriu <stefan.ceriu@gmail.com>

---------

Co-authored-by: Stefan Ceriu <stefan.ceriu@gmail.com>
This commit is contained in:
Doug
2026-02-06 13:54:53 +00:00
committed by GitHub
parent d480014304
commit 77496934ce
18 changed files with 119 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
UnitTests/Sources/CreateRoomViewModelTests.swift
View File

@@ -271,7 +271,7 @@ class CreateRoomScreenViewModelTests: XCTestCase {
}
func testCreateRoomInAnAlreadySelectedSpace() async throws {
let space = SpaceServiceRoom.mock(isSpace: true, joinRule: .private)
let space = SpaceServiceRoom.mock(isSpace: true, joinRule: .invite)
setup(spacesSelectionMode: .preSelected(space))
context.send(viewAction: .updateRoomName("A"))

20
UnitTests/Sources/SecurityAndPrivacyScreenViewModelTests.swift
View File

@@ -50,7 +50,7 @@ class SecurityAndPrivacyScreenViewModelTests: XCTestCase {
let expectation = expectation(description: "Join rule has updated")
roomProxy.updateJoinRuleClosure = { value in
XCTAssertEqual(value, .restricted(rules: [.roomMembership(roomId: space.id)]))
XCTAssertEqual(value, .restricted(rules: [.roomMembership(roomID: space.id)]))
expectation.fulfill()
return .success(())
}
@@ -81,7 +81,7 @@ class SecurityAndPrivacyScreenViewModelTests: XCTestCase {
let expectation = expectation(description: "Join rule has updated")
roomProxy.updateJoinRuleClosure = { value in
XCTAssertEqual(value, .knockRestricted(rules: [.roomMembership(roomId: space.id)]))
XCTAssertEqual(value, .knockRestricted(rules: [.roomMembership(roomID: space.id)]))
expectation.fulfill()
return .success(())
}
@@ -92,7 +92,7 @@ class SecurityAndPrivacyScreenViewModelTests: XCTestCase {
func testSingleUnknownSpaceMembersAccessCanBeReselected() async throws {
let singleRoom = [SpaceServiceRoom].mockSingleRoom
let space = singleRoom[0]
setupViewModel(joinedParentSpaces: [], joinRule: .restricted(rules: [.roomMembership(roomId: space.id)]))
setupViewModel(joinedParentSpaces: [], joinRule: .restricted(rules: [.roomMembership(roomID: space.id)]))
let deferred = deferFulfillment(context.$viewState) { $0.selectableJoinedSpaces.count == 0 }
try await deferred.fulfill()
@@ -156,7 +156,7 @@ class SecurityAndPrivacyScreenViewModelTests: XCTestCase {
let expectation = expectation(description: "Join rule has updated")
roomProxy.updateJoinRuleClosure = { value in
XCTAssertEqual(value, .restricted(rules: [.roomMembership(roomId: spaces[0].id)]))
XCTAssertEqual(value, .restricted(rules: [.roomMembership(roomID: spaces[0].id)]))
expectation.fulfill()
return .success(())
}
@@ -200,7 +200,7 @@ class SecurityAndPrivacyScreenViewModelTests: XCTestCase {
let expectation = expectation(description: "Join rule has updated")
roomProxy.updateJoinRuleClosure = { value in
XCTAssertEqual(value, .knockRestricted(rules: [.roomMembership(roomId: spaces[0].id)]))
XCTAssertEqual(value, .knockRestricted(rules: [.roomMembership(roomID: spaces[0].id)]))
expectation.fulfill()
return .success(())
}
@@ -211,7 +211,7 @@ class SecurityAndPrivacyScreenViewModelTests: XCTestCase {
func testMultipleSpacesMembersSelection() async throws {
let spaces = [SpaceServiceRoom].mockJoinedSpaces2
setupViewModel(joinedParentSpaces: spaces,
joinRule: .restricted(rules: [.roomMembership(roomId: "unknownSpaceID")]))
joinRule: .restricted(rules: [.roomMembership(roomID: "unknownSpaceID")]))
let deferred = deferFulfillment(context.$viewState) { $0.selectableSpacesCount == 4 }
try await deferred.fulfill()
@@ -246,7 +246,7 @@ class SecurityAndPrivacyScreenViewModelTests: XCTestCase {
let expectation = expectation(description: "Join rule has updated")
roomProxy.updateJoinRuleClosure = { value in
XCTAssertEqual(value, .restricted(rules: [.roomMembership(roomId: spaces[0].id), .roomMembership(roomId: "unknownSpaceID")]))
XCTAssertEqual(value, .restricted(rules: [.roomMembership(roomID: spaces[0].id), .roomMembership(roomID: "unknownSpaceID")]))
expectation.fulfill()
return .success(())
}
@@ -261,8 +261,8 @@ class SecurityAndPrivacyScreenViewModelTests: XCTestCase {
let allSpaces = joinedParentSpaces + singleRoom
setupViewModel(joinedParentSpaces: joinedParentSpaces,
topLevelSpaces: allSpaces,
joinRule: .restricted(rules: [.roomMembership(roomId: space.id),
.roomMembership(roomId: "unknownSpaceID")]))
joinRule: .restricted(rules: [.roomMembership(roomID: space.id),
.roomMembership(roomID: "unknownSpaceID")]))
let deferred = deferFulfillment(context.$viewState) { $0.selectableSpacesCount == 5 }
try await deferred.fulfill()
@@ -425,7 +425,7 @@ class SecurityAndPrivacyScreenViewModelTests: XCTestCase {
private func setupViewModel(joinedParentSpaces: [SpaceServiceRoom],
topLevelSpaces: [SpaceServiceRoom] = [],
joinRule: JoinRule) {
joinRule: ElementX.JoinRule) {
let appSettings = AppSettings()
appSettings.spaceSettingsEnabled = true
appSettings.knockingEnabled = true