Skip to content

Commit 1057974

Browse files
rachelmcrrachelmcr
committed
Update unit tests
1 parent 5d79647 commit 1057974

File tree

6 files changed

+56
-54
lines changed

6 files changed

+56
-54
lines changed

‎Networking/NetworkingTests/Remote/WooShippingRemoteTests.swift‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,8 @@ final class WooShippingRemoteTests: XCTestCase {
135135
let result: Result<[ShippingLabelCarriersAndRates], Error> = waitFor { promise in
136136
remote.loadLabelRates(siteID: self.sampleSiteID,
137137
orderID: self.sampleOrderID,
138-
originAddress: ShippingLabelAddress.fake(), destinationAddress: ShippingLabelAddress.fake(),
138+
originAddress: WooShippingAddress.fake(),
139+
destinationAddress: WooShippingAddress.fake(),
139140
packages: [ShippingLabelPackageSelected.fake()]) { (result) in
140141
promise(result)
141142
}
@@ -155,7 +156,8 @@ final class WooShippingRemoteTests: XCTestCase {
155156
let result: Result<[ShippingLabelCarriersAndRates], Error> = waitFor { promise in
156157
remote.loadLabelRates(siteID: self.sampleSiteID,
157158
orderID: self.sampleOrderID,
158-
originAddress: ShippingLabelAddress.fake(), destinationAddress: ShippingLabelAddress.fake(),
159+
originAddress: WooShippingAddress.fake(),
160+
destinationAddress: WooShippingAddress.fake(),
159161
packages: [ShippingLabelPackageSelected.fake()]) { result in
160162
promise(result)
161163
}
@@ -270,8 +272,8 @@ final class WooShippingRemoteTests: XCTestCase {
270272
let result: Result<[ShippingLabelPurchase], Error> = waitFor { promise in
271273
remote.purchaseShippingLabel(siteID: self.sampleSiteID,
272274
orderID: self.sampleOrderID,
273-
originAddress: ShippingLabelAddress.fake(),
274-
destinationAddress: ShippingLabelAddress.fake(),
275+
originAddress: WooShippingAddress.fake(),
276+
destinationAddress: WooShippingAddress.fake(),
275277
package: WooShippingPackagePurchase.fake()) { result in
276278
promise(result)
277279
}
@@ -291,8 +293,8 @@ final class WooShippingRemoteTests: XCTestCase {
291293
let result: Result<[ShippingLabelPurchase], Error> = waitFor { promise in
292294
remote.purchaseShippingLabel(siteID: self.sampleSiteID,
293295
orderID: self.sampleOrderID,
294-
originAddress: ShippingLabelAddress.fake(),
295-
destinationAddress: ShippingLabelAddress.fake(),
296+
originAddress: WooShippingAddress.fake(),
297+
destinationAddress: WooShippingAddress.fake(),
296298
package: WooShippingPackagePurchase.fake()) { result in
297299
promise(result)
298300
}
@@ -426,7 +428,7 @@ final class WooShippingRemoteTests: XCTestCase {
426428
// When
427429
let result: Result<WooShippingAddressValidationSuccess, Error> = waitFor { promise in
428430
remote.addressValidation(siteID: self.sampleSiteID,
429-
address: ShippingLabelAddress.fake()) { result in
431+
address: WooShippingAddress.fake()) { result in
430432
promise(result)
431433
}
432434
}
@@ -447,7 +449,7 @@ final class WooShippingRemoteTests: XCTestCase {
447449
// When
448450
let result: Result<WooShippingAddressValidationSuccess, Error> = waitFor { promise in
449451
remote.addressValidation(siteID: self.sampleSiteID,
450-
address: ShippingLabelAddress.fake()) { result in
452+
address: WooShippingAddress.fake()) { result in
451453
promise(result)
452454
}
453455
}
@@ -468,7 +470,7 @@ final class WooShippingRemoteTests: XCTestCase {
468470
// When
469471
let result: Result<WooShippingAddressValidationSuccess, Error> = waitFor { promise in
470472
remote.addressValidation(siteID: self.sampleSiteID,
471-
address: ShippingLabelAddress.fake()) { result in
473+
address: WooShippingAddress.fake()) { result in
472474
promise(result)
473475
}
474476
}

‎WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShippingCreateLabelsViewModel.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ final class WooShippingCreateLabelsViewModel: ObservableObject {
6262

6363
/// Address to ship to (customer address), formatted for display and split into separate lines to allow additional formatting.
6464
private(set) lazy var destinationAddressLines: [String]? = {
65-
(destinationAddress?.formattedPostalAddress)?.components(separatedBy: .newlines)
65+
(destinationAddress?.formattedPostalAddress)?.components(separatedBy: ", ")
6666
}()
6767

6868
/// Possible statuses for a Woo Shipping destination address.

‎WooCommerce/WooCommerceTests/ViewRelated/Shipping Label/WooShipping Create Shipping Labels/WooShippingEditAddressViewModelTests.swift‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -726,16 +726,16 @@ final class WooShippingEditAddressViewModelTests: XCTestCase {
726726
@MainActor
727727
func test_remotelyValidateAddress_sends_expected_address_to_validate() async {
728728
// Given
729-
let expectedAddress = ShippingLabelAddress(company: "HEADQUARTERS",
730-
name: "JANE DOE",
731-
phone: "1-234-456-7890",
732-
country: "US",
733-
state: "NY",
734-
address1: "15 ALGONKIN ST STE 100",
735-
address2: "",
736-
city: "TICONDEROGA",
737-
postcode: "12883-1487")
738-
var receivedAddress: ShippingLabelAddress?
729+
let expectedAddress = WooShippingAddress(company: "HEADQUARTERS",
730+
name: "JANE DOE",
731+
phone: "1-234-456-7890",
732+
country: "US",
733+
state: "NY",
734+
address1: "15 ALGONKIN ST STE 100",
735+
address2: "",
736+
city: "TICONDEROGA",
737+
postcode: "12883-1487")
738+
var receivedAddress: WooShippingAddress?
739739
let storageManager = MockStorageManager()
740740
let country = Country(code: "US", name: "United States", states: [StateOfACountry(code: "NY", name: "New York")])
741741
storageManager.insertSampleCountries(readOnlyCountries: [country])

‎WooCommerce/WooCommerceTests/ViewRelated/Shipping Label/WooShipping Create Shipping Labels/WooShippingServiceViewModelTests.swift‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ final class WooShippingServiceViewModelTests: XCTestCase {
2525
func test_init_sets_expected_values() {
2626
// Given
2727
let viewModel = WooShippingServiceViewModel(order: Order.fake(),
28-
originAddress: ShippingLabelAddress.fake(),
29-
destinationAddress: ShippingLabelAddress.fake())
28+
originAddress: WooShippingAddress.fake(),
29+
destinationAddress: WooShippingAddress.fake())
3030

3131
// Then
3232
XCTAssertNil(viewModel.selectedRate)
@@ -36,7 +36,7 @@ final class WooShippingServiceViewModelTests: XCTestCase {
3636
func test_loadLabelRates_generates_service_tabs_with_expected_data() throws {
3737
// Given
3838
let viewModel = WooShippingServiceViewModel(order: Order.fake(),
39-
originAddress: ShippingLabelAddress.fake(),
39+
originAddress: WooShippingAddress.fake(),
4040
destinationAddress: sampleDestinationAddress(),
4141
stores: stores)
4242

@@ -105,7 +105,7 @@ final class WooShippingServiceViewModelTests: XCTestCase {
105105
}
106106
}
107107
let viewModel = WooShippingServiceViewModel(order: Order.fake(),
108-
originAddress: ShippingLabelAddress.fake(),
108+
originAddress: WooShippingAddress.fake(),
109109
destinationAddress: sampleDestinationAddress(),
110110
stores: stores)
111111

@@ -121,7 +121,7 @@ final class WooShippingServiceViewModelTests: XCTestCase {
121121
// Given
122122
let standardRate = sampleStandardRates()[1]
123123
let viewModel = WooShippingServiceViewModel(order: Order.fake(),
124-
originAddress: ShippingLabelAddress.fake(),
124+
originAddress: WooShippingAddress.fake(),
125125
destinationAddress: sampleDestinationAddress(),
126126
stores: stores)
127127

@@ -140,7 +140,7 @@ final class WooShippingServiceViewModelTests: XCTestCase {
140140
func test_selecting_service_card_signature_rate_updates_expected_values() {
141141
// Given
142142
let viewModel = WooShippingServiceViewModel(order: Order.fake(),
143-
originAddress: ShippingLabelAddress.fake(),
143+
originAddress: WooShippingAddress.fake(),
144144
destinationAddress: sampleDestinationAddress(),
145145
stores: stores)
146146
// When
@@ -157,7 +157,7 @@ final class WooShippingServiceViewModelTests: XCTestCase {
157157
func test_selecting_service_card_adult_signature_rate_updates_expected_values() {
158158
// Given
159159
let viewModel = WooShippingServiceViewModel(order: Order.fake(),
160-
originAddress: ShippingLabelAddress.fake(),
160+
originAddress: WooShippingAddress.fake(),
161161
destinationAddress: sampleDestinationAddress(),
162162
stores: stores)
163163

@@ -176,7 +176,7 @@ final class WooShippingServiceViewModelTests: XCTestCase {
176176
// Given
177177
var selectedRate: WooShippingSelectedRate?
178178
let viewModel = WooShippingServiceViewModel(order: Order.fake(),
179-
originAddress: ShippingLabelAddress.fake(),
179+
originAddress: WooShippingAddress.fake(),
180180
destinationAddress: sampleDestinationAddress(),
181181
stores: stores) { rate in
182182
selectedRate = rate
@@ -193,7 +193,7 @@ final class WooShippingServiceViewModelTests: XCTestCase {
193193
func test_sortShipping_by_price_returns_sorted_list() {
194194
// Given
195195
let viewModel = WooShippingServiceViewModel(order: Order.fake(),
196-
originAddress: ShippingLabelAddress.fake(),
196+
originAddress: WooShippingAddress.fake(),
197197
destinationAddress: sampleDestinationAddress(),
198198
stores: stores)
199199

@@ -210,7 +210,7 @@ final class WooShippingServiceViewModelTests: XCTestCase {
210210
func test_shortShipping_by_deliveryDays_returns_sorted_list() {
211211
// Given
212212
let viewModel = WooShippingServiceViewModel(order: Order.fake(),
213-
originAddress: ShippingLabelAddress.fake(),
213+
originAddress: WooShippingAddress.fake(),
214214
destinationAddress: sampleDestinationAddress(),
215215
stores: stores)
216216

@@ -227,7 +227,7 @@ final class WooShippingServiceViewModelTests: XCTestCase {
227227
func test_hasDestinationAddress_true_when_destination_address_is_complete() {
228228
// Given
229229
let viewModel = WooShippingServiceViewModel(order: Order.fake(),
230-
originAddress: ShippingLabelAddress.fake(),
230+
originAddress: WooShippingAddress.fake(),
231231
destinationAddress: sampleDestinationAddress(),
232232
stores: stores)
233233

@@ -238,8 +238,8 @@ final class WooShippingServiceViewModelTests: XCTestCase {
238238
func test_hasDestinationAddress_false_when_destination_address_is_empty() {
239239
// Given
240240
let viewModel = WooShippingServiceViewModel(order: Order.fake(),
241-
originAddress: ShippingLabelAddress.fake(),
242-
destinationAddress: ShippingLabelAddress.fake(),
241+
originAddress: WooShippingAddress.fake(),
242+
destinationAddress: WooShippingAddress.fake(),
243243
stores: stores)
244244

245245
// Then
@@ -329,15 +329,15 @@ private extension WooShippingServiceViewModelTests {
329329
deliveryDateGuaranteed: false)]
330330
}
331331

332-
func sampleDestinationAddress() -> ShippingLabelAddress {
333-
ShippingLabelAddress(company: "HEADQUARTERS",
334-
name: "JANE DOE",
335-
phone: "1-234-456-7890",
336-
country: "US",
337-
state: "NY",
338-
address1: "15 ALGONKIN ST STE 100",
339-
address2: "",
340-
city: "TICONDEROGA",
341-
postcode: "12883-1487")
332+
func sampleDestinationAddress() -> WooShippingAddress {
333+
WooShippingAddress(company: "HEADQUARTERS",
334+
name: "JANE DOE",
335+
phone: "1-234-456-7890",
336+
country: "US",
337+
state: "NY",
338+
address1: "15 ALGONKIN ST STE 100",
339+
address2: "",
340+
city: "TICONDEROGA",
341+
postcode: "12883-1487")
342342
}
343343
}

‎Yosemite/YosemiteTests/Mocks/Networking/Remote/MockWooShippingRemote.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ extension MockWooShippingRemote: WooShippingRemoteProtocol {
156156

157157
func loadLabelRates(siteID: Int64,
158158
orderID: Int64,
159-
originAddress: ShippingLabelAddress,
160-
destinationAddress: ShippingLabelAddress,
159+
originAddress: WooShippingAddress,
160+
destinationAddress: WooShippingAddress,
161161
packages: [ShippingLabelPackageSelected],
162162
completion: @escaping (Result<[ShippingLabelCarriersAndRates], Error>) -> Void) {
163163
DispatchQueue.main.async { [weak self] in
@@ -202,8 +202,8 @@ extension MockWooShippingRemote: WooShippingRemoteProtocol {
202202

203203
func purchaseShippingLabel(siteID: Int64,
204204
orderID: Int64,
205-
originAddress: Networking.ShippingLabelAddress,
206-
destinationAddress: Networking.ShippingLabelAddress,
205+
originAddress: Networking.WooShippingAddress,
206+
destinationAddress: Networking.WooShippingAddress,
207207
package: Networking.WooShippingPackagePurchase,
208208
completion: @escaping (Result<[ShippingLabelPurchase], Error>) -> Void) {
209209
DispatchQueue.main.async { [weak self] in
@@ -267,7 +267,7 @@ extension MockWooShippingRemote: WooShippingRemoteProtocol {
267267
}
268268

269269
func addressValidation(siteID: Int64,
270-
address: ShippingLabelAddress,
270+
address: WooShippingAddress,
271271
completion: @escaping (Result<WooShippingAddressValidationSuccess, any Error>) -> Void) {
272272
DispatchQueue.main.async { [weak self] in
273273
guard let self = self else { return }

‎Yosemite/YosemiteTests/Stores/WooShippingStoreTests.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@ final class WooShippingStoreTests: XCTestCase {
212212
let result: Result<[ShippingLabelCarriersAndRates], Error> = waitFor { promise in
213213
let action = WooShippingAction.loadLabelRates(siteID: self.sampleSiteID,
214214
orderID: self.sampleOrderID,
215-
originAddress: ShippingLabelAddress.fake(),
216-
destinationAddress: ShippingLabelAddress.fake(),
215+
originAddress: WooShippingAddress.fake(),
216+
destinationAddress: WooShippingAddress.fake(),
217217
packages: [ShippingLabelPackageSelected.fake()]) { result in
218218
promise(result)
219219
}
@@ -237,8 +237,8 @@ final class WooShippingStoreTests: XCTestCase {
237237
let result: Result<[ShippingLabelCarriersAndRates], Error> = waitFor { promise in
238238
let action = WooShippingAction.loadLabelRates(siteID: self.sampleSiteID,
239239
orderID: self.sampleOrderID,
240-
originAddress: ShippingLabelAddress.fake(),
241-
destinationAddress: ShippingLabelAddress.fake(),
240+
originAddress: WooShippingAddress.fake(),
241+
destinationAddress: WooShippingAddress.fake(),
242242
packages: [ShippingLabelPackageSelected.fake()]) { result in
243243
promise(result)
244244
}
@@ -619,7 +619,7 @@ final class WooShippingStoreTests: XCTestCase {
619619
// When
620620
let result: Result<WooShippingAddressValidationSuccess, Error> = waitFor { promise in
621621
let action = WooShippingAction.validateAddress(siteID: self.sampleSiteID,
622-
address: ShippingLabelAddress.fake()) { result in
622+
address: WooShippingAddress.fake()) { result in
623623
promise(result)
624624
}
625625
store.onAction(action)
@@ -640,7 +640,7 @@ final class WooShippingStoreTests: XCTestCase {
640640
// When
641641
let result: Result<WooShippingAddressValidationSuccess, Error> = waitFor { promise in
642642
let action = WooShippingAction.validateAddress(siteID: self.sampleSiteID,
643-
address: ShippingLabelAddress.fake()) { result in
643+
address: WooShippingAddress.fake()) { result in
644644
promise(result)
645645
}
646646
store.onAction(action)

0 commit comments

Comments
 (0)