Skip to content

Commit 0deef46

Browse files
committed
Rename areFieldValuesEmpty to areFieldValuesIncomplete
1 parent 28ddbce commit 0deef46

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ final class WooShippingAddCustomPackageViewModel: ObservableObject {
4343
}
4444
}
4545

46-
// Field values are invalid if one of them is empty
46+
// Field values are invalid if one of them is incomplete
4747
// - if we are saving template we check all field values
4848
// - if we are not saving template we check only dimensions
49-
var areFieldValuesEmpty: Bool {
49+
var areFieldValuesIncomplete: Bool {
5050
let keysToCheck: [WooShippingPackageUnitType] = showSaveTemplate ? WooShippingPackageUnitType.allCases : WooShippingPackageUnitType.dimensionUnits
5151

5252
var validFieldsCount: Int = 0
@@ -147,7 +147,7 @@ final class WooShippingAddCustomPackageViewModel: ObservableObject {
147147
}
148148

149149
func validateCustomPackageInputFields() -> Bool {
150-
guard !areFieldValuesEmpty else {
150+
if areFieldValuesIncomplete {
151151
return false
152152
}
153153
if showSaveTemplate {

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ final class WooShippingAddCustomPackageViewModelTests: XCTestCase {
2929

3030
// Then
3131
XCTAssertEqual(viewModel.fieldValues.isEmpty, false)
32-
XCTAssertEqual(viewModel.areFieldValuesEmpty, true)
32+
XCTAssertEqual(viewModel.areFieldValuesIncomplete, true)
3333
}
3434

3535
@MainActor
@@ -45,7 +45,7 @@ final class WooShippingAddCustomPackageViewModelTests: XCTestCase {
4545

4646
// Then
4747
XCTAssertEqual(viewModel.fieldValues.isEmpty, false)
48-
XCTAssertEqual(viewModel.areFieldValuesEmpty, false)
48+
XCTAssertEqual(viewModel.areFieldValuesIncomplete, false)
4949
}
5050

5151
@MainActor
@@ -62,7 +62,7 @@ final class WooShippingAddCustomPackageViewModelTests: XCTestCase {
6262

6363
// Then
6464
XCTAssertEqual(viewModel.fieldValues.isEmpty, false)
65-
XCTAssertEqual(viewModel.areFieldValuesEmpty, false)
65+
XCTAssertEqual(viewModel.areFieldValuesIncomplete, false)
6666
}
6767

6868
@MainActor
@@ -79,7 +79,7 @@ final class WooShippingAddCustomPackageViewModelTests: XCTestCase {
7979

8080
// Then
8181
XCTAssertEqual(viewModel.fieldValues.isEmpty, false)
82-
XCTAssertEqual(viewModel.areFieldValuesEmpty, true)
82+
XCTAssertEqual(viewModel.areFieldValuesIncomplete, true)
8383
}
8484

8585
@MainActor
@@ -96,7 +96,7 @@ final class WooShippingAddCustomPackageViewModelTests: XCTestCase {
9696
viewModel.fieldValues[.weight] = "1"
9797
// Then
9898
XCTAssertEqual(viewModel.fieldValues.isEmpty, false)
99-
XCTAssertEqual(viewModel.areFieldValuesEmpty, false)
99+
XCTAssertEqual(viewModel.areFieldValuesIncomplete, false)
100100
}
101101

102102
@MainActor
@@ -390,6 +390,6 @@ extension WooShippingAddCustomPackageViewModel {
390390
XCTAssertEqual(packageType, WooShippingPackageType.box)
391391
XCTAssertEqual(showSaveTemplate, false)
392392
XCTAssertEqual(packageTemplateName, "")
393-
XCTAssertEqual(areFieldValuesEmpty, true)
393+
XCTAssertEqual(areFieldValuesIncomplete, true)
394394
}
395395
}

0 commit comments

Comments
 (0)