Skip to content

Commit d638298

Browse files
committed
Merge branch 'woomob-870-shipping-labels-validate-dimensions-for-custom-packages' into woomob-874-shipping-labels-third-checkbox-on-ups-popup-is-not-visible
2 parents 1f30a72 + 28ddbce commit d638298

File tree

2 files changed

+1
-26
lines changed

2 files changed

+1
-26
lines changed

WooCommerce/Classes/ViewRelated/Orders/Order Details/Shipping Labels/WooShipping Create Shipping Labels/WooShipping Package and Rate Selection/WooShippingAddCustomPackageViewModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ final class WooShippingAddCustomPackageViewModel: ObservableObject {
6767
for (key, value) in fieldValues {
6868
guard keysToCheck.contains(key) else { continue }
6969
let doubleValue = Double(value)
70-
if doubleValue == nil || doubleValue == 0 {
70+
guard let doubleValue, doubleValue > 0 else {
7171
return false
7272
}
7373
}

WooCommerce/WooCommerceTests/ViewRelated/Shipping Label/WooShipping Create Shipping Labels/WooShippingAddCustomPackageViewModelTests.swift

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -281,31 +281,6 @@ final class WooShippingAddCustomPackageViewModelTests: XCTestCase {
281281

282282
// MARK: - allDimensionsValid tests
283283

284-
func test_allDimensionsValid_returns_false_when_no_dimensions_set() {
285-
// Given
286-
let siteID: Int64 = 1234
287-
let mockStores = MockStoresManager(sessionManager: .testingInstance)
288-
let viewModel = WooShippingAddCustomPackageViewModel(siteID: siteID, stores: mockStores)
289-
290-
// Then
291-
XCTAssertFalse(viewModel.allDimensionsValid)
292-
}
293-
294-
func test_allDimensionsValid_returns_false_when_some_dimensions_missing() {
295-
// Given
296-
let siteID: Int64 = 1234
297-
let mockStores = MockStoresManager(sessionManager: .testingInstance)
298-
let viewModel = WooShippingAddCustomPackageViewModel(siteID: siteID, stores: mockStores)
299-
300-
// When
301-
viewModel.fieldValues[.length] = "10"
302-
viewModel.fieldValues[.width] = "5"
303-
// height is missing
304-
305-
// Then
306-
XCTAssertFalse(viewModel.allDimensionsValid)
307-
}
308-
309284
func test_allDimensionsValid_returns_false_when_dimension_is_zero() {
310285
// Given
311286
let siteID: Int64 = 1234

0 commit comments

Comments
 (0)