Last batch of fixes

BrowserKit/Sources/Shared/DeferredUtils.swift

@@ -4,7 +4,7 @@
 
 import Foundation
 
-public func deferMaybe<T>(_ s: T) -> Deferred<Maybe<T>> {
+public func deferMaybe<T: Sendable>(_ s: T) -> Deferred<Maybe<T>> {
     return Deferred(value: Maybe(success: s))
 }
 
@@ -14,7 +14,7 @@ public func deferMaybe(_ s: String) -> Deferred<Maybe<String>> {
     return Deferred(value: Maybe(success: s))
 }
 
-public func deferMaybe<T>(_ e: MaybeErrorType) -> Deferred<Maybe<T>> {
+public func deferMaybe<T: Sendable>(_ e: MaybeErrorType) -> Deferred<Maybe<T>> {
     return Deferred(value: Maybe(failure: e))
 }
 

firefox-ios/Tuist/ProjectDescriptionHelpers/Targets+Tests.swift

@@ -51,6 +51,7 @@ public enum TestTargets {
                 .package(product: "Fuzi"),
                 .package(product: "GCDWebServers"),
                 .package(product: "Kingfisher"),
+                .package(product: "Shared"),
                 .package(product: "SiteImageView"),
                 .package(product: "TabDataStore"),
                 .sdk(name: "z", type: .library),
@@ -239,6 +240,7 @@ public enum TestTargets {
                 .package(product: "Common"),
                 .package(product: "Fuzi"),
                 .package(product: "GCDWebServers"),
+                .package(product: "Shared"),
                 .package(product: "SiteImageView"),
                 .package(product: "SnowplowTracker"),
                 .package(product: "TabDataStore"),

firefox-ios/firefox-ios-tests/Tests/ClientTests/Mocks/MockNotificationManager.swift

@@ -6,15 +6,22 @@ import Foundation
 @testable import Client
 
 class MockNotificationManager: NotificationManagerProtocol {
-    let wasAuthorizationSuccessful = true
+    var shouldGrantPermission = true
+    var requestAuthorizationCalled = false
+
     func requestAuthorization(completion: @escaping @Sendable (Bool, Error?) -> Void) {
+        requestAuthorizationCalled = true
+        completion(shouldGrantPermission, nil)
     }
 
     func requestAuthorization(completion: @escaping @Sendable (Result<Bool, Error>) -> Void) {
+        requestAuthorizationCalled = true
+        completion(.success(shouldGrantPermission))
     }
 
     func requestAuthorization() async throws -> Bool {
-        return wasAuthorizationSuccessful
+        requestAuthorizationCalled = true
+        return shouldGrantPermission
     }
 
     func getNotificationSettings(sendTelemetry: Bool) async -> UNNotificationSettings {

firefox-ios/firefox-ios-tests/Tests/ClientTests/OnboardingTests/Helpers/NimbusOnboardingTestingConfigUtility.swift

@@ -65,7 +65,8 @@ struct NimbusOnboardingTestingConfigUtility {
         withSecondaryButton: Bool = false,
         withPrimaryButtonAction primaryAction: [OnboardingActions] = [.forwardOneCard],
         prerequisites: [String] = ["ALWAYS"],
-        disqualifiers: [String] = []
+        disqualifiers: [String] = [],
+        uiVariant: OnboardingVariant? = nil
     ) {
         let cards = createCards(
             numbering: primaryAction.count,
@@ -76,7 +77,8 @@ struct NimbusOnboardingTestingConfigUtility {
             withSecondaryButton: withSecondaryButton,
             primaryButtonAction: primaryAction,
             prerequisites: prerequisites,
-            disqualifiers: disqualifiers)
+            disqualifiers: disqualifiers,
+            uiVariant: uiVariant)
 
         FxNimbus.shared.features.onboardingFrameworkFeature.with(initializer: { _, _ in
             OnboardingFrameworkFeature(
@@ -95,7 +97,8 @@ struct NimbusOnboardingTestingConfigUtility {
         withSecondaryButton: Bool,
         primaryButtonAction: [OnboardingActions],
         prerequisites: [String],
-        disqualifiers: [String]
+        disqualifiers: [String],
+        uiVariant: OnboardingVariant? = nil
     ) -> [String: NimbusOnboardingCardData] {
         var dictionary = [String: NimbusOnboardingCardData]()
 
@@ -113,7 +116,8 @@ struct NimbusOnboardingTestingConfigUtility {
                 onboardingType: onboardingType,
                 order: number,
                 prerequisites: prerequisites,
-                title: "\(CardElementNames.title) \(number)")
+                title: "\(CardElementNames.title) \(number)",
+                uiVariant: uiVariant)
         }
 
         return dictionary

firefox-ios/firefox-ios-tests/Tests/ClientTests/OnboardingTests/NimbusOnboardingFeatureLayerTests.swift

@@ -4,6 +4,7 @@
 
 import Common
 import MozillaAppServices
+import OnboardingKit
 import Shared
 import XCTest
 
@@ -95,7 +96,7 @@ class NimbusOnboardingFeatureLayerTests: XCTestCase {
             return
         }
 
-        let expectedCard = OnboardingCardInfoModel(
+        let expectedCard = OnboardingKitCardInfoModel(
             cardType: .basic,
             name: CardElementNames.name + " 1",
             order: 10,

firefox-ios/firefox-ios-tests/Tests/ClientTests/OnboardingTests/OnboardingButtonActionTests.swift

@@ -4,9 +4,11 @@
 
 import XCTest
 import Common
+import OnboardingKit
 
 @testable import Client
 
+@MainActor
 class OnboardingButtonActionTests: XCTestCase {
     var mockDelegate: MockOnboardinCardDelegateController!
     let windowUUID: WindowUUID = .XCTestDefaultUUID

firefox-ios/firefox-ios-tests/Tests/ClientTests/OnboardingTests/OnboardingTelemetryDelegationTests.swift

@@ -34,7 +34,7 @@ class OnboardingTelemetryDelegationTests: XCTestCase {
 
     func testOnboardingCard_callsPrimaryButtonTap() {
         let subject = createSubject()
-        guard let result = subject.pageController.viewControllers?.first as? OnboardingBasicCardViewController else {
+        guard let result = subject.pageController.viewControllers?.first as? OnboardingBasicCardViewController<OnboardingKitCardInfoModel> else {
             XCTFail("expected a view controller, but got nothing")
             return
         }