👩‍🔬 [Investment Day] - Test Suite Cleanup

Kickstarter-iOS/ViewModels/RootViewModel.swift

@@ -133,7 +133,7 @@ internal protocol RootViewModelInputs {
   /// Call from the controller's `viewDidLoad` method.
   func viewDidLoad()
 
-  /// Call when voice over is enabled or disabled
+  /// Call when VoiceOver is enabled or disabled
   func voiceOverStatusDidChange()
 }
 

Kickstarter-iOS/Views/Controllers/MessageBannerViewController.swift

@@ -114,7 +114,7 @@ final class MessageBannerViewController: UIViewController, NibLoading {
         guard let self = self else { return }
 
         if isHidden {
-          // Tells Voice Over to resign focus of the message banner.
+          // Tells VoiceOver to resign focus of the message banner.
           // This causes the reader to focus on the previously selected element.
           if AppEnvironment.current.isVoiceOverRunning() {
             UIAccessibility.post(notification: UIAccessibility.Notification.layoutChanged, argument: nil)
@@ -130,7 +130,7 @@ final class MessageBannerViewController: UIViewController, NibLoading {
         self?.viewModel.inputs.bannerViewAnimationFinished(isHidden: isHidden)
 
         if !isHidden {
-          // Tells Voice Over to focus on the message banner.
+          // Tells VoiceOver to focus on the message banner.
           // This causes the reader to read the message and allows the user to dismiss the banner.
           if AppEnvironment.current.isVoiceOverRunning() {
             UIAccessibility.post(

Kickstarter-iOS/Views/FundingGraphViewTests.swift

@@ -128,8 +128,8 @@ private let project = .template
 
 private func fundingStats(forProject project: Project, pledgeValues: [Int])
   -> [ProjectStatsEnvelope.FundingDateStats] {
-  return pledgeValues.enumerated().map { idx, pledged in
-    .template
+  return pledgeValues.enumerated().map { (idx: Int, pledged: Int) in
+    ProjectStatsEnvelope.FundingDateStats.template
       |> ProjectStatsEnvelope.FundingDateStats.lens.cumulativePledged .~ pledged
       |> ProjectStatsEnvelope.FundingDateStats.lens.date
       .~ (project.dates.launchedAt + TimeInterval(idx * 60 * 60 * 24))

Library/AppEnvironment.swift

@@ -125,7 +125,7 @@ public struct AppEnvironment: AppEnvironmentType {
     dateType: DateProtocol.Type = AppEnvironment.current.dateType,
     debounceInterval: DispatchTimeInterval = AppEnvironment.current.debounceInterval,
     device: UIDeviceType = AppEnvironment.current.device,
-    isOSVersionAvailable: @escaping ((Double) -> Bool) = AppEnvironment.current.isOSVersionAvailable,
+    is1PasswordSupported: @escaping (() -> Bool) = AppEnvironment.current.is1PasswordSupported,
     isVoiceOverRunning: @escaping (() -> Bool) = AppEnvironment.current.isVoiceOverRunning,
     koala: Koala = AppEnvironment.current.koala,
     language: Language = AppEnvironment.current.language,
@@ -153,7 +153,7 @@ public struct AppEnvironment: AppEnvironmentType {
         dateType: dateType,
         debounceInterval: debounceInterval,
         device: device,
-        isOSVersionAvailable: isOSVersionAvailable,
+        is1PasswordSupported: is1PasswordSupported,
         isVoiceOverRunning: isVoiceOverRunning,
         koala: koala,
         language: language,
@@ -185,7 +185,7 @@ public struct AppEnvironment: AppEnvironmentType {
     dateType: DateProtocol.Type = AppEnvironment.current.dateType,
     debounceInterval: DispatchTimeInterval = AppEnvironment.current.debounceInterval,
     device: UIDeviceType = AppEnvironment.current.device,
-    isOSVersionAvailable: @escaping ((Double) -> Bool) = AppEnvironment.current.isOSVersionAvailable,
+    is1PasswordSupported: @escaping (() -> Bool) = AppEnvironment.current.is1PasswordSupported,
     isVoiceOverRunning: @escaping (() -> Bool) = AppEnvironment.current.isVoiceOverRunning,
     koala: Koala = AppEnvironment.current.koala,
     language: Language = AppEnvironment.current.language,
@@ -213,7 +213,7 @@ public struct AppEnvironment: AppEnvironmentType {
         dateType: dateType,
         debounceInterval: debounceInterval,
         device: device,
-        isOSVersionAvailable: isOSVersionAvailable,
+        is1PasswordSupported: is1PasswordSupported,
         isVoiceOverRunning: isVoiceOverRunning,
         koala: koala,
         language: language,

Library/Environment.swift

@@ -55,10 +55,10 @@ public struct Environment {
   /// The environment variables
   public let environmentVariables: EnvironmentVariables
 
-  /// A function that returns whether a specific OS version is available
-  public let isOSVersionAvailable: (Double) -> Bool
+  /// A function that returns whether 1Password extension is supported.
+  public let is1PasswordSupported: () -> Bool
 
-  /// A function that returns whether voice over mode is running.
+  /// A function that returns whether VoiceOver mode is running.
   public let isVoiceOverRunning: () -> Bool
 
   /// A type that exposes endpoints for tracking various Kickstarter events.
@@ -108,7 +108,7 @@ public struct Environment {
     debounceInterval: DispatchTimeInterval = .milliseconds(300),
     device: UIDeviceType = UIDevice.current,
     environmentVariables: EnvironmentVariables = EnvironmentVariables(),
-    isOSVersionAvailable: @escaping (Double) -> Bool = ksr_isOSVersionAvailable,
+    is1PasswordSupported: @escaping () -> Bool = { ksr_is1PasswordSupported() },
     isVoiceOverRunning: @escaping () -> Bool = { UIAccessibility.isVoiceOverRunning },
     koala: Koala = Koala(client: KoalaTrackingClient(endpoint: .production)),
     language: Language = Language(languageStrings: Locale.preferredLanguages) ?? Language.en,
@@ -135,7 +135,7 @@ public struct Environment {
     self.debounceInterval = debounceInterval
     self.device = device
     self.environmentVariables = environmentVariables
-    self.isOSVersionAvailable = isOSVersionAvailable
+    self.is1PasswordSupported = is1PasswordSupported
     self.isVoiceOverRunning = isVoiceOverRunning
     self.koala = koala
     self.language = language

Library/Koala/KoalaTests.swift

@@ -50,19 +50,15 @@ final class KoalaTests: TestCase {
     let client = MockTrackingClient()
     let koala = Koala(client: client)
 
-    var isVoiceOverRunning = { true }
-
-    withEnvironment(isVoiceOverRunning: isVoiceOverRunning) {
+    withEnvironment(isVoiceOverRunning: { true }) {
       koala.trackAppOpen()
 
       let properties = client.properties.last
 
       XCTAssertEqual(true, properties?["is_voiceover_running"] as? Bool)
     }
 
-    isVoiceOverRunning = { false }
-
-    withEnvironment(isVoiceOverRunning: isVoiceOverRunning) {
+    withEnvironment(isVoiceOverRunning: { false }) {
       koala.trackAppOpen()
 
       let properties = client.properties.last

Library/SharedFunctions.swift

@@ -152,22 +152,18 @@ public func countdownProducer(to date: Date)
 }
 
 internal func is1PasswordButtonHidden(_ isHidden: Bool) -> Bool {
-  if AppEnvironment.current.isOSVersionAvailable(12.0) {
+  if AppEnvironment.current.is1PasswordSupported() {
     return true
   } else {
     return isHidden
   }
 }
 
-public func ksr_isOSVersionAvailable(_ version: Double) -> Bool {
-  switch version {
-  case 12.0...:
-    if #available(iOS 12.0, *) { return true }
-  default:
-    assertionFailure("OS version-check not supported")
+public func ksr_is1PasswordSupported() -> Bool {
+  if #available(iOS 12.0, *) {
+    return false
   }
-
-  return false
+  return true
 }
 
 public func updatedUserWithClearedActivityCountProducer() -> SignalProducer<User, Never> {

Library/SharedFunctionsTests.swift

@@ -162,26 +162,17 @@ final class SharedFunctionsTests: TestCase {
   }
 
   func testOnePasswordButtonIsHidden() {
-    var iOS12: (Double) -> Bool = { _ in true }
-    withEnvironment(isOSVersionAvailable: iOS12) {
+    withEnvironment(is1PasswordSupported: { true }) {
       XCTAssertTrue(is1PasswordButtonHidden(true))
       XCTAssertTrue(is1PasswordButtonHidden(false))
     }
 
-    iOS12 = { _ in false }
-    withEnvironment(isOSVersionAvailable: iOS12) {
+    withEnvironment(is1PasswordSupported: { false }) {
       XCTAssertTrue(is1PasswordButtonHidden(true))
       XCTAssertFalse(is1PasswordButtonHidden(false))
     }
   }
 
-  func testIsOSVersionAvailable_Supports_iOS12() {
-    XCTAssertTrue(ksr_isOSVersionAvailable(12.0))
-    XCTAssertTrue(ksr_isOSVersionAvailable(12.1))
-    XCTAssertTrue(ksr_isOSVersionAvailable(12.123))
-    XCTAssertTrue(ksr_isOSVersionAvailable(12.9))
-  }
-
   func testUpdatedUserWithClearedActivityCountProducer_Success() {
     let initialActivitiesCount = 100
     let values = TestObserver<User, Never>()

Library/TestHelpers/DispatchTimeInterval-Extensions.swift

@@ -14,6 +14,8 @@ extension DispatchTimeInterval {
         return .nanoseconds(Int(Float(interval) * scale))
       case .never:
         return .never
+      @unknown default:
+        fatalError()
       }
     #else
       switch self {
@@ -46,6 +48,8 @@ extension DispatchTimeInterval {
         return Int64(ns)
       case .never:
         return Int64(0)
+      @unknown default:
+        fatalError()
       }
     #else
       switch self {

Library/TestHelpers/TestCase.swift

@@ -21,6 +21,14 @@ internal class TestCase: FBSnapshotTestCase {
   internal let ubiquitousStore = MockKeyValueStore()
   internal let userDefaults = MockKeyValueStore()
 
+  override var recordMode: Bool {
+    willSet(newValue) {
+      if newValue {
+        preferredSimulatorCheck()
+      }
+    }
+  }
+
   override func setUp() {
     super.setUp()
 
@@ -33,8 +41,6 @@ internal class TestCase: FBSnapshotTestCase {
     // swiftlint:disable:next force_unwrapping
     calendar.timeZone = TimeZone(identifier: "GMT")!
 
-    let isVoiceOverRunning = { false }
-    let isOSVersionAvailable: (Double) -> Bool = { _ in true }
     AppEnvironment.pushEnvironment(
       apiService: self.apiService,
       apiDelayInterval: .seconds(0),
@@ -49,8 +55,8 @@ internal class TestCase: FBSnapshotTestCase {
       dateType: self.dateType,
       debounceInterval: .seconds(0),
       device: MockDevice(),
-      isOSVersionAvailable: isOSVersionAvailable,
-      isVoiceOverRunning: isVoiceOverRunning,
+      is1PasswordSupported: { true },
+      isVoiceOverRunning: { false },
       koala: Koala(client: self.trackingClient, loggedInUser: nil),
       language: .en,
       launchedCountries: .init(),
@@ -71,11 +77,10 @@ internal class TestCase: FBSnapshotTestCase {
 }
 
 internal func preferredSimulatorCheck() {
-  guard
-    let identifier = ProcessInfo().environment["SIMULATOR_MODEL_IDENTIFIER"],
-    ["iPhone10,1", "iPhone10,4"].contains(identifier),
-    AppEnvironment.current.isOSVersionAvailable(12)
-  else {
+  let supportedModels = ["iPhone10,1", "iPhone10,4"] // iPhone 8
+  let modelKey = "SIMULATOR_MODEL_IDENTIFIER"
+
+  guard #available(iOS 12.0, *), supportedModels.contains(ProcessInfo().environment[modelKey] ?? "") else {
     fatalError("Please only test and record screenshots on an iPhone 8 simulator running iOS 12")
   }
 }

Library/TestHelpers/XCTestCase+AppEnvironment.swift

@@ -27,7 +27,7 @@ extension XCTestCase {
     dateType: DateProtocol.Type = AppEnvironment.current.dateType,
     debounceInterval: DispatchTimeInterval = AppEnvironment.current.debounceInterval,
     device: UIDeviceType = AppEnvironment.current.device,
-    isOSVersionAvailable: @escaping (Double) -> Bool = AppEnvironment.current.isOSVersionAvailable,
+    is1PasswordSupported: @escaping () -> Bool = AppEnvironment.current.is1PasswordSupported,
     isVoiceOverRunning: @escaping () -> Bool = AppEnvironment.current.isVoiceOverRunning,
     koala: Koala = AppEnvironment.current.koala,
     language: Language = AppEnvironment.current.language,
@@ -55,7 +55,7 @@ extension XCTestCase {
         dateType: dateType,
         debounceInterval: debounceInterval,
         device: device,
-        isOSVersionAvailable: isOSVersionAvailable,
+        is1PasswordSupported: is1PasswordSupported,
         isVoiceOverRunning: isVoiceOverRunning,
         koala: koala,
         language: language,

Library/ViewModels/ActivitySampleProjectCellViewModel.swift

@@ -12,7 +12,7 @@ public protocol ActivitySampleProjectCellViewModelInputs {
 }
 
 public protocol ActivitySampleProjectCellViewModelOutputs {
-  /// Emits the cell accessibility hint for voiceover.
+  /// Emits the cell accessibility hint for VoiceOver.
   var cellAccessibilityHint: Signal<String, Never> { get }
 
   /// Emits when should go to activities screen.

Library/ViewModels/ActivityUpdateViewModel.swift

@@ -14,13 +14,13 @@ public protocol ActivityUpdateViewModelOutputs {
   /// Emits the update's body to be displayed.
   var body: Signal<String, Never> { get }
 
-  /// Emits the cell's accessibility label to be read by voiceover.
+  /// Emits the cell's accessibility label to be read by VoiceOver.
   var cellAccessibilityLabel: Signal<String, Never> { get }
 
   /// Emits when we should notify the delegate that the project image button was tapped.
   var notifyDelegateTappedProjectImage: Signal<Activity, Never> { get }
 
-  /// Emits the project button's accessibility label to be read by voiceover.
+  /// Emits the project button's accessibility label to be read by VoiceOver.
   var projectButtonAccessibilityLabel: Signal<String, Never> { get }
 
   /// Emits the project image URL to be displayed.

Library/ViewModels/BackingCellViewModelTests.swift

@@ -54,8 +54,7 @@ internal final class BackingCellViewModelTests: TestCase {
     let reward = .template |> Reward.lens.estimatedDeliveryOn .~ Date().timeIntervalSince1970
     let backing = .template |> Backing.lens.reward .~ reward
 
-    let isVoiceOverRunning = { true }
-    withEnvironment(isVoiceOverRunning: isVoiceOverRunning) {
+    withEnvironment(isVoiceOverRunning: { true }) {
       self.vm.inputs.configureWith(backing: backing, project: Project.template, isFromBacking: true)
 
       self.rootStackViewAlignment.assertValues([UIStackView.Alignment.fill])

Library/ViewModels/ChangeEmailViewModelTests.swift

@@ -114,8 +114,7 @@ final class ChangeEmailViewModelTests: TestCase {
   func testOnePasswordButtonHidesProperly_OnIOS11AndEarlier() {
     self.vm.inputs.viewDidLoad()
 
-    let iOS12: (Double) -> Bool = { _ in false }
-    withEnvironment(isOSVersionAvailable: iOS12) {
+    withEnvironment(is1PasswordSupported: { false }) {
       self.vm.inputs.onePassword(isAvailable: true)
 
       self.onePasswordButtonIsHidden.assertValues([false])
@@ -129,8 +128,7 @@ final class ChangeEmailViewModelTests: TestCase {
   func testOnePasswordButtonHidesProperly_OnIOS12AndLater() {
     self.vm.inputs.viewDidLoad()
 
-    let iOS12: (Double) -> Bool = { _ in true }
-    withEnvironment(isOSVersionAvailable: iOS12) {
+    withEnvironment(is1PasswordSupported: { true }) {
       self.vm.inputs.onePassword(isAvailable: true)
 
       self.onePasswordButtonIsHidden.assertValues([true])

Library/ViewModels/ChangePasswordViewModelTests.swift

@@ -94,8 +94,7 @@ final class ChangePasswordViewModelTests: TestCase {
   }
 
   func testOnePasswordButtonHidesProperly_OnIOS11AndEarlier() {
-    let iOS12: (Double) -> Bool = { _ in false }
-    withEnvironment(isOSVersionAvailable: iOS12) {
+    withEnvironment(is1PasswordSupported: { false }) {
       self.vm.inputs.onePassword(isAvailable: true)
 
       self.onePasswordButtonIsHidden.assertValues([false])
@@ -107,8 +106,7 @@ final class ChangePasswordViewModelTests: TestCase {
   }
 
   func testOnePasswordButtonHidesProperly_OnIOS12AndLater() {
-    let iOS12: (Double) -> Bool = { _ in true }
-    withEnvironment(isOSVersionAvailable: iOS12) {
+    withEnvironment(is1PasswordSupported: { true }) {
       self.vm.inputs.onePassword(isAvailable: true)
 
       self.onePasswordButtonIsHidden.assertValues([true])
@@ -121,9 +119,8 @@ final class ChangePasswordViewModelTests: TestCase {
 
   func testOnePasswordAutofill() {
     let mockService = MockService(serverConfig: ServerConfig.local)
-    let iOS12: (Double) -> Bool = { _ in false }
 
-    withEnvironment(apiService: mockService, isOSVersionAvailable: iOS12) {
+    withEnvironment(apiService: mockService, is1PasswordSupported: { false }) {
       self.vm.inputs.onePassword(isAvailable: true)
       self.vm.inputs.viewDidAppear()
 
@@ -141,9 +138,7 @@ final class ChangePasswordViewModelTests: TestCase {
   }
 
   func testValidationErrors_VoiceOverON() {
-    let isVoiceOverRunning = { true }
-
-    withEnvironment(isVoiceOverRunning: isVoiceOverRunning) {
+    withEnvironment(isVoiceOverRunning: { true }) {
       self.vm.inputs.viewDidAppear()
       self.validationErrorLabelIsHidden.assertValues([true])
       self.validationErrorLabelMessage.assertValues([""])
@@ -251,9 +246,7 @@ final class ChangePasswordViewModelTests: TestCase {
   }
 
   func testValidationErrors_VoiceOverOFF() {
-    let isVoiceOverRunning = { false }
-
-    withEnvironment(isVoiceOverRunning: isVoiceOverRunning) {
+    withEnvironment(isVoiceOverRunning: { false }) {
       self.vm.inputs.viewDidAppear()
       self.validationErrorLabelIsHidden.assertValues([true])
       self.validationErrorLabelMessage.assertValues([""])