Encapsulate dependencies into a struct

Author: joshheald

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel.swift

@@ -2,30 +2,56 @@ import Foundation
 import Yosemite
 
 final class InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel: ObservableObject {
+    // MARK: - Dependencies
+    struct Dependencies {
+        let stores: StoresManager
+        let noticePresenter: NoticePresenter
+        let analytics: Analytics
+
+        init(stores: StoresManager = ServiceLocator.stores,
+             noticePresenter: NoticePresenter = ServiceLocator.noticePresenter,
+             analytics: Analytics = ServiceLocator.analytics) {
+            self.stores = stores
+            self.noticePresenter = noticePresenter
+            self.analytics = analytics
+        }
+    }
+
+    private let dependencies: Dependencies
+
+    private var stores: StoresManager {
+        dependencies.stores
+    }
+
+    private var noticePresenter: NoticePresenter {
+        dependencies.noticePresenter
+    }
+
+    private var analytics: Analytics {
+        dependencies.analytics
+    }
+
+    // MARK: - Output properties
     let completion: () -> Void
-    private let stores: StoresManager
-    private let noticePresenter: NoticePresenter
-    private let analytics: Analytics
-    private let cardPresentPaymentsConfiguration: CardPresentPaymentsConfiguration
 
     @Published var awaitingResponse = false
 
+    // MARK: - Configuration properties
+    private let cardPresentPaymentsConfiguration: CardPresentPaymentsConfiguration
+
     private var siteID: Int64? {
         stores.sessionManager.defaultStoreID
     }
 
-    init(stores: StoresManager = ServiceLocator.stores,
-         noticePresenter: NoticePresenter = ServiceLocator.noticePresenter,
-         analytics: Analytics = ServiceLocator.analytics,
+    init(dependencies: Dependencies = Dependencies(),
          configuration: CardPresentPaymentsConfiguration,
          completion: @escaping () -> Void) {
-        self.stores = stores
-        self.noticePresenter = noticePresenter
-        self.analytics = analytics
+        self.dependencies = dependencies
         self.cardPresentPaymentsConfiguration = configuration
         self.completion = completion
     }
 
+    // MARK: - Actions
     func skipTapped() {
         trackSkipTapped()
 

WooCommerce/WooCommerceTests/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModelTests.swift

@@ -15,6 +15,8 @@ final class InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModelTests:
 
     private var configuration: CardPresentPaymentsConfiguration!
 
+    private var dependencies: InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel.Dependencies!
+
     private var sut: InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel!
 
     override func setUp() {
@@ -24,18 +26,20 @@ final class InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModelTests:
         analyticsProvider = MockAnalyticsProvider()
         analytics = WooAnalytics(analyticsProvider: analyticsProvider)
         configuration = CardPresentPaymentsConfiguration.init(country: "US")
-        sut = InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel(stores: stores,
-                                                                            noticePresenter: noticePresenter,
-                                                                            analytics: analytics,
+        dependencies = InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel.Dependencies(
+            stores: stores,
+            noticePresenter: noticePresenter,
+            analytics: analytics
+        )
+        sut = InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel(dependencies: dependencies,
                                                                             configuration: configuration,
                                                                             completion: {})
     }
 
     func test_skip_always_calls_completion() {
         // Given
         let completionCalled: Bool = waitFor { promise in
-            let sut = InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel(stores: self.stores,
-                                                                                    noticePresenter: self.noticePresenter,
+            let sut = InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel(dependencies: self.dependencies,
                                                                                     configuration: self.configuration,
                                                                                     completion: {
                 promise(true)
@@ -81,8 +85,7 @@ final class InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModelTests:
         }
 
         let completionCalled: Bool = waitFor { promise in
-            let sut = InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel(stores: self.stores,
-                                                                                    noticePresenter: self.noticePresenter,
+            let sut = InPersonPaymentsCashOnDeliveryPaymentGatewayNotSetUpViewModel(dependencies: self.dependencies,
                                                                                     configuration: self.configuration,
                                                                                     completion: {
                 promise(true)