fix tests

DuckDuckGo/HomeViewController.swift

@@ -148,7 +148,6 @@ class HomeViewController: UIViewController, NewTabPage {
                                                object: nil)
 
         registerForBookmarksChanges()
-        presentNextDaxDialog()
     }
 
     private func registerForBookmarksChanges() {
@@ -230,7 +229,9 @@ class HomeViewController: UIViewController, NewTabPage {
 
         Pixel.fire(pixel: .homeScreenShown)
         sendDailyDisplayPixel()
-
+
+        presentNextDaxDialog()
+
         collectionView.didAppear()
 
         viewHasAppeared = true

DuckDuckGoTests/HomeViewControllerDaxDialogTests.swift

@@ -47,7 +47,17 @@ final class HomeViewControllerDaxDialogTests: XCTestCase {
             favoritesDisplayModeStorage: MockFavoritesDisplayModeStoring(),
             syncErrorHandler: SyncErrorHandler()
         )
+        let remoteMessagingClient = RemoteMessagingClient(
+            bookmarksDatabase: db,
+            appSettings: AppSettingsMock(),
+            internalUserDecider: DefaultInternalUserDecider(),
+            configurationStore: MockConfigurationStoring(),
+            database: db,
+            errorEvents: nil,
+            remoteMessagingAvailabilityProvider: MockRemoteMessagingAvailabilityProviding())
+        let homePageConfiguration = HomePageConfiguration(remoteMessagingClient: remoteMessagingClient)
         let dependencies = HomePageDependencies(
+            homePageConfiguration: homePageConfiguration,
             model: Tab(),
             favoritesViewModel: MockFavoritesListInteracting(),
             appSettings: AppSettingsMock(),
@@ -81,14 +91,14 @@ final class HomeViewControllerDaxDialogTests: XCTestCase {
         hvc = nil
     }
 
-    func testWhenNewOnboarding_OnViewDidLoad_CorrectTypePassedToDialogFactory() throws {
+    func testWhenNewOnboarding_OnDidAppear_CorrectTypePassedToDialogFactory() throws {
         // GIVEN
         variantManager.isSupported = true
         let expectedSpec = randomDialogType()
         specProvider.specToReturn = expectedSpec
 
         // WHEN
-        hvc.viewDidLoad()
+        hvc.viewDidAppear(false)
 
         // THEN
         XCTAssertEqual(self.variantManager.capturedFeatureName?.rawValue, FeatureName.newOnboardingIntro.rawValue)
@@ -98,12 +108,12 @@ final class HomeViewControllerDaxDialogTests: XCTestCase {
         XCTAssertNotNil(self.dialogFactory.onDismiss)
     }
 
-    func testWhenOldOnboarding_OnViewDidLoad_NothingPassedDialogFactory() throws {
+    func testWhenOldOnboarding_OnDidAppear_NothingPassedDialogFactory() throws {
         // GIVEN
         variantManager.isSupported = false
 
         // WHEN
-        hvc.viewDidLoad()
+        hvc.viewDidAppear(false)
 
         // THEN
         XCTAssertTrue(specProvider.nextHomeScreenMessageCalled)

DuckDuckGoTests/OnboardingNavigationDelegateTests.swift

@@ -23,6 +23,9 @@ import Bookmarks
 import DDGSync
 import History
 import BrowserServicesKit
+import RemoteMessaging
+import Configuration
+import Combine
 @testable import DuckDuckGo
 @testable import Core
 
@@ -35,12 +38,6 @@ final class OnboardingNavigationDelegateTests: XCTestCase {
         let db = CoreDataDatabase(name: "Test", containerLocation: tempDBDir(), model: model)
         db.loadStore()
         let bookmarkDatabaseCleaner = BookmarkDatabaseCleaner(bookmarkDatabase: db, errorEvents: nil)
-        let historyManager = HistoryManager(
-            privacyConfigManager: MockPrivacyConfigurationManager(),
-            variantManager: MockVariantManager(),
-            database: db,
-            internalUserDecider: DefaultInternalUserDecider(),
-            isEnabledByUser: false)
         let dataProviders = SyncDataProviders(
             bookmarksDatabase: db,
             secureVaultFactory: AutofillSecureVaultFactory,
@@ -49,11 +46,22 @@ final class OnboardingNavigationDelegateTests: XCTestCase {
             favoritesDisplayModeStorage: MockFavoritesDisplayModeStoring(),
             syncErrorHandler: SyncErrorHandler()
         )
+
+        let remoteMessagingClient = RemoteMessagingClient(
+            bookmarksDatabase: db,
+            appSettings: AppSettingsMock(),
+            internalUserDecider: DefaultInternalUserDecider(),
+            configurationStore: MockConfigurationStoring(),
+            database: db,
+            errorEvents: nil,
+            remoteMessagingAvailabilityProvider: MockRemoteMessagingAvailabilityProviding())
+        let homePageConfiguration = HomePageConfiguration(remoteMessagingClient: remoteMessagingClient)
         let tabsModel = TabsModel(desktop: true)
         mainVC = MainViewController(
             bookmarksDatabase: db,
             bookmarksDatabaseCleaner: bookmarkDatabaseCleaner,
-            historyManager: historyManager,
+            historyManager: MockHistoryManager(historyCoordinator: MockHistoryCoordinator(), isEnabledByUser: true, historyFeatureEnabled: true),
+            homePageConfiguration: homePageConfiguration,
             syncService: MockDDGSyncing(authState: .active, isSyncInProgress: false),
             syncDataProviders: dataProviders,
             appSettings: AppSettingsMock(),
@@ -108,3 +116,32 @@ final class OnboardingNavigationDelegateTests: XCTestCase {
     }
 
 }
+
+class MockConfigurationStoring: ConfigurationStoring {
+    func loadData(for configuration: Configuration) -> Data? {
+        return nil
+    }
+
+    func loadEtag(for configuration: Configuration) -> String? {
+        return nil
+    }
+
+    func loadEmbeddedEtag(for configuration: Configuration) -> String? {
+        return nil
+    }
+
+    func saveData(_ data: Data, for configuration: Configuration) throws {
+    }
+
+    func saveEtag(_ etag: String, for configuration: Configuration) throws {
+    }
+
+}
+
+class MockRemoteMessagingAvailabilityProviding: RemoteMessagingAvailabilityProviding {
+    var isRemoteMessagingAvailable: Bool = false
+
+    var isRemoteMessagingAvailablePublisher: AnyPublisher<Bool, Never> = Just(false)
+        .eraseToAnyPublisher()
+
+}