mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-29 07:42:40 +00:00
parent
ace8613162
commit
bae3ede4c8
3 changed files with 2 additions and 46 deletions
|
@ -107,7 +107,7 @@ class RoomAccessTypeChooserViewModel: RoomAccessTypeChooserViewModelType, RoomAc
|
|||
|
||||
private func upgradeRoom() {
|
||||
guard let versionOverride = roomAccessTypeChooserService.versionOverride else {
|
||||
MXLog.error("[RoomAccessTypeChooserViewModel] upgradeRoom: versionOverride not found")
|
||||
UILog.error("[RoomAccessTypeChooserViewModel] upgradeRoom: versionOverride not found")
|
||||
return
|
||||
}
|
||||
|
||||
|
|
|
@ -30,24 +30,6 @@ class RoomUpgradeUITests: MockScreenTest {
|
|||
|
||||
func verifyRoomUpgradeScreen() throws {
|
||||
guard let screenState = screenState as? MockRoomUpgradeScreenState else { fatalError("no screen") }
|
||||
switch screenState {
|
||||
case .presence(let presence):
|
||||
verifyRoomUpgradePresence(presence: presence)
|
||||
case .longDisplayName(let name):
|
||||
verifyRoomUpgradeLongName(name: name)
|
||||
}
|
||||
}
|
||||
|
||||
func verifyRoomUpgradePresence(presence: RoomUpgradePresence) {
|
||||
let presenceText = app.staticTexts["presenceText"]
|
||||
XCTAssert(presenceText.exists)
|
||||
XCTAssertEqual(presenceText.label, presence.title)
|
||||
}
|
||||
|
||||
func verifyRoomUpgradeLongName(name: String) {
|
||||
let displayNameText = app.staticTexts["displayNameText"]
|
||||
XCTAssert(displayNameText.exists)
|
||||
XCTAssertEqual(displayNameText.label, name)
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -21,37 +21,11 @@ import Combine
|
|||
|
||||
@available(iOS 14.0, *)
|
||||
class RoomUpgradeViewModelTests: XCTestCase {
|
||||
private enum Constants {
|
||||
static let presenceInitialValue: RoomUpgradePresence = .offline
|
||||
static let displayName = "Alice"
|
||||
}
|
||||
var service: MockRoomUpgradeService!
|
||||
var viewModel: RoomUpgradeViewModelProtocol!
|
||||
var context: RoomUpgradeViewModelType.Context!
|
||||
var cancellables = Set<AnyCancellable>()
|
||||
|
||||
override func setUpWithError() throws {
|
||||
service = MockRoomUpgradeService(displayName: Constants.displayName, presence: Constants.presenceInitialValue)
|
||||
viewModel = RoomUpgradeViewModel.makeRoomUpgradeViewModel(roomUpgradeService: service)
|
||||
context = viewModel.context
|
||||
}
|
||||
|
||||
func testInitialState() {
|
||||
XCTAssertEqual(context.viewState.displayName, Constants.displayName)
|
||||
XCTAssertEqual(context.viewState.presence, Constants.presenceInitialValue)
|
||||
}
|
||||
|
||||
func testFirstPresenceReceived() throws {
|
||||
let presencePublisher = context.$viewState.map(\.presence).removeDuplicates().collect(1).first()
|
||||
XCTAssertEqual(try xcAwait(presencePublisher), [Constants.presenceInitialValue])
|
||||
}
|
||||
|
||||
func testPresenceUpdatesReceived() throws {
|
||||
let presencePublisher = context.$viewState.map(\.presence).removeDuplicates().collect(3).first()
|
||||
let awaitDeferred = xcAwaitDeferred(presencePublisher)
|
||||
let newPresenceValue1: RoomUpgradePresence = .online
|
||||
let newPresenceValue2: RoomUpgradePresence = .idle
|
||||
service.simulateUpdate(presence: newPresenceValue1)
|
||||
service.simulateUpdate(presence: newPresenceValue2)
|
||||
XCTAssertEqual(try awaitDeferred(), [Constants.presenceInitialValue, newPresenceValue1, newPresenceValue2])
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue