Fix unit tests

Author: koke

WooCommerce/Classes/ServiceLocator/ServiceLocator.swift

@@ -260,6 +260,14 @@ extension ServiceLocator {
         _shippingSettingsService = mock
     }
 
+    static func setSelectedSiteSettings(_ mock: SelectedSiteSettings) {
+        guard isRunningTests() else {
+            return
+        }
+
+        _selectedSiteSettings = mock
+    }
+
     static func setCurrencySettings(_ mock: CurrencySettings) {
         guard isRunningTests() else {
             return

WooCommerce/Classes/Tools/In-Person Payments/CardPresentConfigurationLoader.swift

@@ -2,13 +2,10 @@ import Foundation
 import Yosemite
 
 final class CardPresentConfigurationLoader {
-    let stores: StoresManager
-
     private var stripeGatewayIPPEnabled: Bool = false
     private var canadaIPPEnabled: Bool = false
 
     init(stores: StoresManager = ServiceLocator.stores) {
-        self.stores = stores
         let stripeAction = AppSettingsAction.loadStripeInPersonPaymentsSwitchState(onCompletion: { [weak self] result in
             switch result {
             case .success(let stripeGatewayIPPEnabled):

WooCommerce/WooCommerceTests/ViewRelated/CardPresentPayments/CardPresentPaymentsOnboardingUseCaseTests.swift

@@ -31,6 +31,7 @@ class CardPresentPaymentsOnboardingUseCaseTests: XCTestCase {
             }
         }
         stores.sessionManager.setStoreId(sampleSiteID)
+        ServiceLocator.setSelectedSiteSettings(.init(stores: stores, storageManager: storageManager))
     }
 
     override func tearDownWithError() throws {
@@ -609,6 +610,7 @@ private extension CardPresentPaymentsOnboardingUseCaseTests {
                 settingGroupKey: SiteSettingGroup.general.rawValue
             )
         storageManager.insertSampleSiteSetting(readOnlySiteSetting: setting)
+        ServiceLocator.selectedSiteSettings.refresh()
     }
 
     enum Country: String {

Yosemite/YosemiteTests/Model/CardPresentConfigurationTests.swift

@@ -5,54 +5,62 @@ import XCTest
 class CardPresentConfigurationTests: XCTestCase {
     // MARK: - US Tests
     func test_configuration_for_US_with_Stripe_enabled_Canada_enabled() throws {
-        let configuration = try CardPresentPaymentsConfiguration(country: "US", stripeEnabled: true, canadaEnabled: true)
+        let configuration = CardPresentPaymentsConfiguration(country: "US", stripeEnabled: true, canadaEnabled: true)
+        XCTAssertTrue(configuration.isSupportedCountry)
         XCTAssertEqual(configuration.currencies, [Constants.Currency.usd])
         XCTAssertEqual(configuration.paymentGateways, [Constants.PaymentGateway.wcpay, Constants.PaymentGateway.stripe])
         XCTAssertEqual(configuration.paymentMethods, [.cardPresent])
     }
 
     func test_configuration_for_US_with_Stripe_enabled_Canada_disabled() throws {
-        let configuration = try CardPresentPaymentsConfiguration(country: "US", stripeEnabled: true, canadaEnabled: false)
+        let configuration = CardPresentPaymentsConfiguration(country: "US", stripeEnabled: true, canadaEnabled: false)
+        XCTAssertTrue(configuration.isSupportedCountry)
         XCTAssertEqual(configuration.currencies, [Constants.Currency.usd])
         XCTAssertEqual(configuration.paymentGateways, [Constants.PaymentGateway.wcpay, Constants.PaymentGateway.stripe])
         XCTAssertEqual(configuration.paymentMethods, [.cardPresent])
     }
 
     func test_configuration_for_US_with_Stripe_disabled_Canada_enabled() throws {
-        let configuration = try CardPresentPaymentsConfiguration(country: "US", stripeEnabled: false, canadaEnabled: true)
+        let configuration = CardPresentPaymentsConfiguration(country: "US", stripeEnabled: false, canadaEnabled: true)
+        XCTAssertTrue(configuration.isSupportedCountry)
         XCTAssertEqual(configuration.currencies, [Constants.Currency.usd])
         XCTAssertEqual(configuration.paymentGateways, [Constants.PaymentGateway.wcpay])
         XCTAssertEqual(configuration.paymentMethods, [.cardPresent])
     }
 
     func test_configuration_for_US_with_Stripe_disabled_Canada_disabled() throws {
-        let configuration = try CardPresentPaymentsConfiguration(country: "US", stripeEnabled: false, canadaEnabled: false)
+        let configuration = CardPresentPaymentsConfiguration(country: "US", stripeEnabled: false, canadaEnabled: false)
+        XCTAssertTrue(configuration.isSupportedCountry)
         XCTAssertEqual(configuration.currencies, [Constants.Currency.usd])
         XCTAssertEqual(configuration.paymentGateways, [Constants.PaymentGateway.wcpay])
         XCTAssertEqual(configuration.paymentMethods, [.cardPresent])
     }
 
     // MARK: - Canada Tests
     func test_configuration_for_Canada_with_Stripe_enabled_Canada_enabled() throws {
-        let configuration = try CardPresentPaymentsConfiguration(country: "CA", stripeEnabled: true, canadaEnabled: true)
+        let configuration = CardPresentPaymentsConfiguration(country: "CA", stripeEnabled: true, canadaEnabled: true)
+        XCTAssertTrue(configuration.isSupportedCountry)
         XCTAssertEqual(configuration.currencies, [Constants.Currency.cad])
         XCTAssertEqual(configuration.paymentGateways, [Constants.PaymentGateway.wcpay])
         XCTAssertEqual(configuration.paymentMethods, [.cardPresent, .interacPresent])
     }
 
     func test_configuration_for_Canada_with_Stripe_enabled_Canada_disabled() {
-        XCTAssertThrowsError(try CardPresentPaymentsConfiguration(country: "CA", stripeEnabled: true, canadaEnabled: false))
+        let configuration = CardPresentPaymentsConfiguration(country: "CA", stripeEnabled: true, canadaEnabled: false)
+        XCTAssertFalse(configuration.isSupportedCountry)
     }
 
     func test_configuration_for_Canada_with_Stripe_disabled_Canada_enabled() throws {
-        let configuration = try CardPresentPaymentsConfiguration(country: "CA", stripeEnabled: false, canadaEnabled: true)
+        let configuration = CardPresentPaymentsConfiguration(country: "CA", stripeEnabled: false, canadaEnabled: true)
+        XCTAssertTrue(configuration.isSupportedCountry)
         XCTAssertEqual(configuration.currencies, [Constants.Currency.cad])
         XCTAssertEqual(configuration.paymentGateways, [Constants.PaymentGateway.wcpay])
         XCTAssertEqual(configuration.paymentMethods, [.cardPresent, .interacPresent])
     }
 
     func test_configuration_for_Canada_with_Stripe_disabled_Canada_disabled() throws {
-        XCTAssertThrowsError(try CardPresentPaymentsConfiguration(country: "CA", stripeEnabled: false, canadaEnabled: false))
+        let configuration = CardPresentPaymentsConfiguration(country: "CA", stripeEnabled: false, canadaEnabled: false)
+        XCTAssertFalse(configuration.isSupportedCountry)
     }
 
     private enum Constants {