From d49112848ab04cbce063bf353d875340ec65f447 Mon Sep 17 00:00:00 2001 From: Doug Date: Tue, 25 Apr 2023 15:55:43 +0100 Subject: [PATCH] Await specific states. --- .../Sources/RoomDetailsViewModelTests.swift | 26 +++++++++++-------- .../RoomMemberDetailsViewModelTests.swift | 24 +++++++++++------ 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/UnitTests/Sources/RoomDetailsViewModelTests.swift b/UnitTests/Sources/RoomDetailsViewModelTests.swift index 092712c90..dd5fa5a53 100644 --- a/UnitTests/Sources/RoomDetailsViewModelTests.swift +++ b/UnitTests/Sources/RoomDetailsViewModelTests.swift @@ -100,10 +100,11 @@ class RoomDetailsScreenViewModelTests: XCTestCase { XCTAssertEqual(context.viewState.dmRecipient, RoomMemberDetails(withProxy: recipient)) context.send(viewAction: .ignoreConfirmed) - await context.nextViewState() - + + _ = await context.$viewState.values.first { $0.isProcessingIgnoreRequest == true } XCTAssertTrue(context.viewState.isProcessingIgnoreRequest) - await context.nextViewState() + + _ = await context.$viewState.values.first { $0.isProcessingIgnoreRequest == false } XCTAssertFalse(context.viewState.isProcessingIgnoreRequest) XCTAssert(context.viewState.dmRecipient?.isIgnored == true) } @@ -120,10 +121,11 @@ class RoomDetailsScreenViewModelTests: XCTestCase { XCTAssertEqual(context.viewState.dmRecipient, RoomMemberDetails(withProxy: recipient)) context.send(viewAction: .ignoreConfirmed) - await context.nextViewState() - + + _ = await context.$viewState.values.first { $0.isProcessingIgnoreRequest == true } XCTAssertTrue(context.viewState.isProcessingIgnoreRequest) - await context.nextViewState() + + _ = await context.$viewState.values.first { $0.isProcessingIgnoreRequest == false } XCTAssertFalse(context.viewState.isProcessingIgnoreRequest) XCTAssert(context.viewState.dmRecipient?.isIgnored == false) XCTAssertNotNil(context.alertInfo) @@ -141,10 +143,11 @@ class RoomDetailsScreenViewModelTests: XCTestCase { XCTAssertEqual(context.viewState.dmRecipient, RoomMemberDetails(withProxy: recipient)) context.send(viewAction: .unignoreConfirmed) - await context.nextViewState() - + + _ = await context.$viewState.values.first { $0.isProcessingIgnoreRequest == true } XCTAssertTrue(context.viewState.isProcessingIgnoreRequest) - await context.nextViewState() + + _ = await context.$viewState.values.first { $0.isProcessingIgnoreRequest == false } XCTAssertFalse(context.viewState.isProcessingIgnoreRequest) XCTAssert(context.viewState.dmRecipient?.isIgnored == false) } @@ -161,10 +164,11 @@ class RoomDetailsScreenViewModelTests: XCTestCase { XCTAssertEqual(context.viewState.dmRecipient, RoomMemberDetails(withProxy: recipient)) context.send(viewAction: .unignoreConfirmed) - await context.nextViewState() + + _ = await context.$viewState.values.first { $0.isProcessingIgnoreRequest == true } XCTAssertTrue(context.viewState.isProcessingIgnoreRequest) - await context.nextViewState() + _ = await context.$viewState.values.first { $0.isProcessingIgnoreRequest == false } XCTAssertFalse(context.viewState.isProcessingIgnoreRequest) XCTAssert(context.viewState.dmRecipient?.isIgnored == true) XCTAssertNotNil(context.alertInfo) diff --git a/UnitTests/Sources/RoomMemberDetailsViewModelTests.swift b/UnitTests/Sources/RoomMemberDetailsViewModelTests.swift index 7e7fd177f..b73b6be5e 100644 --- a/UnitTests/Sources/RoomMemberDetailsViewModelTests.swift +++ b/UnitTests/Sources/RoomMemberDetailsViewModelTests.swift @@ -45,10 +45,12 @@ class RoomMemberDetailsViewModelTests: XCTestCase { XCTAssertEqual(context.ignoreUserAlert, .init(action: .ignore)) context.send(viewAction: .ignoreConfirmed) - await context.nextViewState() + + _ = await context.$viewState.values.first { $0.isProcessingIgnoreRequest == true } XCTAssertTrue(context.viewState.isProcessingIgnoreRequest) XCTAssertFalse(context.viewState.details.isIgnored) - await context.nextViewState() + + _ = await context.$viewState.values.first { $0.isProcessingIgnoreRequest == false } XCTAssertFalse(context.viewState.isProcessingIgnoreRequest) XCTAssertTrue(context.viewState.details.isIgnored) } @@ -64,10 +66,12 @@ class RoomMemberDetailsViewModelTests: XCTestCase { XCTAssertEqual(context.ignoreUserAlert, .init(action: .ignore)) context.send(viewAction: .ignoreConfirmed) - await context.nextViewState() + + _ = await context.$viewState.values.first { $0.isProcessingIgnoreRequest == true } XCTAssertTrue(context.viewState.isProcessingIgnoreRequest) XCTAssertFalse(context.viewState.details.isIgnored) - await context.nextViewState() + + _ = await context.$viewState.values.first { $0.isProcessingIgnoreRequest == false } XCTAssertFalse(context.viewState.isProcessingIgnoreRequest) XCTAssertNotNil(context.errorAlert) XCTAssertFalse(context.viewState.details.isIgnored) @@ -85,10 +89,12 @@ class RoomMemberDetailsViewModelTests: XCTestCase { XCTAssertEqual(context.ignoreUserAlert, .init(action: .unignore)) context.send(viewAction: .unignoreConfirmed) - await context.nextViewState() + + _ = await context.$viewState.values.first { $0.isProcessingIgnoreRequest == true } XCTAssertTrue(context.viewState.isProcessingIgnoreRequest) XCTAssertTrue(context.viewState.details.isIgnored) - await context.nextViewState() + + _ = await context.$viewState.values.first { $0.isProcessingIgnoreRequest == false } XCTAssertFalse(context.viewState.isProcessingIgnoreRequest) XCTAssertFalse(context.viewState.details.isIgnored) } @@ -105,10 +111,12 @@ class RoomMemberDetailsViewModelTests: XCTestCase { XCTAssertEqual(context.ignoreUserAlert, .init(action: .unignore)) context.send(viewAction: .unignoreConfirmed) - await context.nextViewState() + + _ = await context.$viewState.values.first { $0.isProcessingIgnoreRequest == true } XCTAssertTrue(context.viewState.isProcessingIgnoreRequest) XCTAssertTrue(context.viewState.details.isIgnored) - await context.nextViewState() + + _ = await context.$viewState.values.first { $0.isProcessingIgnoreRequest == false } XCTAssertFalse(context.viewState.isProcessingIgnoreRequest) XCTAssertTrue(context.viewState.details.isIgnored) XCTAssertNotNil(context.errorAlert)