Fix some tests.

pointfreeco · Jun 19, 2023 · d36baac · d36baac
1 parent cc34b86
commit d36baac
Show file tree

Hide file tree

Showing 44 changed files with 98 additions and 86 deletions.
diff --git a/Sources/ClientModels/TurnBasedMatchData.swift b/Sources/ClientModels/TurnBasedMatchData.swift
@@ -57,8 +57,17 @@ extension Data {
   }
 
   static let matchDecoder = JSONDecoder()
-  static let matchEncoder = JSONEncoder()
+  static let matchEncoder: JSONEncoder = {
+    let encoder = JSONEncoder()
+    // TODO: Would be better to move this JSON decode to its own @Dependency.
+    @Dependency(\.context) var context
+    if context == .test {
+      encoder.outputFormatting = .sortedKeys
+    }
+    return encoder
+  }()
 }
+import Dependencies
 
 extension TurnBasedMatchData.Metadata {
   private enum CodingKeys: CaseIterable, CodingKey {

diff --git a/Tests/AppFeatureTests/PersistenceTests.swift b/Tests/AppFeatureTests/PersistenceTests.swift
@@ -144,7 +144,10 @@ class PersistenceTests: XCTestCase {
     }
     try await saves.withValue {
       XCTAssertNoDifference(2, $0.count)
-      XCTAssertNoDifference($0.last, try JSONEncoder().encode(store.state.home.savedGames))
+      XCTAssertNoDifference(
+        try JSONDecoder().decode(SavedGamesState.self, from: $0.last!),
+        store.state.home.savedGames
+      )
     }
   }
 

diff --git a/...SnapshotTests/__Snapshots__/AppStoreSnapshotTests/test_1_SoloGame.iPad_12_9.png b/...SnapshotTests/__Snapshots__/AppStoreSnapshotTests/test_1_SoloGame.iPad_12_9.png
diff --git a/...napshotTests/__Snapshots__/AppStoreSnapshotTests/test_1_SoloGame.iPhone_5_5.png b/...napshotTests/__Snapshots__/AppStoreSnapshotTests/test_1_SoloGame.iPhone_5_5.png
diff --git a/...napshotTests/__Snapshots__/AppStoreSnapshotTests/test_1_SoloGame.iPhone_6_5.png b/...napshotTests/__Snapshots__/AppStoreSnapshotTests/test_1_SoloGame.iPhone_6_5.png
diff --git a/...hotTests/__Snapshots__/AppStoreSnapshotTests/test_2_TurnBasedGame.iPad_12_9.png b/...hotTests/__Snapshots__/AppStoreSnapshotTests/test_2_TurnBasedGame.iPad_12_9.png
diff --git a/...otTests/__Snapshots__/AppStoreSnapshotTests/test_2_TurnBasedGame.iPhone_5_5.png b/...otTests/__Snapshots__/AppStoreSnapshotTests/test_2_TurnBasedGame.iPhone_5_5.png
diff --git a/...otTests/__Snapshots__/AppStoreSnapshotTests/test_2_TurnBasedGame.iPhone_6_5.png b/...otTests/__Snapshots__/AppStoreSnapshotTests/test_2_TurnBasedGame.iPhone_6_5.png
diff --git a/.../__Snapshots__/AppStoreSnapshotTests/test_3_DailyChallengeResults.iPad_12_9.png b/.../__Snapshots__/AppStoreSnapshotTests/test_3_DailyChallengeResults.iPad_12_9.png
diff --git a/...__Snapshots__/AppStoreSnapshotTests/test_3_DailyChallengeResults.iPhone_5_5.png b/...__Snapshots__/AppStoreSnapshotTests/test_3_DailyChallengeResults.iPhone_5_5.png
diff --git a/...__Snapshots__/AppStoreSnapshotTests/test_3_DailyChallengeResults.iPhone_6_5.png b/...__Snapshots__/AppStoreSnapshotTests/test_3_DailyChallengeResults.iPhone_6_5.png
diff --git a/...shotTests/__Snapshots__/AppStoreSnapshotTests/test_4_Leaderboards.iPad_12_9.png b/...shotTests/__Snapshots__/AppStoreSnapshotTests/test_4_Leaderboards.iPad_12_9.png
diff --git a/...hotTests/__Snapshots__/AppStoreSnapshotTests/test_4_Leaderboards.iPhone_5_5.png b/...hotTests/__Snapshots__/AppStoreSnapshotTests/test_4_Leaderboards.iPhone_5_5.png
diff --git a/...hotTests/__Snapshots__/AppStoreSnapshotTests/test_4_Leaderboards.iPhone_6_5.png b/...hotTests/__Snapshots__/AppStoreSnapshotTests/test_4_Leaderboards.iPhone_6_5.png
diff --git a/...toreSnapshotTests/__Snapshots__/AppStoreSnapshotTests/test_5_Home.iPad_12_9.png b/...toreSnapshotTests/__Snapshots__/AppStoreSnapshotTests/test_5_Home.iPad_12_9.png
diff --git a/...oreSnapshotTests/__Snapshots__/AppStoreSnapshotTests/test_5_Home.iPhone_5_5.png b/...oreSnapshotTests/__Snapshots__/AppStoreSnapshotTests/test_5_Home.iPhone_5_5.png
diff --git a/...oreSnapshotTests/__Snapshots__/AppStoreSnapshotTests/test_5_Home.iPhone_6_5.png b/...oreSnapshotTests/__Snapshots__/AppStoreSnapshotTests/test_5_Home.iPhone_6_5.png
diff --git a/...engeFeatureTests/__Snapshots__/DailyChallengeResultsViewTests/testDefault.1.png b/...engeFeatureTests/__Snapshots__/DailyChallengeResultsViewTests/testDefault.1.png
diff --git a/...ureTests/__Snapshots__/DailyChallengeResultsViewTests/testTimeScopeOpened.1.png b/...ureTests/__Snapshots__/DailyChallengeResultsViewTests/testTimeScopeOpened.1.png
diff --git a/...s/__Snapshots__/DailyChallengeResultsViewTests/testTimeScopeOpenedLoading.1.png b/...s/__Snapshots__/DailyChallengeResultsViewTests/testTimeScopeOpenedLoading.1.png
diff --git a/...lyChallengeFeatureTests/__Snapshots__/DailyChallengeViewTests/testDefault.1.png b/...lyChallengeFeatureTests/__Snapshots__/DailyChallengeViewTests/testDefault.1.png
diff --git a/...hots__/DailyChallengeViewTests/testTimedGamePlayed_UnlimitedGameResumable.1.png b/...hots__/DailyChallengeViewTests/testTimedGamePlayed_UnlimitedGameResumable.1.png
diff --git a/...CoreTests/__Snapshots__/CubeViewTests/testLetterSurfaceShaderBorderBuffer.1.png b/...CoreTests/__Snapshots__/CubeViewTests/testLetterSurfaceShaderBorderBuffer.1.png
diff --git a/...s/GameOverFeatureTests/__Snapshots__/GameOverViewTests/testDailyChallenge.1.png b/...s/GameOverFeatureTests/__Snapshots__/GameOverViewTests/testDailyChallenge.1.png
diff --git a/Tests/GameOverFeatureTests/__Snapshots__/GameOverViewTests/testSolo.1.png b/Tests/GameOverFeatureTests/__Snapshots__/GameOverViewTests/testSolo.1.png
diff --git a/Tests/GameOverFeatureTests/__Snapshots__/GameOverViewTests/testTurnBased.1.png b/Tests/GameOverFeatureTests/__Snapshots__/GameOverViewTests/testTurnBased.1.png
diff --git a/...tureTests/__Snapshots__/HomeViewTests/testActiveGames_DailyChallenge_Solo.1.png b/...tureTests/__Snapshots__/HomeViewTests/testActiveGames_DailyChallenge_Solo.1.png
diff --git a/.../HomeFeatureTests/__Snapshots__/HomeViewTests/testActiveGames_Multiplayer.1.png b/.../HomeFeatureTests/__Snapshots__/HomeViewTests/testActiveGames_Multiplayer.1.png
diff --git a/Tests/HomeFeatureTests/__Snapshots__/HomeViewTests/testActiveGames_StaleGame.1.png b/Tests/HomeFeatureTests/__Snapshots__/HomeViewTests/testActiveGames_StaleGame.1.png
diff --git a/Tests/HomeFeatureTests/__Snapshots__/HomeViewTests/testBasics.1.png b/Tests/HomeFeatureTests/__Snapshots__/HomeViewTests/testBasics.1.png
diff --git a/Tests/SettingsFeatureTests/__Snapshots__/SettingsViewTests/testAccessibility.1.png b/Tests/SettingsFeatureTests/__Snapshots__/SettingsViewTests/testAccessibility.1.png
diff --git a/Tests/SettingsFeatureTests/__Snapshots__/SettingsViewTests/testAppearance.1.png b/Tests/SettingsFeatureTests/__Snapshots__/SettingsViewTests/testAppearance.1.png
diff --git a/Tests/SettingsFeatureTests/__Snapshots__/SettingsViewTests/testBasics.1.png b/Tests/SettingsFeatureTests/__Snapshots__/SettingsViewTests/testBasics.1.png
diff --git a/Tests/SettingsFeatureTests/__Snapshots__/SettingsViewTests/testBasics.2.png b/Tests/SettingsFeatureTests/__Snapshots__/SettingsViewTests/testBasics.2.png
diff --git a/Tests/SettingsFeatureTests/__Snapshots__/SettingsViewTests/testBasics.3.png b/Tests/SettingsFeatureTests/__Snapshots__/SettingsViewTests/testBasics.3.png
diff --git a/Tests/SettingsFeatureTests/__Snapshots__/SettingsViewTests/testNotifications.1.png b/Tests/SettingsFeatureTests/__Snapshots__/SettingsViewTests/testNotifications.1.png
diff --git a/Tests/SettingsFeatureTests/__Snapshots__/SettingsViewTests/testNotifications.2.png b/Tests/SettingsFeatureTests/__Snapshots__/SettingsViewTests/testNotifications.2.png
diff --git a/Tests/SettingsFeatureTests/__Snapshots__/SettingsViewTests/testPurchases.1.png b/Tests/SettingsFeatureTests/__Snapshots__/SettingsViewTests/testPurchases.1.png
diff --git a/Tests/SettingsFeatureTests/__Snapshots__/SettingsViewTests/testPurchases.2.png b/Tests/SettingsFeatureTests/__Snapshots__/SettingsViewTests/testPurchases.2.png
diff --git a/Tests/SettingsFeatureTests/__Snapshots__/SettingsViewTests/testPurchases.3.png b/Tests/SettingsFeatureTests/__Snapshots__/SettingsViewTests/testPurchases.3.png
diff --git a/Tests/SettingsFeatureTests/__Snapshots__/SettingsViewTests/testSound.1.png b/Tests/SettingsFeatureTests/__Snapshots__/SettingsViewTests/testSound.1.png
diff --git a/Tests/SettingsFeatureTests/__Snapshots__/SettingsViewTests/testSound.2.png b/Tests/SettingsFeatureTests/__Snapshots__/SettingsViewTests/testSound.2.png
diff --git a/...tialFeatureTests/__Snapshots__/UpgradeInterstitialViewTests/testBeginning.1.png b/...tialFeatureTests/__Snapshots__/UpgradeInterstitialViewTests/testBeginning.1.png
diff --git a/...ureTests/__Snapshots__/UpgradeInterstitialViewTests/testCountdownComplete.1.png b/...ureTests/__Snapshots__/UpgradeInterstitialViewTests/testCountdownComplete.1.png