Update unit tests

Author: Ecarrion

WooCommerce/WooCommerceTests/ViewRelated/Orders/Order Details/Addresses/CountrySelector/CountrySelectorViewModelTests.swift

@@ -2,23 +2,23 @@ import XCTest
 import Yosemite
 import TestKit
 import Combine
+import struct SwiftUI.Binding
 @testable import WooCommerce
 
 final class CountrySelectorViewModelTests: XCTestCase {
 
-    let selectedSubject = CurrentValueSubject<Country?, Never>(nil)
     var subscriptions = Set<AnyCancellable>()
 
     override func setUp () {
         super.setUp()
 
-        selectedSubject.value = nil
         subscriptions.removeAll()
     }
 
     func test_filter_countries_return_expected_results() {
         // Given
-        let viewModel = CountrySelectorViewModel(countries: Self.sampleCountries, selected: selectedSubject)
+        let binding = Binding<Country?>(get: { nil }, set: { _ in })
+        let viewModel = CountrySelectorViewModel(countries: Self.sampleCountries, selected: binding)
 
         // When
         viewModel.searchTerm = "Co"
@@ -43,7 +43,8 @@ final class CountrySelectorViewModelTests: XCTestCase {
 
     func test_filter_countries_with_uppercase_letters_return_expected_results() {
         // Given
-        let viewModel = CountrySelectorViewModel(countries: Self.sampleCountries, selected: selectedSubject)
+        let binding = Binding<Country?>(get: { nil }, set: { _ in })
+        let viewModel = CountrySelectorViewModel(countries: Self.sampleCountries, selected: binding)
 
         // When
         viewModel.searchTerm = "CO"
@@ -68,7 +69,8 @@ final class CountrySelectorViewModelTests: XCTestCase {
 
     func test_cleaning_search_terms_return_all_countries() {
         // Given
-        let viewModel = CountrySelectorViewModel(countries: Self.sampleCountries, selected: selectedSubject)
+        let binding = Binding<Country?>(get: { nil }, set: { _ in })
+        let viewModel = CountrySelectorViewModel(countries: Self.sampleCountries, selected: binding)
         let totalNumberOfCountries = viewModel.command.data.count
 
         // When
@@ -82,27 +84,28 @@ final class CountrySelectorViewModelTests: XCTestCase {
 
     func test_providing_a_selected_country_is_reflected_on_command() {
         // Given
-        let country = Self.sampleCountries[0]
-        selectedSubject.value = country
+        let binding = Binding<Country?>(get: { Self.sampleCountries[0] }, set: { _ in })
 
         // When
-        let viewModel = CountrySelectorViewModel(countries: Self.sampleCountries, selected: selectedSubject)
+        let viewModel = CountrySelectorViewModel(countries: Self.sampleCountries, selected: binding)
 
         // Then
-        XCTAssertEqual(viewModel.command.selected, country)
+        XCTAssertEqual(viewModel.command.selected, binding.wrappedValue)
     }
 
-    func test_selecting_country_via_command_updates_subject() {
+    func test_selecting_country_via_command_updates_binding() {
         // Given
-        let country = Self.sampleCountries[0]
-        let viewModel = CountrySelectorViewModel(countries: Self.sampleCountries, selected: selectedSubject)
+        let expectedCountry = Self.sampleCountries[0]
+        var selectedCountry: Country? = nil
+        let binding = Binding<Country?>(get: { selectedCountry }, set: { selectedCountry = $0 })
+        let viewModel = CountrySelectorViewModel(countries: Self.sampleCountries, selected: binding)
 
         // When
         let viewController = ListSelectorViewController(command: viewModel.command, onDismiss: { _ in }) // Needed because of legacy UIKit ways
-        viewModel.command.handleSelectedChange(selected: country, viewController: viewController)
+        viewModel.command.handleSelectedChange(selected: expectedCountry, viewController: viewController)
 
         // Then
-        XCTAssertEqual(selectedSubject.value, country)
+        XCTAssertEqual(selectedCountry, expectedCountry)
     }
 }
 

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

@@ -24,8 +24,13 @@ final class EditAddressFormViewModelTests: XCTestCase {
 
     func test_creating_with_address_prefills_fields_with_correct_data() {
         // Given
+        testingStorage.insertSampleCountries(readOnlyCountries: Self.sampleCountries)
+
         let address = sampleAddress()
-        let viewModel = EditAddressFormViewModel(siteID: sampleSiteID, address: address)
+        let viewModel = EditAddressFormViewModel(siteID: sampleSiteID, address: address, storageManager: testingStorage)
+
+        // When
+        viewModel.onLoadTrigger.send()
 
         // Then
         XCTAssertEqual(viewModel.fields.firstName, address.firstName)
@@ -38,6 +43,10 @@ final class EditAddressFormViewModelTests: XCTestCase {
         XCTAssertEqual(viewModel.fields.address2, address.address2 ?? "")
         XCTAssertEqual(viewModel.fields.city, address.city)
         XCTAssertEqual(viewModel.fields.postcode, address.postcode)
+        XCTAssertEqual(viewModel.fields.state, address.state)
+
+        let countryName = Self.sampleCountries.first { $0.code == address.country }?.name
+        XCTAssertEqual(viewModel.fields.country, countryName)
 
         XCTAssertEqual(viewModel.navigationTrailingItem, .done(enabled: false))
     }
@@ -49,6 +58,7 @@ final class EditAddressFormViewModelTests: XCTestCase {
         XCTAssertEqual(viewModel.navigationTrailingItem, .done(enabled: false))
 
         // When
+        viewModel.onLoadTrigger.send()
         viewModel.fields.firstName = "John"
 
         // Then
@@ -62,6 +72,7 @@ final class EditAddressFormViewModelTests: XCTestCase {
         XCTAssertEqual(viewModel.navigationTrailingItem, .done(enabled: false))
 
         // When
+        viewModel.onLoadTrigger.send()
         viewModel.fields.firstName = "John"
         viewModel.fields.lastName = "Ipsum"
         viewModel.fields.firstName = "Johnny"
@@ -75,6 +86,9 @@ final class EditAddressFormViewModelTests: XCTestCase {
         // Given
         let viewModel = EditAddressFormViewModel(siteID: sampleSiteID, address: nil)
 
+        // When
+        viewModel.onLoadTrigger.send()
+
         // Then
         XCTAssertEqual(viewModel.navigationTrailingItem, .done(enabled: false))
     }
@@ -84,6 +98,9 @@ final class EditAddressFormViewModelTests: XCTestCase {
         let address = sampleAddressWithEmptyNullableFields()
         let viewModel = EditAddressFormViewModel(siteID: sampleSiteID, address: address)
 
+        // When
+        viewModel.onLoadTrigger.send()
+
         // Then
         XCTAssertEqual(viewModel.navigationTrailingItem, .done(enabled: false))
     }
@@ -94,6 +111,7 @@ final class EditAddressFormViewModelTests: XCTestCase {
         let viewModel = EditAddressFormViewModel(siteID: sampleSiteID, address: address)
 
         // When
+        viewModel.onLoadTrigger.send()
         viewModel.updateRemoteAddress { _ in }
 
         // Then
@@ -106,6 +124,7 @@ final class EditAddressFormViewModelTests: XCTestCase {
         let viewModel = EditAddressFormViewModel(siteID: sampleSiteID, address: address)
 
         // When
+        viewModel.onLoadTrigger.send()
         let navigationItem = waitFor { promise in
             viewModel.updateRemoteAddress { _ in
                 promise(viewModel.navigationTrailingItem)
@@ -162,6 +181,24 @@ final class EditAddressFormViewModelTests: XCTestCase {
         // Then
         assertEqual(showPlaceholdersStates, [true, false]) // true: showPlaceholders, false: hide placeholders
     }
+
+    func test_selecting_country_updates_country_field() {
+        // Given
+        testingStorage.insertSampleCountries(readOnlyCountries: Self.sampleCountries)
+        let newCountry = Self.sampleCountries[0]
+
+        let address = sampleAddress()
+        let viewModel = EditAddressFormViewModel(siteID: sampleSiteID, address: address, storageManager: testingStorage)
+        viewModel.onLoadTrigger.send()
+
+        // When
+        let countryViewModel = viewModel.createCountryViewModel()
+        let viewController = ListSelectorViewController(command: countryViewModel.command, onDismiss: { _ in }) // Needed because of legacy UIKit ways
+        countryViewModel.command.handleSelectedChange(selected: newCountry, viewController: viewController)
+
+        // Then
+        XCTAssertEqual(viewModel.fields.country, newCountry.name)
+    }
 }
 
 private extension EditAddressFormViewModelTests {
@@ -193,3 +230,14 @@ private extension EditAddressFormViewModelTests {
                        email: "")
     }
 }
+
+private extension EditAddressFormViewModelTests {
+    static let sampleCountries: [Country] = {
+        return Locale.isoRegionCodes.map { regionCode in
+            let name = Locale.current.localizedString(forRegionCode: regionCode) ?? ""
+            return Country(code: regionCode, name: name, states: [])
+        }.sorted { a, b in
+            a.name <= b.name
+        }
+    }()
+}