Update Tests

Author: Ecarrion

WooCommerce/Classes/ViewRelated/Orders/Order Creation/NewOrderViewModel.swift

@@ -162,7 +162,7 @@ final class NewOrderViewModel: ObservableObject {
             case .success(let newOrder):
                 self.onOrderCreated(newOrder)
             case .failure(let error):
-                self.notice = self.createOrderCreationErrorNotice()
+                self.notice = NoticeFactory.createOrderCreationErrorNotice()
                 DDLogError("⛔️ Error creating new order: \(error)")
             }
         }
@@ -381,15 +381,22 @@ private extension NewOrderViewModel {
             }
             .assign(to: &$paymentDataViewModel)
     }
+}
+
+// MARK: Constants
 
-    /// Returns a default order creation error notice.
+extension NewOrderViewModel {
+    /// New Order notices
     ///
-    func createOrderCreationErrorNotice() -> Notice {
-        Notice(title: Localization.errorMessage, feedbackType: .error)
+    enum NoticeFactory {
+        /// Returns a default order creation error notice.
+        ///
+        static func createOrderCreationErrorNotice() -> Notice {
+            Notice(title: Localization.errorMessage, feedbackType: .error)
+        }
     }
 }
 
-// MARK: Constants
 private extension NewOrderViewModel {
     enum Localization {
         static let errorMessage = NSLocalizedString("Unable to create new order", comment: "Notice displayed when order creation fails")

WooCommerce/Classes/ViewRelated/Orders/Order Details/Address Edit/AddressFormViewModelProtocol.swift

@@ -233,11 +233,7 @@ open class AddressFormViewModel: ObservableObject {
     /// Defines the current notice that should be shown.
     /// Defaults to `nil`.
     ///
-    @Published var notice: Notice? {
-        didSet {
-            print("notice set")
-        }
-    }
+    @Published var notice: Notice?
 
     /// Defines if the state field should be defined as a list selector.
     ///
@@ -304,10 +300,14 @@ extension AddressFormViewModel {
         }
     }
 
-    /// Creates an error notice based on the provided edit address error.
+    /// Creates address form general notices.
     ///
-    static func createErrorNotice(from error: EditAddressError) -> Notice {
-        Notice(title: error.errorDescription ?? "", message: error.recoverySuggestion, feedbackType: .error)
+    enum NoticeFactory {
+        /// Creates an error notice based on the provided edit address error.
+        ///
+        static func createErrorNotice(from error: EditAddressError) -> Notice {
+            Notice(title: error.errorDescription ?? "", message: error.recoverySuggestion, feedbackType: .error)
+        }
     }
 }
 
@@ -396,7 +396,7 @@ private extension AddressFormViewModel {
         let syncCountries = makeSyncCountriesFuture()
             .catch { [weak self] error -> AnyPublisher<Void, Never> in
                 DDLogError("⛔️ Failed to load countries with: \(error)")
-                self?.notice = Self.createErrorNotice(from: error)
+                self?.notice = NoticeFactory.createErrorNotice(from: error)
                 return Just(()).eraseToAnyPublisher()
             }
 

WooCommerce/Classes/ViewRelated/Orders/Order Details/Address Edit/EditOrderAddressFormViewModel.swift

@@ -124,15 +124,15 @@ final class EditOrderAddressFormViewModel: AddressFormViewModel, AddressFormView
             switch result {
             case .success(let updatedOrder):
                 self.onOrderUpdate?(updatedOrder)
-                self.notice = .init(title: Localization.success, feedbackType: .success)
+                self.notice = NoticeFactory.createSuccessNotice()
                 self.analytics.track(event: WooAnalyticsEvent.OrderDetailsEdit.orderDetailEditFlowCompleted(subject: self.analyticsFlowType()))
 
             case .failure(let error):
                 DDLogError("⛔️ Error updating order: \(error)")
                 if self.type == .billing, self.updatedAddress.hasEmailAddress == false {
                     DDLogError("⛔️ Email is nil in address. It won't work in WC < 5.9.0 (https://git.io/J68Gl)")
                 }
-                self.notice = Self.createErrorNotice(from: .unableToUpdateAddress)
+                self.notice = AddressFormViewModel.NoticeFactory.createErrorNotice(from: .unableToUpdateAddress)
                 self.analytics.track(event: WooAnalyticsEvent.OrderDetailsEdit.orderDetailEditFlowFailed(subject: self.analyticsFlowType()))
             }
             onFinish(result.isSuccess)
@@ -151,6 +151,18 @@ final class EditOrderAddressFormViewModel: AddressFormViewModel, AddressFormView
     }
 }
 
+extension EditOrderAddressFormViewModel {
+    /// Creates edit address form notices.
+    ///
+    enum NoticeFactory {
+        /// Creates a success notice for editing an address.
+        ///
+        static func createSuccessNotice() -> Notice {
+            .init(title: Localization.success, feedbackType: .success)
+        }
+    }
+}
+
 private extension EditOrderAddressFormViewModel {
 
     /// Returns the correct analytics subject for the current address form type.

WooCommerce/WooCommerceTests/ViewRelated/Orders/Order Creation/NewOrderViewModelTests.swift

@@ -92,7 +92,7 @@ class NewOrderViewModelTests: XCTestCase {
         viewModel.createOrder()
 
         // Then
-        XCTAssertEqual(viewModel.presentNotice, .error)
+        XCTAssertEqual(viewModel.notice, NewOrderViewModel.NoticeFactory.createOrderCreationErrorNotice())
     }
 
     func test_view_model_loads_synced_pending_order_status() {

WooCommerce/WooCommerceTests/ViewRelated/Orders/Order Details/Addresses/EditOrderAddressFormViewModelTests.swift

@@ -382,12 +382,12 @@ final class EditOrderAddressFormViewModelTests: XCTestCase {
         // When
         let noticeRequest = waitFor { promise in
             viewModel.saveAddress { _ in
-                promise(viewModel.presentNotice)
+                promise(viewModel.notice)
             }
         }
 
         // Then
-        assertEqual(noticeRequest, .success)
+        assertEqual(noticeRequest, EditOrderAddressFormViewModel.NoticeFactory.createSuccessNotice())
     }
 
     func test_view_model_fires_error_notice_after_failing_to_update_address() {
@@ -405,12 +405,12 @@ final class EditOrderAddressFormViewModelTests: XCTestCase {
         // When
         let noticeRequest = waitFor { promise in
             viewModel.saveAddress { _ in
-                promise(viewModel.presentNotice)
+                promise(viewModel.notice)
             }
         }
 
         // Then
-        assertEqual(noticeRequest, .error(.unableToUpdateAddress))
+        assertEqual(noticeRequest, AddressFormViewModel.NoticeFactory.createErrorNotice(from: .unableToUpdateAddress))
     }
 
     func test_view_model_fires_error_notice_after_failing_to_fetch_countries() {
@@ -427,7 +427,7 @@ final class EditOrderAddressFormViewModelTests: XCTestCase {
         viewModel.onLoadTrigger.send()
 
         // Then
-        assertEqual(viewModel.presentNotice, .error(.unableToLoadCountries))
+        assertEqual(viewModel.notice, AddressFormViewModel.NoticeFactory.createErrorNotice(from: .unableToLoadCountries))
     }
 
     func test_copying_empty_shipping_address_for_billing_does_not_sends_an_empty_email_field() {