spacepandas · fbernutz · Dec 29, 2024 · Dec 29, 2024 · Dec 29, 2024 · Dec 29, 2024
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,13 +17,16 @@ jobs:
     - name: Set Xcode Version
       uses: maxim-lobanov/[email protected]
       with:
-        xcode-version: '16.1'
+        xcode-version: '16.2'
 
     - name: Checkout
       uses: actions/[email protected]
 
-    - name: Install Gem Dependencies
-      run: bundle install
+    - name: Set Ruby Version
+      uses: ruby/[email protected]
+      with:
+        ruby-version: '3.0.0'
+        bundler-cache: true
 
     - name: Run UnitTests
       run: bundle exec fastlane test
@@ -36,13 +39,16 @@ jobs:
     - name: Set Xcode Version
       uses: maxim-lobanov/[email protected]
       with:
-        xcode-version: '16.1'
+        xcode-version: '16.2'
 
     - name: Checkout
       uses: actions/[email protected]
 
-    - name: Install Gem Dependencies
-      run: bundle install
+    - name: Set Ruby Version
+      uses: ruby/[email protected]
+      with:
+        ruby-version: '3.0.0'
+        bundler-cache: true
 
     - name: Run SnapshotTests
       run: bundle exec fastlane snapshot_test
diff --git a/CineasteSnapshotTests/XCTestCase+SnapshotTests.swift b/CineasteSnapshotTests/XCTestCase+SnapshotTests.swift
@@ -26,7 +26,6 @@ import SnapshotTesting
 func assertThemedNavigationSnapshot(
     for themes: [UIUserInterfaceStyle] = [.light, .dark],
     matching value: UINavigationController,
-    named name: String? = nil,
     record recording: Bool = false,
     timeout: TimeInterval = 5,
     file: StaticString = #file,
@@ -69,7 +68,6 @@ func assertThemedViewSnapshot(
     for themes: [UIUserInterfaceStyle] = [.light, .dark],
     matching value: UIView,
     with size: CGSize? = nil,
-    named name: String? = nil,
     record recording: Bool = false,
     timeout: TimeInterval = 5,
     file: StaticString = #file,
@@ -95,15 +93,20 @@ func assertThemedViewSnapshot(
 }
 
 /// Asserts that a given value matches a reference on disk.
-/// This overload makes two snapshots with "Light" and "Dark" user interface style in a UIViewController on a iPhoneX device (with safe areas).
+/// This overload makes two snapshots with "Light" and "Dark" user interface style in a UIViewController on a iPhoneSE device.
 ///
 /// - Parameters:
 ///
 ///   - themes: An array of UIUserInterfaceStyle you want to test.
 ///   - value: A value to compare against a reference.
 func assertThemedLandscapeViewControllerSnapshot(
     for themes: [UIUserInterfaceStyle] = [.light, .dark],
-    matching value: UIViewController
+    matching value: UIViewController,
+    record recording: Bool = false,
+    timeout: TimeInterval = 5,
+    file: StaticString = #file,
+    testName: String = #function,
+    line: UInt = #line
 ) {
     enforceSnapshotDevice()
 
@@ -114,21 +117,21 @@ func assertThemedLandscapeViewControllerSnapshot(
             matching: value,
             as: .image(on: .iPhoneSe(.landscape), precision: 0.99),
             named: "landscape-\(theme.displayName)",
-            record: false,
-            timeout: 5,
-            file: #file,
-            testName: #function,
-            line: #line
+            record: recording,
+            timeout: timeout,
+            file: file,
+            testName: testName,
+            line: line
         )
     }
 }
 
 private func enforceSnapshotDevice() {
     let is2xDevice = UIScreen.main.scale == 2
-    let isVersion17 = ProcessInfo().operatingSystemVersion.majorVersion == 17
+    let isVersion18 = ProcessInfo().operatingSystemVersion.majorVersion == 18
 
-    guard is2xDevice, isVersion17 else {
-        fatalError("Running device should have @2x screen scale (like iPhone SE) and iOS17.")
+    guard is2xDevice, isVersion18 else {
+        fatalError("Running device should have @2x screen scale (like iPhone SE) and iOS18.")
     }
 }
 

diff --git a/...apshots__/MovieDetailViewControllerSnapshotTests/testGeneralAppearance.Dark.png b/...apshots__/MovieDetailViewControllerSnapshotTests/testGeneralAppearance.Dark.png
diff --git a/...pshots__/MovieDetailViewControllerSnapshotTests/testGeneralAppearance.Light.png b/...pshots__/MovieDetailViewControllerSnapshotTests/testGeneralAppearance.Light.png
diff --git a/...__/MovieDetailViewControllerSnapshotTests/testWatchlistMovieAppearance.Dark.png b/...__/MovieDetailViewControllerSnapshotTests/testWatchlistMovieAppearance.Dark.png
diff --git a/..._/MovieDetailViewControllerSnapshotTests/testWatchlistMovieAppearance.Light.png b/..._/MovieDetailViewControllerSnapshotTests/testWatchlistMovieAppearance.Light.png
diff --git a/...tailViewControllerSnapshotTests/testWatchlistMovieAppearance.landscape-Dark.png b/...tailViewControllerSnapshotTests/testWatchlistMovieAppearance.landscape-Dark.png
diff --git a/...ailViewControllerSnapshotTests/testWatchlistMovieAppearance.landscape-Light.png b/...ailViewControllerSnapshotTests/testWatchlistMovieAppearance.landscape-Light.png
diff --git a/...ts/__Snapshots__/MoviesViewControllerSnapshotTests/testEmptyAppearance.Dark.png b/...ts/__Snapshots__/MoviesViewControllerSnapshotTests/testEmptyAppearance.Dark.png
diff --git a/...s/__Snapshots__/MoviesViewControllerSnapshotTests/testEmptyAppearance.Light.png b/...s/__Snapshots__/MoviesViewControllerSnapshotTests/testEmptyAppearance.Light.png
diff --git a/...ts__/MoviesViewControllerSnapshotTests/testGeneralAppearanceForHistory.Dark.png b/...ts__/MoviesViewControllerSnapshotTests/testGeneralAppearanceForHistory.Dark.png
diff --git a/...s__/MoviesViewControllerSnapshotTests/testGeneralAppearanceForHistory.Light.png b/...s__/MoviesViewControllerSnapshotTests/testGeneralAppearanceForHistory.Light.png
diff --git a/...__/MoviesViewControllerSnapshotTests/testGeneralAppearanceForWatchlist.Dark.png b/...__/MoviesViewControllerSnapshotTests/testGeneralAppearanceForWatchlist.Dark.png
diff --git a/..._/MoviesViewControllerSnapshotTests/testGeneralAppearanceForWatchlist.Light.png b/..._/MoviesViewControllerSnapshotTests/testGeneralAppearanceForWatchlist.Light.png
diff --git a/.../__Snapshots__/PosterViewControllerSnapshotTests/testGeneralAppearance.Dark.png b/.../__Snapshots__/PosterViewControllerSnapshotTests/testGeneralAppearance.Dark.png
diff --git a/...__Snapshots__/PosterViewControllerSnapshotTests/testGeneralAppearance.Light.png b/...__Snapshots__/PosterViewControllerSnapshotTests/testGeneralAppearance.Light.png
diff --git a/...otTests/__Snapshots__/SearchMoviesCellSnapshotTests/testSeenAppearance.Dark.png b/...otTests/__Snapshots__/SearchMoviesCellSnapshotTests/testSeenAppearance.Dark.png
diff --git a/...tTests/__Snapshots__/SearchMoviesCellSnapshotTests/testSeenAppearance.Light.png b/...tTests/__Snapshots__/SearchMoviesCellSnapshotTests/testSeenAppearance.Light.png
diff --git a/...ts/__Snapshots__/SearchMoviesCellSnapshotTests/testUndefinedAppearance.Dark.png b/...ts/__Snapshots__/SearchMoviesCellSnapshotTests/testUndefinedAppearance.Dark.png
diff --git a/...s/__Snapshots__/SearchMoviesCellSnapshotTests/testUndefinedAppearance.Light.png b/...s/__Snapshots__/SearchMoviesCellSnapshotTests/testUndefinedAppearance.Light.png
diff --git a/...ts/__Snapshots__/SearchMoviesCellSnapshotTests/testWatchlistAppearance.Dark.png b/...ts/__Snapshots__/SearchMoviesCellSnapshotTests/testWatchlistAppearance.Dark.png
diff --git a/...s/__Snapshots__/SearchMoviesCellSnapshotTests/testWatchlistAppearance.Light.png b/...s/__Snapshots__/SearchMoviesCellSnapshotTests/testWatchlistAppearance.Light.png
diff --git a/...hots__/SearchMoviesCellSnapshotTests/testWatchlistComingSoonAppearance.Dark.png b/...hots__/SearchMoviesCellSnapshotTests/testWatchlistComingSoonAppearance.Dark.png
diff --git a/...ots__/SearchMoviesCellSnapshotTests/testWatchlistComingSoonAppearance.Light.png b/...ots__/SearchMoviesCellSnapshotTests/testWatchlistComingSoonAppearance.Light.png
diff --git a/...pshots__/SearchMoviesViewControllerSnapshotTests/testLoadingAppearance.Dark.png b/...pshots__/SearchMoviesViewControllerSnapshotTests/testLoadingAppearance.Dark.png
diff --git a/...shots__/SearchMoviesViewControllerSnapshotTests/testLoadingAppearance.Light.png b/...shots__/SearchMoviesViewControllerSnapshotTests/testLoadingAppearance.Light.png
diff --git a/...otTests/__Snapshots__/SeenMovieCellSnapshotTests/testGeneralAppearance.Dark.png b/...otTests/__Snapshots__/SeenMovieCellSnapshotTests/testGeneralAppearance.Dark.png
diff --git a/...tTests/__Snapshots__/SeenMovieCellSnapshotTests/testGeneralAppearance.Light.png b/...tTests/__Snapshots__/SeenMovieCellSnapshotTests/testGeneralAppearance.Light.png
diff --git a/...hots__/SettingsDetailViewControllerSnapshotTests/testGeneralAppearance.Dark.png b/...hots__/SettingsDetailViewControllerSnapshotTests/testGeneralAppearance.Dark.png
diff --git a/...ots__/SettingsDetailViewControllerSnapshotTests/testGeneralAppearance.Light.png b/...ots__/SettingsDetailViewControllerSnapshotTests/testGeneralAppearance.Light.png
diff --git a/..._Snapshots__/SettingsViewControllerSnapshotTests/testGeneralAppearance.Dark.png b/..._Snapshots__/SettingsViewControllerSnapshotTests/testGeneralAppearance.Dark.png
diff --git a/...Snapshots__/SettingsViewControllerSnapshotTests/testGeneralAppearance.Light.png b/...Snapshots__/SettingsViewControllerSnapshotTests/testGeneralAppearance.Light.png
diff --git a/...ts/__Snapshots__/WatchlistMovieCellSnapshotTests/testGeneralAppearance.Dark.png b/...ts/__Snapshots__/WatchlistMovieCellSnapshotTests/testGeneralAppearance.Dark.png
diff --git a/...s/__Snapshots__/WatchlistMovieCellSnapshotTests/testGeneralAppearance.Light.png b/...s/__Snapshots__/WatchlistMovieCellSnapshotTests/testGeneralAppearance.Light.png
diff --git a/...sts/assertThemedLandscapeViewControllerSnapshot-for-matching.landscape-Dark.png b/...sts/assertThemedLandscapeViewControllerSnapshot-for-matching.landscape-Dark.png
diff --git a/...ts/assertThemedLandscapeViewControllerSnapshot-for-matching.landscape-Light.png b/...ts/assertThemedLandscapeViewControllerSnapshot-for-matching.landscape-Light.png
diff --git a/CineasteUITests/ScreenshotsUITests.swift b/CineasteUITests/ScreenshotsUITests.swift
@@ -28,13 +28,11 @@ class ScreenshotsUITests: XCTestCase {
             //            "-UIPreferredContentSizeCategoryName",
             //            "UICTContentSizeCategoryL"
         ]
-
-        Task {
-            await setupSnapshot(self.app, waitForAnimations: true)
-        }
     }
 
+    @MainActor
     func testScreenshots() {
+        setupSnapshot(app, waitForAnimations: true)
         app.launch()
 
         resetMoviesIfNeeded()
@@ -106,10 +104,12 @@ class ScreenshotsUITests: XCTestCase {
         }
     }
 
+    @MainActor
     func testScreenshotsOfSearchWithDarkMode() {
         app.launchArguments += [
             "UI_TEST_DARK_MODE"
         ]
+        setupSnapshot(app, waitForAnimations: true)
         app.launch()
 
         screenshotSearchWithMarkers()
@@ -180,10 +180,8 @@ extension ScreenshotsUITests {
         }
     }
 
-    private func namedSnapshot(_ name: String) {
-        Task {
-            await snapshot(snapshotName(for: name), timeWaitingForIdle: 0)
-        }
+    @MainActor private func namedSnapshot(_ name: String) {
+        snapshot(snapshotName(for: name), timeWaitingForIdle: 0)
     }
 
     private func snapshotName(for name: String) -> String {