Fix crashes in tests

Author: itsmeichigo

WooCommerce/Classes/AppDelegate.swift

@@ -57,9 +57,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         let stores = ServiceLocator.stores
         let analytics = ServiceLocator.analytics
         let pushNotesManager = ServiceLocator.pushNotesManager
+
+        /// This is important to initialize early as there are a few code points where the authenticator is used.
+        ServiceLocator.authenticationManager.initialize()
         stores.initializeAfterDependenciesAreInitialized()
-        setupAnalytics(analytics)
 
+        setupAnalytics(analytics)
         setupCocoaLumberjack()
         setupLibraryLogger()
         setupLogLevel(.verbose)

WooCommerce/Classes/ViewRelated/AppCoordinator.swift

@@ -238,7 +238,11 @@ private extension AppCoordinator {
 
     /// Configures the WPAuthenticator for usage in both logged-in and logged-out states.
     func configureAuthenticator() {
-        authenticationManager.initialize()
+        if isRunningTests {
+            /// This is needed to fix crashes in unit tests.
+            /// The authenticator is initialized in AppDelegate when running the app.
+            authenticationManager.initialize()
+        }
         authenticationManager.setLoggedOutAppSettings(loggedOutAppSettings)
         authenticationManager.displayAuthenticatorIfLoggedOut = { [weak self] in
             guard let self, self.isLoggedIn == false else { return nil }

WooCommerce/Classes/Yosemite/DefaultStoresManager.swift

@@ -7,7 +7,7 @@ import class Networking.WordPressOrgNetwork
 import KeychainAccess
 import class WidgetKit.WidgetCenter
 import Experiments
-import class WordPressAuthenticator.WordPressComBlogService
+import WordPressAuthenticator
 import enum NetworkingCore.RequestAuthenticationMode
 
 // MARK: - DefaultStoresManager
@@ -765,17 +765,19 @@ private extension DefaultStoresManager {
                 self.updateAndReloadWidgetInformation(with: site.siteID)
                 /// Trigger the `v1.1/connect/site-info` API to get information about
                 /// the site's Jetpack status and whether it's a WPCom site.
-                let service = WordPressComBlogService()
-                service.fetchUnauthenticatedSiteInfoForAddress(for: url, success: { [weak self] info in
+                WordPressAuthenticator.fetchSiteInfo(for: url) { [weak self] result in
                     guard let self else { return }
-                    let updatedSite = site.copy(isJetpackThePluginInstalled: info.hasJetpack,
-                                                isJetpackConnected: info.isJetpackConnected,
-                                                isWordPressComStore: info.isWPCom)
-                    sessionManager.defaultSite = updatedSite
-                    updateAndReloadWidgetInformation(with: site.siteID)
-                }, failure: { error in
-                    DDLogError("⛔️ Cannot fetch generic site info: \(error)")
-                })
+                    switch result {
+                    case .success(let info):
+                        let updatedSite = site.copy(isJetpackThePluginInstalled: info.hasJetpack,
+                                                    isJetpackConnected: info.isJetpackConnected,
+                                                    isWordPressComStore: info.isWPCom)
+                        self.sessionManager.defaultSite = updatedSite
+                        self.updateAndReloadWidgetInformation(with: site.siteID)
+                    case .failure(let error):
+                        DDLogError("⛔️ Cannot fetch generic site info: \(error)")
+                    }
+                }
             case .failure(let error):
                 DDLogError("⛔️ Cannot fetch WordPress site info: \(error)")
             }

WooCommerce/WordPressAuthenticator/Services/WordPressComBlogService.swift

@@ -2,9 +2,7 @@ import Foundation
 
 // MARK: - WordPress.com BlogService
 //
-public class WordPressComBlogService {
-
-    public init() {}
+class WordPressComBlogService {
 
     /// Returns a new anonymous instance of WordPressComRestApi.
     ///
@@ -15,7 +13,7 @@ public class WordPressComBlogService {
     }
 
 
-    public func fetchUnauthenticatedSiteInfoForAddress(for address: String, success: @escaping (WordPressComSiteInfo) -> Void, failure: @escaping (Error) -> Void) {
+     func fetchUnauthenticatedSiteInfoForAddress(for address: String, success: @escaping (WordPressComSiteInfo) -> Void, failure: @escaping (Error) -> Void) {
         let remote = BlogServiceRemoteREST(wordPressComRestApi: anonymousAPI, siteID: 0)
         remote.fetchUnauthenticatedSiteInfo(forAddress: address, success: { response in
             guard let response = response else {