wip

pointfreeco · Apr 9, 2024 · f68c1cd · f68c1cd
1 parent 9af2a17
commit f68c1cd
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 10 deletions.
diff --git a/Tests/ChangelogFeatureTests/ChangelogFeatureTests.swift b/Tests/ChangelogFeatureTests/ChangelogFeatureTests.swift
@@ -6,8 +6,8 @@ import XCTest
 @testable import ChangelogFeature
 @testable import UserDefaultsClient
 
-@MainActor
 class ChangelogFeatureTests: XCTestCase {
+  @MainActor
   func testOnAppear_IsUpToDate() async {
     let changelog = Changelog(
       changes: [
@@ -45,6 +45,7 @@ class ChangelogFeatureTests: XCTestCase {
     }
   }
 
+  @MainActor
   func testOnAppear_IsUpBehind() async {
     let changelog = Changelog(
       changes: [

diff --git a/Tests/GameOverFeatureIntegrationTests/GameOverFeatureIntegrationTests.swift b/Tests/GameOverFeatureIntegrationTests/GameOverFeatureIntegrationTests.swift
@@ -6,8 +6,8 @@ import SharedModels
 import SiteMiddleware
 import XCTest
 
-@MainActor
 class GameOverFeatureIntegrationTests: XCTestCase {
+  @MainActor
   func testSubmitSoloScore() async {
     await withMainSerialExecutor {
       let ranks: [TimeScope: LeaderboardScoreResult.Rank] = [

diff --git a/Tests/LeaderboardFeatureTests/LeaderboardFeatureIntegrationTests.swift b/Tests/LeaderboardFeatureTests/LeaderboardFeatureIntegrationTests.swift
@@ -9,8 +9,8 @@ import XCTest
 
 @testable import LeaderboardFeature
 
-@MainActor
 class LeaderboardFeatureIntegrationTests: XCTestCase {
+  @MainActor
   func testSoloIntegrationWithLeaderboardResults() async {
     await withMainSerialExecutor {
       let fetchLeaderboardsEntries = [
@@ -59,6 +59,7 @@ class LeaderboardFeatureIntegrationTests: XCTestCase {
     }
   }
 
+  @MainActor
   func testVocabIntegrationWithLeaderboardResults() async {
     let fetchVocabEntries = [
       FetchVocabLeaderboardResponse.Entry.init(

diff --git a/Tests/LeaderboardFeatureTests/LeaderboardFeatureTests.swift b/Tests/LeaderboardFeatureTests/LeaderboardFeatureTests.swift
@@ -9,8 +9,8 @@ import XCTest
 @testable import LeaderboardFeature
 @testable import SharedModels
 
-@MainActor
 class LeaderboardFeatureTests: XCTestCase {
+  @MainActor
   func testScopeSwitcher() async {
     let store = TestStore(initialState: Leaderboard.State()) {
       Leaderboard()
@@ -24,6 +24,7 @@ class LeaderboardFeatureTests: XCTestCase {
     }
   }
 
+  @MainActor
   func testTimeScopeSynchronization() async {
     let store = TestStore(initialState: Leaderboard.State()) {
       Leaderboard()
@@ -49,6 +50,7 @@ class LeaderboardFeatureTests: XCTestCase {
     await task2.cancel()
   }
 
+  @MainActor
   func testCubePreview() async {
     let wordId = Word.Id(rawValue: UUID(uuidString: "00000000-0000-0000-0000-00000000304d")!)
     let vocabEntry = FetchVocabLeaderboardResponse.Entry(
@@ -104,7 +106,6 @@ class LeaderboardFeatureTests: XCTestCase {
       $0.mainQueue = .immediate
     }
 
-
     await store.send(.vocab(.task)) {
       $0.vocab.isLoading = true
       $0.vocab.resultEnvelope = .placeholder

diff --git a/Tests/LeaderboardFeatureTests/LeaderboardResultsTests.swift b/Tests/LeaderboardFeatureTests/LeaderboardResultsTests.swift
@@ -9,8 +9,8 @@ import XCTest
 
 @testable import LeaderboardFeature
 
-@MainActor
 class LeaderboardTests: XCTestCase {
+  @MainActor
   func testOnAppear() async {
     let store = TestStore(
       initialState: LeaderboardResults.State(timeScope: TimeScope.lastWeek)
@@ -28,6 +28,7 @@ class LeaderboardTests: XCTestCase {
     }
   }
 
+  @MainActor
   func testChangeGameMode() async {
     let store = TestStore(
       initialState: LeaderboardResults.State(timeScope: TimeScope.lastWeek)
@@ -45,6 +46,7 @@ class LeaderboardTests: XCTestCase {
     }
   }
 
+  @MainActor
   func testChangeTimeScope() async {
     let store = TestStore(
       initialState: LeaderboardResults.State(timeScope: TimeScope.lastWeek)
@@ -66,6 +68,7 @@ class LeaderboardTests: XCTestCase {
     }
   }
 
+  @MainActor
   func testUnhappyPath() async {
     let store = TestStore(
       initialState: LeaderboardResults<TimeScope>.State(timeScope: .lastWeek)

diff --git a/Tests/MultiplayerFeatureTests/MultiplayerFeatureTests.swift b/Tests/MultiplayerFeatureTests/MultiplayerFeatureTests.swift
@@ -3,8 +3,8 @@ import XCTest
 
 @testable import MultiplayerFeature
 
-@MainActor
 class MultiplayerFeatureTests: XCTestCase {
+  @MainActor
   func testStartGame_GameCenterAuthenticated() async {
     let didPresentMatchmakerViewController = ActorIsolated(false)
     let store = TestStore(initialState: Multiplayer.State(hasPastGames: false)) {
@@ -20,6 +20,7 @@ class MultiplayerFeatureTests: XCTestCase {
     await didPresentMatchmakerViewController.withValue { XCTAssertTrue($0) }
   }
 
+  @MainActor
   func testStartGame_GameCenterNotAuthenticated() async {
     let didPresentAuthentication = ActorIsolated(false)
     let store = TestStore(
@@ -37,6 +38,7 @@ class MultiplayerFeatureTests: XCTestCase {
     await didPresentAuthentication.withValue { XCTAssertTrue($0) }
   }
 
+  @MainActor
   func testNavigateToPastGames() async {
     let store = TestStore(
       initialState: Multiplayer.State(hasPastGames: true)

diff --git a/Tests/MultiplayerFeatureTests/PastGamesTests.swift b/Tests/MultiplayerFeatureTests/PastGamesTests.swift
@@ -8,8 +8,8 @@ import XCTest
 
 @testable import MultiplayerFeature
 
-@MainActor
 class PastGamesTests: XCTestCase {
+  @MainActor
   func testLoadMatches() async {
     let store = TestStore(initialState: PastGames.State()) {
       PastGames()
@@ -24,6 +24,7 @@ class PastGamesTests: XCTestCase {
     }
   }
 
+  @MainActor
   func testOpenMatch() async {
     let store = TestStore(initialState: PastGames.State(pastGames: [pastGameState])) {
       PastGames()
@@ -36,6 +37,7 @@ class PastGamesTests: XCTestCase {
     await store.receive(\.pastGames[id: "id"].delegate.openMatch)
   }
 
+  @MainActor
   func testRematch() async {
     let store = TestStore(initialState: PastGames.State(pastGames: [pastGameState])) {
       PastGames()
@@ -58,6 +60,7 @@ class PastGamesTests: XCTestCase {
     await store.receive(\.pastGames[id: "id"].delegate.openMatch)
   }
 
+  @MainActor
   func testRematch_Failure() async {
     struct RematchFailure: Error, Equatable {}
 

diff --git a/Tests/UpgradeInterstitialFeatureTests/UpgradeInterstitialFeatureTests.swift b/Tests/UpgradeInterstitialFeatureTests/UpgradeInterstitialFeatureTests.swift
@@ -10,10 +10,10 @@ import XCTest
 
 @testable import ServerConfigClient
 
-@MainActor
 class UpgradeInterstitialFeatureTests: XCTestCase {
   let scheduler = RunLoop.test
 
+  @MainActor
   func testUpgrade() async {
     await withMainSerialExecutor {
       let dismissed = LockIsolated(false)
@@ -47,7 +47,10 @@ class UpgradeInterstitialFeatureTests: XCTestCase {
         $0.dismiss = .init { dismissed.setValue(true) }
         $0.mainRunLoop = .immediate
         $0.serverConfig.config = { .init() }
-        $0.storeKit.addPayment = { await paymentAdded.setValue($0.productIdentifier) }
+        $0.storeKit.addPayment = {
+          let productIdentifier = $0.productIdentifier
+          await paymentAdded.setValue(productIdentifier)
+        }
         $0.storeKit.observer = { observer.stream }
         $0.storeKit.fetchProducts = { _ in
           .init(
@@ -84,6 +87,7 @@ class UpgradeInterstitialFeatureTests: XCTestCase {
     }
   }
 
+  @MainActor
   func testWaitAndDismiss() async {
     let dismissed = LockIsolated(false)
     let store = TestStore(
@@ -122,6 +126,7 @@ class UpgradeInterstitialFeatureTests: XCTestCase {
     XCTAssert(dismissed.value)
   }
 
+  @MainActor
   func testMaybeLater_Dismissable() async {
     let dismissed = LockIsolated(false)
     let store = TestStore(