Merge pull request #7759 from woocommerce/issue/7745-wrongaccounterrorviewmodel-tests

Login: More unit tests for WrongAccountErrorViewModel

Author: itsmeichigo

WooCommerce/Classes/Authentication/AuthenticationManager.swift

@@ -679,7 +679,7 @@ private extension AuthenticationManager {
         }
 
         /// Jetpack is required. Present an error if we don't detect a valid installation.
-        guard site.hasJetpack && site.isJetpackActive else {
+        guard site.isJetpackConnected else {
             return jetpackErrorUI(for: site.url, with: matcher, in: navigationController)
         }
 

WooCommerce/Classes/Authentication/Epilogue/Authenticator.swift

@@ -0,0 +1,28 @@
+import Foundation
+import WordPressAuthenticator
+
+/// An interface used for mocking `WordPressAuthenticator` in unit tests.
+/// It's not complete for now since this is used for testing `WrongAccountErrorViewModel` only at the time of writing.
+/// Update this further if necessary.
+///
+protocol Authenticator {
+    /// Used to present the site credential login flow directly from the delegate.
+    ///
+    /// - Parameters:
+    ///     - presenter: The view controller that presents the site credential login flow.
+    ///     - siteURL: The URL of the site to log in to.
+    ///     - onCompletion: The closure to be trigged when the login succeeds with the input credentials.
+    ///
+    static func showSiteCredentialLogin(from presenter: UIViewController, siteURL: String, onCompletion: @escaping (WordPressOrgCredentials) -> Void)
+
+    /// A helper method to fetch site info for a given URL.
+    /// - Parameters:
+    ///     - siteURL: The URL of the site to fetch information for.
+    ///     - onCompletion: The closure to be triggered when fetching site info is done.
+    ///
+    static func fetchSiteInfo(for siteURL: String, onCompletion: @escaping (Result<WordPressComSiteInfo, Error>) -> Void)
+}
+
+/// Makes `WordPressAuthenticator` conform to the interface for mocking.
+///
+extension WordPressAuthenticator: Authenticator {}

WooCommerce/Classes/Authentication/Navigation Exceptions/WrongAccountErrorViewModel.swift

@@ -17,6 +17,7 @@ final class WrongAccountErrorViewModel: ULAccountMismatchViewModel {
     private let analytics: Analytics
     private let jetpackSetupCompletionHandler: (_ email: String, _ xmlrpc: String) -> Void
     private let authentication: Authentication
+    private let authenticatorType: Authenticator.Type
 
     private var storePickerCoordinator: StorePickerCoordinator?
     private var siteXMLRPC: String = ""
@@ -32,18 +33,19 @@ final class WrongAccountErrorViewModel: ULAccountMismatchViewModel {
     init(siteURL: String?,
          showsConnectedStores: Bool,
          siteCredentials: WordPressOrgCredentials?,
-         sessionManager: SessionManagerProtocol =  ServiceLocator.stores.sessionManager,
+         authenticatorType: Authenticator.Type = WordPressAuthenticator.self,
          storesManager: StoresManager = ServiceLocator.stores,
          analytics: Analytics = ServiceLocator.analytics,
          authentication: Authentication = ServiceLocator.authenticationManager,
          onJetpackSetupCompletion: @escaping (String, String) -> Void) {
         self.siteURL = siteURL ?? Localization.yourSite
         self.showsConnectedStores = showsConnectedStores
-        self.defaultAccount = sessionManager.defaultAccount
+        self.defaultAccount = storesManager.sessionManager.defaultAccount
         self.storesManager = storesManager
         self.analytics = analytics
         self.authentication = authentication
         self.jetpackSetupCompletionHandler = onJetpackSetupCompletion
+        self.authenticatorType = authenticatorType
 
         if let credentials = siteCredentials {
             siteUsername = credentials.username
@@ -181,7 +183,7 @@ private extension WrongAccountErrorViewModel {
     ///
     func fetchSiteInfo() {
         activityIndicatorLoadingSubject.send(true)
-        WordPressAuthenticator.fetchSiteInfo(for: siteURL) { [weak self] result in
+        authenticatorType.fetchSiteInfo(for: siteURL) { [weak self] result in
             guard let self = self else { return }
             self.activityIndicatorLoadingSubject.send(false)
 
@@ -229,7 +231,7 @@ private extension WrongAccountErrorViewModel {
     }
 
     func showSiteCredentialLoginAndJetpackConnection(from viewController: UIViewController) {
-        WordPressAuthenticator.showSiteCredentialLogin(from: viewController, siteURL: siteURL) { [weak self] credentials in
+        authenticatorType.showSiteCredentialLogin(from: viewController, siteURL: siteURL) { [weak self] credentials in
             guard let self = self else { return }
             // dismisses the site credential login flow
             viewController.dismiss(animated: true)

WooCommerce/WooCommerce.xcodeproj/project.pbxproj

@@ -1669,6 +1669,7 @@
 		DE3404E828B4B96800CF0D97 /* NonAtomicSiteViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE3404E728B4B96800CF0D97 /* NonAtomicSiteViewModel.swift */; };
 		DE3404EA28B4C1D000CF0D97 /* NonAtomicSiteViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE3404E928B4C1D000CF0D97 /* NonAtomicSiteViewModelTests.swift */; };
 		DE34771327F174C8009CA300 /* StatusView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE34771227F174C8009CA300 /* StatusView.swift */; };
+		DE37517C28DC5FC6000163CB /* Authenticator.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE37517B28DC5FC6000163CB /* Authenticator.swift */; };
 		DE3877E0283B68CF0075D87E /* DiscountTypeBottomSheetListSelectorCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE3877DF283B68CF0075D87E /* DiscountTypeBottomSheetListSelectorCommand.swift */; };
 		DE3877E2283CCBC20075D87E /* BottomSheetListSelector.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE3877E1283CCBC20075D87E /* BottomSheetListSelector.swift */; };
 		DE3877E4283E35E80075D87E /* DiscountTypeBottomSheetListSelectorCommandTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE3877E3283E35E80075D87E /* DiscountTypeBottomSheetListSelectorCommandTests.swift */; };
@@ -3587,6 +3588,7 @@
 		DE3404E728B4B96800CF0D97 /* NonAtomicSiteViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NonAtomicSiteViewModel.swift; sourceTree = "<group>"; };
 		DE3404E928B4C1D000CF0D97 /* NonAtomicSiteViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NonAtomicSiteViewModelTests.swift; sourceTree = "<group>"; };
 		DE34771227F174C8009CA300 /* StatusView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusView.swift; sourceTree = "<group>"; };
+		DE37517B28DC5FC6000163CB /* Authenticator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Authenticator.swift; sourceTree = "<group>"; };
 		DE3877DF283B68CF0075D87E /* DiscountTypeBottomSheetListSelectorCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiscountTypeBottomSheetListSelectorCommand.swift; sourceTree = "<group>"; };
 		DE3877E1283CCBC20075D87E /* BottomSheetListSelector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomSheetListSelector.swift; sourceTree = "<group>"; };
 		DE3877E3283E35E80075D87E /* DiscountTypeBottomSheetListSelectorCommandTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiscountTypeBottomSheetListSelectorCommandTests.swift; sourceTree = "<group>"; };
@@ -7004,6 +7006,7 @@
 				262C922026F1370000011F92 /* StorePickerError.swift */,
 				45527A402472C6160078D609 /* SwitchStoreUseCase.swift */,
 				45A4221924ACC79C003B1E4C /* SwitchStoreNoticePresenter.swift */,
+				DE37517B28DC5FC6000163CB /* Authenticator.swift */,
 			);
 			path = Epilogue;
 			sourceTree = "<group>";
@@ -9704,6 +9707,7 @@
 				03EF250228C615A5006A033E /* InPersonPaymentsMenuViewModel.swift in Sources */,
 				0212275C244972660042161F /* BottomSheetListSelectorSectionHeaderView.swift in Sources */,
 				DEC6C51A2747758D006832D3 /* JetpackInstallView.swift in Sources */,
+				DE37517C28DC5FC6000163CB /* Authenticator.swift in Sources */,
 				AED089F227C794BC0020AE10 /* View+CurrencySymbol.swift in Sources */,
 				D85806292642BA5400A8AB6C /* PaymentCaptureOrchestrator.swift in Sources */,
 				E1E636BB26FB467A00C9D0D7 /* Comparable+Woo.swift in Sources */,

WooCommerce/WooCommerceTests/Authentication/AuthenticationManagerTests.swift

@@ -159,7 +159,40 @@ final class AuthenticationManagerTests: XCTestCase {
         // Given
         let manager = AuthenticationManager()
         let testSite = "http://test.com"
-        let siteInfo = WordPressComSiteInfo(remote: ["isWordPress": true, "hasJetpack": false, "urlAfterRedirects": testSite])
+        let siteInfo = siteInfo(url: testSite,
+                                exists: true,
+                                hasWordPress: true,
+                                isWordPressCom: false,
+                                hasJetpack: false,
+                                isJetpackActive: false,
+                                isJetpackConnected: false)
+        let wpcomCredentials = WordPressComCredentials(authToken: "abc", isJetpackLogin: false, multifactor: false, siteURL: testSite)
+        let credentials = AuthenticatorCredentials(wpcom: wpcomCredentials, wporg: nil)
+        let navigationController = UINavigationController()
+
+        // When
+        manager.shouldPresentUsernamePasswordController(for: siteInfo, onCompletion: { _ in })
+        manager.presentLoginEpilogue(in: navigationController, for: credentials, onDismiss: {})
+        waitUntil {
+            navigationController.viewControllers.isNotEmpty
+        }
+
+        // Then
+        let rootController = navigationController.viewControllers.first
+        XCTAssertTrue(rootController is ULErrorViewController)
+    }
+
+    func test_it_shows_error_upon_login_epilogue_if_the_site_has_active_jetpack_but_not_connected() {
+        // Given
+        let manager = AuthenticationManager()
+        let testSite = "http://test.com"
+        let siteInfo = siteInfo(url: testSite,
+                                exists: true,
+                                hasWordPress: true,
+                                isWordPressCom: false,
+                                hasJetpack: true,
+                                isJetpackActive: true,
+                                isJetpackConnected: false)
         let wpcomCredentials = WordPressComCredentials(authToken: "abc", isJetpackLogin: false, multifactor: false, siteURL: testSite)
         let credentials = AuthenticatorCredentials(wpcom: wpcomCredentials, wporg: nil)
         let navigationController = UINavigationController()
@@ -366,10 +399,28 @@ final class AuthenticationManagerTests: XCTestCase {
         XCTAssertTrue(topController is ULErrorViewController)
     }
 
+    func test_troubleshootSite_displays_error_screen_if_site_is_self_hosted_with_jetpack_not_connected() {
+        // Given
+        let navigationController = UINavigationController()
+        let siteInfo = siteInfo(exists: true, hasWordPress: true, isWordPressCom: false, hasJetpack: true, isJetpackActive: true, isJetpackConnected: false)
+        let storage = MockStorageManager()
+        let manager = AuthenticationManager(storageManager: storage)
+
+        // When
+        manager.troubleshootSite(siteInfo, in: navigationController)
+
+        // Then
+        waitUntil {
+            navigationController.viewControllers.isNotEmpty
+        }
+        let topController = navigationController.topViewController
+        XCTAssertTrue(topController is ULErrorViewController)
+    }
+
     func test_troubleshootSite_displays_account_mismatch_screen_if_site_is_self_hosted_with_jetpack() {
         // Given
         let navigationController = UINavigationController()
-        let siteInfo = siteInfo(exists: true, hasWordPress: true, isWordPressCom: false, hasJetpack: true)
+        let siteInfo = siteInfo(exists: true, hasWordPress: true, isWordPressCom: false, hasJetpack: true, isJetpackActive: true, isJetpackConnected: true)
         let storage = MockStorageManager()
         let manager = AuthenticationManager(storageManager: storage)
 
@@ -386,12 +437,19 @@ final class AuthenticationManagerTests: XCTestCase {
 }
 
 private extension AuthenticationManagerTests {
-    func siteInfo(exists: Bool = false, hasWordPress: Bool = false, isWordPressCom: Bool = false, hasJetpack: Bool = false) -> WordPressComSiteInfo {
-        WordPressComSiteInfo(remote: ["exists": exists,
+    func siteInfo(url: String = "",
+                  exists: Bool = false,
+                  hasWordPress: Bool = false,
+                  isWordPressCom: Bool = false,
+                  hasJetpack: Bool = false,
+                  isJetpackActive: Bool = false,
+                  isJetpackConnected: Bool = false) -> WordPressComSiteInfo {
+        WordPressComSiteInfo(remote: ["urlAfterRedirects": url,
+                                      "exists": exists,
                                       "isWordPress": hasWordPress,
                                       "hasJetpack": hasJetpack,
-                                      "isJetpackActive": hasJetpack,
-                                      "isJetpackConnected": hasJetpack,
+                                      "isJetpackActive": isJetpackActive,
+                                      "isJetpackConnected": isJetpackConnected,
                                       "isWordPressDotCom": isWordPressCom])
     }
 }