From 84a3ffc13501d5609ec074bc6e88a4694a30d848 Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Wed, 11 Sep 2024 14:11:29 +0300 Subject: [PATCH] Require a specific snapshotting device minor OS version when running PreviewTests --- PreviewTests/Sources/PreviewTests.swift | 10 ++++------ Tools/Sourcery/PreviewTests.stencil | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/PreviewTests/Sources/PreviewTests.swift b/PreviewTests/Sources/PreviewTests.swift index 650e537d3..e5be4bc5a 100644 --- a/PreviewTests/Sources/PreviewTests.swift +++ b/PreviewTests/Sources/PreviewTests.swift @@ -15,7 +15,7 @@ import SwiftUI class PreviewTests: XCTestCase { private let deviceConfig: ViewImageConfig = .iPhoneX private var simulatorDevice: String? = "iPhone14,6" // iPhone SE 3rd Generation - private var requiredOSVersion: Int? = 17 + private var requiredOSVersion = (major: 17, minor: 5) private let snapshotDevices = ["iPhone 15", "iPad"] override func setUp() { @@ -1084,11 +1084,9 @@ class PreviewTests: XCTestCase { } } - if let requiredOSVersion { - let osVersion = ProcessInfo().operatingSystemVersion - guard osVersion.majorVersion == requiredOSVersion else { - fatalError("Switch to iOS \(requiredOSVersion) for these tests.") - } + let osVersion = ProcessInfo().operatingSystemVersion + guard osVersion.majorVersion == requiredOSVersion.major, osVersion.minorVersion == requiredOSVersion.minor else { + fatalError("Switch to iOS \(requiredOSVersion) for these tests.") } } } diff --git a/Tools/Sourcery/PreviewTests.stencil b/Tools/Sourcery/PreviewTests.stencil index daa1ee5f3..f8759a2a1 100644 --- a/Tools/Sourcery/PreviewTests.stencil +++ b/Tools/Sourcery/PreviewTests.stencil @@ -25,7 +25,7 @@ import {{ import }} class PreviewTests: XCTestCase { private let deviceConfig: ViewImageConfig = .iPhoneX private var simulatorDevice: String? = "iPhone14,6" // iPhone SE 3rd Generation - private var requiredOSVersion: Int? = 17 + private var requiredOSVersion = (major: 17, minor: 5) private let snapshotDevices = ["iPhone 15", "iPad"] @@ -163,11 +163,9 @@ class PreviewTests: XCTestCase { } } - if let requiredOSVersion { - let osVersion = ProcessInfo().operatingSystemVersion - guard osVersion.majorVersion == requiredOSVersion else { - fatalError("Switch to iOS \(requiredOSVersion) for these tests.") - } + let osVersion = ProcessInfo().operatingSystemVersion + guard osVersion.majorVersion == requiredOSVersion.major, osVersion.minorVersion == requiredOSVersion.minor else { + fatalError("Switch to iOS \(requiredOSVersion) for these tests.") } } }