* Initial plan * Migrate 3 test files from XCTest to Swift Testing - MediaUploadPreviewScreenViewModelTests: @MainActor @Suite struct with init(), BundleFinder class for Bundle(for:), mutating test/setup functions, [self] capture replacing [weak self] in closures - NotificationManagerTests: @MainActor @Suite final class with init()/deinit, expectation/fulfillment(of:) replaced with confirmation(...), test_ prefix stripped - NotificationSettingsScreenViewModelTests: @MainActor @Suite struct with init() throws, non-optional stored properties, test prefix stripped Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Migrate 3 XCTest files to Swift Testing - NotificationSettingsEditScreenViewModelTests: @MainActor @Suite struct with init() throws, mutating test methods - TimelineViewModelTests: @MainActor @Suite final class with init() async throws + deinit - AttributedStringBuilderTests: @Suite struct with init() async throws All XCT assertions replaced with #expect/#require/Issue.record Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Migrate 4 test files from XCTest to Swift Testing - TimelineMediaPreviewViewModelTests: @Suite struct, mutating @Test funcs, testLoadingItem renamed to loadingItem (called internally by other tests) - ServerConfirmationScreenViewModelTests: @Suite final class with init()/deinit - CompletionSuggestionServiceTests: @Suite struct with init() - RoomFlowCoordinatorTests: @Suite final class with deinit Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Migrate 4 test files from XCTest to Swift Testing - VoiceMessageRecorderTests: @Suite struct with init() async throws, added BundleFinder class for Bundle lookup, migrated all assertions - SpaceScreenViewModelTests: @Suite struct, private mutating setupViewModel, all test funcs mutating, XCTestExpectation → confirmation - RoomNotificationSettingsScreenViewModelTests: @Suite struct with init() throws, cancellable tests marked mutating - JoinRoomScreenViewModelTests: @Suite final class with init()/deinit, XCTestExpectation → confirmation Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Migrate 6 test files from XCTestCase to Swift Testing Co-authored-by: pixlwave <6060466+pixlwave@users.noreply.github.com> * Fix trailing blank line in RoomPollsHistoryScreenViewModelTests Co-authored-by: pixlwave <6060466+pixlwave@users.noreply.github.com> * Migrate 3 test files from XCTest to Swift Testing - MediaUploadingPreprocessorTests: @Suite final class with init()/deinit, removed executionTimeAllowance, XCTAssertEqual(accuracy:) → abs(Double) - SecurityAndPrivacyScreenViewModelTests: @MainActor @Suite final class, 5 expectation+fulfillment → await confirmation(...) - CreateRoomViewModelTests: @MainActor @Suite final class, 4 expectation+fulfillment → await confirmation(...) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Migrate RoomScreenViewModelTests and RoomDetailsScreenViewModelTests to Swift Testing - Replace XCTest with Testing framework - RoomScreenViewModelTests: final class with init() async throws + deinit - RoomDetailsScreenViewModelTests: struct with init() and mutating funcs - Convert XCT assertions to #expect / Issue.record - Convert XCTestExpectation patterns to confirmation { confirm in } - Strip 'test' prefix from all test function names Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Migrate ComposerToolbarViewModelTests from XCTest to Swift Testing - Replace import XCTest with import Testing - Convert XCTestCase class to @MainActor @Suite final class - Replace setUp()/tearDown() with init()/deinit - Strip 'test' prefix from all 41 test method names and add @Test - Replace XCTAssert* with #expect()/#require() - Replace try XCTUnwrap() with try #require() - Convert expectation+wait patterns to deferFulfillment with PassthroughSubject - Convert isInverted expectation to boolean flag checked after await - Use deferFulfillment on $viewState for state-transition tests Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Address comments with Copilot. * Fix the failing tests. * Fixed flaky tests (#5137) resolved flaky tests * Tweaks and fixes. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: pixlwave <6060466+pixlwave@users.noreply.github.com> Co-authored-by: Doug <douglase@element.io> Co-authored-by: Mauro <34335419+Velin92@users.noreply.github.com>
100 lines
3.6 KiB
Swift
100 lines
3.6 KiB
Swift
//
|
|
// Copyright 2025 Element Creations Ltd.
|
|
// Copyright 2023-2025 New Vector Ltd.
|
|
//
|
|
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
|
|
// Please see LICENSE files in the repository root for full details.
|
|
//
|
|
|
|
import Combine
|
|
|
|
extension SessionVerificationControllerProxyMock {
|
|
static let emojis = [SessionVerificationEmoji(symbol: "🦋", description: "Butterfly"),
|
|
SessionVerificationEmoji(symbol: "🐘", description: "Elephant"),
|
|
SessionVerificationEmoji(symbol: "🦋", description: "Butterfly"),
|
|
SessionVerificationEmoji(symbol: "🎂", description: "Cake"),
|
|
SessionVerificationEmoji(symbol: "🎂", description: "Cake"),
|
|
SessionVerificationEmoji(symbol: "🏁", description: "Flag"),
|
|
SessionVerificationEmoji(symbol: "🌏", description: "Globe")]
|
|
|
|
static func configureMock(actions: PassthroughSubject<SessionVerificationControllerProxyAction, Never> = .init(),
|
|
isVerified: Bool = false,
|
|
otherDeviceStartsSasVerification: Bool = false,
|
|
requestDelay: Duration = .seconds(1)) -> SessionVerificationControllerProxyMock {
|
|
let mock = SessionVerificationControllerProxyMock()
|
|
mock.underlyingActions = actions
|
|
|
|
mock.acknowledgeVerificationRequestDetailsReturnValue = .success(())
|
|
|
|
mock.requestDeviceVerificationClosure = { [weak mock] in
|
|
Task.detached {
|
|
guard let mock else { return }
|
|
|
|
try await Task.sleep(for: requestDelay)
|
|
|
|
mock.actions.send(.acceptedVerificationRequest)
|
|
|
|
if otherDeviceStartsSasVerification {
|
|
try await Task.sleep(for: requestDelay)
|
|
mock.actions.send(.startedSasVerification)
|
|
try await Task.sleep(for: requestDelay)
|
|
mock.actions.send(.receivedVerificationData(emojis))
|
|
}
|
|
}
|
|
|
|
return .success(())
|
|
}
|
|
|
|
mock.startSasVerificationClosure = { [weak mock] in
|
|
Task.detached {
|
|
guard let mock else { return }
|
|
|
|
try await Task.sleep(for: requestDelay)
|
|
mock.actions.send(.startedSasVerification)
|
|
|
|
Task.detached {
|
|
try await Task.sleep(for: requestDelay)
|
|
mock.actions.send(.receivedVerificationData(emojis))
|
|
}
|
|
}
|
|
|
|
return .success(())
|
|
}
|
|
|
|
mock.approveVerificationClosure = { [weak mock] in
|
|
Task.detached {
|
|
guard let mock else { return }
|
|
|
|
try await Task.sleep(for: requestDelay)
|
|
mock.actions.send(.finished)
|
|
}
|
|
|
|
return .success(())
|
|
}
|
|
|
|
mock.declineVerificationClosure = { [weak mock] in
|
|
Task.detached {
|
|
guard let mock else { return }
|
|
|
|
try await Task.sleep(for: requestDelay)
|
|
mock.actions.send(.cancelled)
|
|
}
|
|
|
|
return .success(())
|
|
}
|
|
|
|
mock.cancelVerificationClosure = { [weak mock] in
|
|
Task.detached {
|
|
guard let mock else { return }
|
|
|
|
try await Task.sleep(for: requestDelay)
|
|
mock.actions.send(.cancelled)
|
|
}
|
|
|
|
return .success(())
|
|
}
|
|
|
|
return mock
|
|
}
|
|
}
|