Skip to content

Commit 4692a59

Browse files
committed
Fix address form tests
1 parent 26f20bc commit 4692a59

File tree

1 file changed

+18
-8
lines changed

1 file changed

+18
-8
lines changed

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

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,10 @@ final class CreateOrderAddressFormViewModelTests: XCTestCase {
9797
// Given
9898
let newCountry = Self.sampleCountries[0]
9999

100+
let address1 = sampleAddress()
101+
let address2 = sampleAddress().copy(firstName: "John")
100102
let viewModel = CreateOrderAddressFormViewModel(siteID: sampleSiteID,
101-
addressData: .init(billingAddress: sampleAddress(), shippingAddress: sampleAddress()),
103+
addressData: .init(billingAddress: address1, shippingAddress: address2),
102104
onAddressUpdate: nil,
103105
storageManager: testingStorage)
104106
viewModel.onLoadTrigger.send()
@@ -114,8 +116,10 @@ final class CreateOrderAddressFormViewModelTests: XCTestCase {
114116

115117
func test_country_and_state_names_are_converted_from_codes_when_available() {
116118
// Given
119+
let address1 = sampleAddress()
120+
let address2 = sampleAddress().copy(firstName: "John")
117121
let viewModel = CreateOrderAddressFormViewModel(siteID: sampleSiteID,
118-
addressData: .init(billingAddress: sampleAddress(), shippingAddress: sampleAddress()),
122+
addressData: .init(billingAddress: address1, shippingAddress: address2),
119123
onAddressUpdate: nil,
120124
storageManager: testingStorage)
121125
XCTAssertEqual(viewModel.secondaryFields.country, "US")
@@ -135,10 +139,10 @@ final class CreateOrderAddressFormViewModelTests: XCTestCase {
135139

136140
func test_state_name_is_displayed_as_string_when_mapping_is_not_available() {
137141
// Given
138-
let addressWithUnknownCountryAndState = sampleAddress().copy(state: "Bavaria", country: "Germany")
142+
let address1 = sampleAddress()
143+
let address2 = sampleAddress().copy(state: "Bavaria", country: "Germany")
139144
let viewModel = CreateOrderAddressFormViewModel(siteID: sampleSiteID,
140-
addressData: .init(billingAddress: addressWithUnknownCountryAndState,
141-
shippingAddress: addressWithUnknownCountryAndState),
145+
addressData: .init(billingAddress: address1, shippingAddress: address2),
142146
onAddressUpdate: nil,
143147
storageManager: testingStorage)
144148

@@ -154,8 +158,10 @@ final class CreateOrderAddressFormViewModelTests: XCTestCase {
154158
// Given
155159
let newCountry = Country(code: "GB", name: "United Kingdom", states: [])
156160

161+
let address1 = sampleAddress()
162+
let address2 = sampleAddress().copy(firstName: "John")
157163
let viewModel = CreateOrderAddressFormViewModel(siteID: sampleSiteID,
158-
addressData: .init(billingAddress: sampleAddress(), shippingAddress: sampleAddress()),
164+
addressData: .init(billingAddress: address1, shippingAddress: address2),
159165
onAddressUpdate: nil,
160166
storageManager: testingStorage)
161167
viewModel.onLoadTrigger.send()
@@ -176,8 +182,10 @@ final class CreateOrderAddressFormViewModelTests: XCTestCase {
176182
// Given
177183
let newCountry = Country(code: "AU", name: "Australia", states: [.init(code: "VIC", name: "Victoria")])
178184

185+
let address1 = sampleAddress()
186+
let address2 = sampleAddress().copy(firstName: "John")
179187
let viewModel = CreateOrderAddressFormViewModel(siteID: sampleSiteID,
180-
addressData: .init(billingAddress: sampleAddress(), shippingAddress: sampleAddress()),
188+
addressData: .init(billingAddress: address1, shippingAddress: address2),
181189
onAddressUpdate: nil,
182190
storageManager: testingStorage)
183191
viewModel.onLoadTrigger.send()
@@ -198,8 +206,10 @@ final class CreateOrderAddressFormViewModelTests: XCTestCase {
198206
// Given
199207
let newState = StateOfACountry(code: "CA", name: "California")
200208

209+
let address1 = sampleAddress()
210+
let address2 = sampleAddress().copy(firstName: "John")
201211
let viewModel = CreateOrderAddressFormViewModel(siteID: sampleSiteID,
202-
addressData: .init(billingAddress: sampleAddress(), shippingAddress: sampleAddress()),
212+
addressData: .init(billingAddress: address1, shippingAddress: address2),
203213
onAddressUpdate: nil,
204214
storageManager: testingStorage)
205215
viewModel.onLoadTrigger.send()

0 commit comments

Comments
 (0)