Update unit tests for account mismatch view model

Author: itsmeichigo

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

@@ -119,6 +119,8 @@ final class WrongAccountErrorViewModel: ULAccountMismatchViewModel {
         // Fetches site info if we're not sure whether the site is self-hosted.
         if siteXMLRPC.isEmpty {
             fetchSiteInfo()
+        } else {
+            isSelfHostedSite = true
         }
     }
 
@@ -344,8 +346,8 @@ private extension WrongAccountErrorViewModel {
                                                           + "Presented when logging in with a store address that does not match the account entered")
 
         static let primaryButtonTitle = NSLocalizedString("Connect to the site",
-                                                          comment: "Action button to handle connecting the logged-in account to the site."
-                                                          + "Presented when logging in with a self-hosted site that does not match the account entered")
+                                                          comment: "Action button to handle connecting the logged-in account to a given site."
+                                                          + "Presented when logging in with a store address that does not match the account entered")
 
         static let yourSite = NSLocalizedString("your site",
                                                 comment: "Placeholder for site url, if the url is unknown."

WooCommerce/WooCommerceTests/Authentication/ULAccountMismatchViewControllerTests.swift

@@ -186,24 +186,6 @@ final class ULAccountMismatchViewControllerTests: XCTestCase {
         XCTAssertTrue(viewModel.logOutButtonTapped)
     }
 
-    func test_viewcontroller_assigns_visibility_provided_by_viewmodel_to_primary_button() throws {
-        // Given
-        let viewModel = MismatchViewModel()
-        let viewController = ULAccountMismatchViewController(viewModel: viewModel)
-
-        // When
-        _ = try XCTUnwrap(viewController.view)
-        let primaryButton = viewController.getPrimaryActionButton()
-        var isHidden: Bool?
-        viewModel.isPrimaryButtonHidden
-            .sink { isHidden = $0 }
-            .store(in: &subscriptions)
-        viewModel.primaryButtonHidden = true
-
-        // Then
-        XCTAssertEqual(primaryButton.isHidden, isHidden)
-    }
-
     func test_viewcontroller_assigns_visibility_provided_by_viewmodel_to_secondary_button() throws {
         // Given
         let viewModel = MismatchViewModel()
@@ -217,24 +199,6 @@ final class ULAccountMismatchViewControllerTests: XCTestCase {
         XCTAssertEqual(secondaryButton.isHidden, viewModel.isSecondaryButtonHidden)
     }
 
-    func test_viewcontroller_assigns_loading_state_provided_by_viewmodel_to_activity_indicator() throws {
-        // Given
-        let viewModel = MismatchViewModel()
-        let viewController = ULAccountMismatchViewController(viewModel: viewModel)
-
-        // When
-        _ = try XCTUnwrap(viewController.view)
-        let activityIndicator = viewController.getActivityIndicator()
-        var isLoading: Bool?
-        viewModel.isShowingActivityIndicator
-            .sink { isLoading = $0 }
-            .store(in: &subscriptions)
-        viewModel.showingActivityIndicator = true
-
-        // Then
-        XCTAssertEqual(activityIndicator.isAnimating, isLoading)
-    }
-
     func test_viewcontroller_does_not_have_right_bar_button_item_when_rightBarButtonItemTitle_is_nil_in_viewmodel() throws {
         // Given
         let viewModel = MismatchViewModel()
@@ -282,9 +246,6 @@ final class ULAccountMismatchViewControllerTests: XCTestCase {
 
 
 private final class MismatchViewModel: ULAccountMismatchViewModel {
-    var isPrimaryButtonHidden: AnyPublisher<Bool, Never> {
-        Just(primaryButtonHidden).eraseToAnyPublisher()
-    }
 
     var isPrimaryButtonLoading: AnyPublisher<Bool, Never> {
         Just(primaryButtonLoading).eraseToAnyPublisher()
@@ -294,10 +255,6 @@ private final class MismatchViewModel: ULAccountMismatchViewModel {
 
     let isSecondaryButtonHidden: Bool = false
 
-    var isShowingActivityIndicator: AnyPublisher<Bool, Never> {
-        Just(showingActivityIndicator).eraseToAnyPublisher()
-    }
-
     let userEmail: String = "[email protected]"
 
     var userName: String = "username"
@@ -323,8 +280,6 @@ private final class MismatchViewModel: ULAccountMismatchViewModel {
     var secondaryButtonTapped: Bool = false
     var logOutButtonTapped: Bool = false
     var auxiliaryButtonTapped: Bool = false
-    var showingActivityIndicator: Bool = false
-    var primaryButtonHidden: Bool = false
     var primaryButtonLoading: Bool = false
     var rightBarButtonItemTapped = false
 

WooCommerce/WooCommerceTests/Authentication/WrongAccountErrorViewModelTests.swift

@@ -1,6 +1,7 @@
 import XCTest
 import Yosemite
 import WordPressAuthenticator
+import WordPressUI
 @testable import WooCommerce
 
 final class WrongAccountErrorViewModelTests: XCTestCase {
@@ -163,7 +164,7 @@ final class WrongAccountErrorViewModelTests: XCTestCase {
         XCTAssertTrue(navigationController.topViewController is AuthenticatedWebViewController)
     }
 
-    func test_fetchSiteInfo_is_triggered_if_credentials_are_not_present() throws {
+    func test_fetchSiteInfo_is_triggered_if_credentials_are_not_present() {
         // Given
 
         let viewModel = WrongAccountErrorViewModel(siteURL: Expectations.url,
@@ -247,7 +248,7 @@ final class WrongAccountErrorViewModelTests: XCTestCase {
         XCTAssertEqual(properties["is_selfhosted_site"] as? Bool, false)
     }
 
-    func test_primary_button_tap_is_tracked() throws {
+    func test_primary_button_tap_is_tracked() {
         // Given
         let analyticsProvider = MockAnalyticsProvider()
         let analytics = WooAnalytics(analyticsProvider: analyticsProvider)
@@ -266,21 +267,49 @@ final class WrongAccountErrorViewModelTests: XCTestCase {
         XCTAssertNotNil(analyticsProvider.receivedEvents.first(where: { $0 == "login_jetpack_connect_button_tapped" }))
     }
 
-    func test_primary_button_tap_triggers_site_credential_login_if_credentials_are_not_present() throws {
+    func test_primary_button_tap_triggers_site_credential_login_if_credentials_are_not_present_and_fetched_site_info_returns_self_hosted_site() {
         // Given
+        let siteInfo = WordPressComSiteInfo(remote: ["isWordPressDotCom": false])
+        MockAuthenticator.setMockSiteInfo(siteInfo)
         let viewModel = WrongAccountErrorViewModel(siteURL: Expectations.url,
                                                    showsConnectedStores: false,
                                                    siteCredentials: nil,
                                                    authenticatorType: MockAuthenticator.self,
                                                    onJetpackSetupCompletion: { _, _ in })
+        let viewController = UIViewController()
 
         // When
-        viewModel.didTapPrimaryButton(in: UIViewController())
+        viewModel.viewDidLoad(viewController)
+        viewModel.didTapPrimaryButton(in: viewController)
 
         // Then
         XCTAssertTrue(MockAuthenticator.siteCredentialLoginTriggered)
     }
 
+    func test_primary_button_tap_presents_fancy_alert_if_credentials_are_not_present_and_fetched_site_info_returns_wpcom_site() {
+        // Given
+        let siteInfo = WordPressComSiteInfo(remote: ["isWordPressDotCom": true])
+        MockAuthenticator.setMockSiteInfo(siteInfo)
+        let viewModel = WrongAccountErrorViewModel(siteURL: Expectations.url,
+                                                   showsConnectedStores: false,
+                                                   siteCredentials: nil,
+                                                   authenticatorType: MockAuthenticator.self,
+                                                   onJetpackSetupCompletion: { _, _ in })
+        let viewController = ULAccountMismatchViewController(viewModel: viewModel)
+
+        // When
+        viewModel.viewDidLoad(viewController)
+        viewModel.didTapPrimaryButton(in: viewController)
+
+        // Then
+        XCTAssertFalse(MockAuthenticator.siteCredentialLoginTriggered)
+
+        waitUntil { // waiting for a bit since the presentation involves animation
+            viewController.presentedViewController != nil
+        }
+        XCTAssertTrue(viewController.presentedViewController is FancyAlertViewController)
+    }
+
     func test_failure_to_fetch_connection_url_is_tracked() throws {
         // Given
         let stores = MockStoresManager(sessionManager: .makeForTesting())
@@ -325,9 +354,9 @@ private extension WrongAccountErrorViewModelTests {
         static let url = "https://woocommerce.com"
         static let image = UIImage.productErrorImage
 
-        static let primaryButtonTitle = NSLocalizedString("Connect Jetpack",
-                                                          comment: "Action button to handle Jetpack connection."
-                                                          + "Presented when logging in with a self-hosted site that does not match the account entered")
+        static let primaryButtonTitle = NSLocalizedString("Connect to the site",
+                                                          comment: "Action button to handle connecting the logged-in account to a given site."
+                                                          + "Presented when logging in with a store address that does not match the account entered")
 
         static let secondaryButtonTitle = NSLocalizedString("See Connected Stores",
                                                             comment: "Action button linking to a list of connected stores."