Skip to content

Commit 65f6c56

Browse files
itsmeichigoitsmeichigo
committed
Fix build failure after merging
1 parent 8757215 commit 65f6c56

File tree

3 files changed

+34
-9
lines changed

3 files changed

+34
-9
lines changed

‎WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/Create Shipping Label Form/Package Details/Multi-package/ShippingLabelPackagesForm.swift‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ struct ShippingLabelPackagesForm_Previews: PreviewProvider {
5252
static var previews: some View {
5353
let viewModel = ShippingLabelPackagesFormViewModel(order: ShippingLabelPackagesFormViewModel.sampleOrder(),
5454
packagesResponse: ShippingLabelPackagesFormViewModel.samplePackageDetails(),
55-
selectedPackages: []) { _ in }
55+
selectedPackages: [],
56+
onSelectionCompletion: { _ in },
57+
onPackageSyncCompletion: { _ in })
5658

5759
ShippingLabelPackagesForm(viewModel: viewModel)
5860
.environment(\.colorScheme, .light)

‎WooCommerce/WooCommerceTests/ViewRelated/Shipping Label/Create Shipping Label/Multi-package/ShippingLabelPackageItemViewModelTests.swift‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@ class ShippingLabelPackageItemViewModelTests: XCTestCase {
255255
products: [product],
256256
productVariations: [],
257257
onPackageSwitch: { _ in },
258+
onPackagesSync: { _ in },
258259
formatter: currencyFormatter,
259260
weightUnit: "kg")
260261

@@ -276,6 +277,7 @@ class ShippingLabelPackageItemViewModelTests: XCTestCase {
276277
products: [],
277278
productVariations: [],
278279
onPackageSwitch: { _ in },
280+
onPackagesSync: { _ in },
279281
formatter: currencyFormatter,
280282
weightUnit: "kg")
281283

@@ -314,6 +316,7 @@ class ShippingLabelPackageItemViewModelTests: XCTestCase {
314316
products: [product],
315317
productVariations: [],
316318
onPackageSwitch: { _ in },
319+
onPackagesSync: { _ in },
317320
formatter: currencyFormatter,
318321
weightUnit: "kg")
319322

@@ -345,6 +348,7 @@ class ShippingLabelPackageItemViewModelTests: XCTestCase {
345348
products: [product],
346349
productVariations: [],
347350
onPackageSwitch: { _ in },
351+
onPackagesSync: { _ in },
348352
formatter: currencyFormatter,
349353
weightUnit: "kg")
350354

‎WooCommerce/WooCommerceTests/ViewRelated/Shipping Label/Create Shipping Label/Multi-package/ShippingLabelPackagesFormViewModelTests.swift‎

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,25 @@ class ShippingLabelPackagesFormViewModelTests: XCTestCase {
3434
let package2 = ShippingLabelPackageAttributes(packageID: "Box 2", totalWeight: "5.5", productIDs: [1, 2, 3])
3535

3636
// When & Then
37-
let viewModel1 = ShippingLabelPackagesFormViewModel(order: order, packagesResponse: nil, selectedPackages: []) { _ in }
37+
let viewModel1 = ShippingLabelPackagesFormViewModel(order: order,
38+
packagesResponse: nil,
39+
selectedPackages: [],
40+
onSelectionCompletion: { _ in },
41+
onPackageSyncCompletion: { _ in })
3842
XCTAssertFalse(viewModel1.foundMultiplePackages)
3943

40-
let viewModel2 = ShippingLabelPackagesFormViewModel(order: order, packagesResponse: nil, selectedPackages: [package1]) { _ in }
44+
let viewModel2 = ShippingLabelPackagesFormViewModel(order: order,
45+
packagesResponse: nil,
46+
selectedPackages: [package1],
47+
onSelectionCompletion: { _ in },
48+
onPackageSyncCompletion: { _ in })
4149
XCTAssertFalse(viewModel2.foundMultiplePackages)
4250

43-
let viewModel3 = ShippingLabelPackagesFormViewModel(order: order, packagesResponse: nil, selectedPackages: [package1, package2]) { _ in }
51+
let viewModel3 = ShippingLabelPackagesFormViewModel(order: order,
52+
packagesResponse: nil,
53+
selectedPackages: [package1, package2],
54+
onSelectionCompletion: { _ in },
55+
onPackageSyncCompletion: { _ in })
4456
XCTAssertTrue(viewModel3.foundMultiplePackages)
4557
}
4658

@@ -71,7 +83,9 @@ class ShippingLabelPackagesFormViewModelTests: XCTestCase {
7183
// When
7284
let viewModel = ShippingLabelPackagesFormViewModel(order: order,
7385
packagesResponse: nil,
74-
selectedPackages: [package1, package2]) { _ in }
86+
selectedPackages: [package1, package2],
87+
onSelectionCompletion: { _ in },
88+
onPackageSyncCompletion: { _ in })
7589

7690
// Then
7791
XCTAssertEqual(viewModel.itemViewModels.count, 2)
@@ -88,7 +102,9 @@ class ShippingLabelPackagesFormViewModelTests: XCTestCase {
88102
// When
89103
let viewModel = ShippingLabelPackagesFormViewModel(order: order,
90104
packagesResponse: nil,
91-
selectedPackages: [package1, package2]) { _ in }
105+
selectedPackages: [package1, package2],
106+
onSelectionCompletion: { _ in },
107+
onPackageSyncCompletion: { _ in })
92108

93109
// Then
94110
XCTAssertTrue(viewModel.doneButtonEnabled)
@@ -103,7 +119,9 @@ class ShippingLabelPackagesFormViewModelTests: XCTestCase {
103119
// When
104120
let viewModel = ShippingLabelPackagesFormViewModel(order: order,
105121
packagesResponse: nil,
106-
selectedPackages: [package1, package2]) { _ in }
122+
selectedPackages: [package1, package2],
123+
onSelectionCompletion: { _ in },
124+
onPackageSyncCompletion: { _ in })
107125
viewModel.itemViewModels.first?.totalWeight = "0"
108126

109127
// Then
@@ -117,14 +135,15 @@ class ShippingLabelPackagesFormViewModelTests: XCTestCase {
117135
let package2 = ShippingLabelPackageAttributes(packageID: "Box 2", totalWeight: "5.5", productIDs: [1, 2, 3])
118136

119137
var result: [ShippingLabelPackageAttributes] = []
120-
let completionHandler: ShippingLabelPackagesFormViewModel.Completion = { packages in
138+
let completionHandler = { packages in
121139
result = packages
122140
}
123141
// When
124142
let viewModel = ShippingLabelPackagesFormViewModel(order: order,
125143
packagesResponse: nil,
126144
selectedPackages: [package1, package2],
127-
onCompletion: completionHandler)
145+
onSelectionCompletion: completionHandler,
146+
onPackageSyncCompletion: { _ in })
128147
viewModel.confirmPackageSelection()
129148

130149
// Then

0 commit comments

Comments
 (0)