Skip to content

Commit 2211134

Browse files
iamgabrielmaiamgabrielma
committed
update tests
1 parent 8327c8e commit 2211134

File tree

5 files changed

+33
-18
lines changed

5 files changed

+33
-18
lines changed

‎Modules/Tests/YosemiteTests/Stores/AppSettingsStoreTests+OrderFilterHistory.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ private extension AppSettingsStoreTests_OrderFilterHistory {
155155
let dateRange = OrderDateRangeFilter(filter: .custom, startDate: startDate, endDate: endDate)
156156
let productFilter = FilterOrdersByProduct(id: 1, name: "Sample product")
157157
let customerFilter = CustomerFilter(customer: Customer.fake().copy(customerID: 1))
158-
let salesChannelFilter = SalesChannelFilter(filter: .pointOfSale)
158+
let salesChannelFilter = SalesChannelFilter.pointOfSale
159159
return StoredOrderSettings.Setting(siteID: siteID,
160160
orderStatusesFilter: orderStatuses,
161161
dateRangeFilter: dateRange,

‎Modules/Tests/YosemiteTests/Stores/AppSettingsStoreTests+OrdersSettings.swift‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,13 @@ final class AppSettingsStoreTests_OrdersSettings: XCTestCase {
5151
let dateRange = OrderDateRangeFilter(filter: .custom, startDate: startDate, endDate: endDate)
5252
let productFilter = FilterOrdersByProduct(id: 1, name: "Sample product")
5353
let customerFilter = CustomerFilter(customer: Customer.fake().copy(customerID: 1))
54+
let salesChannelFilter = SalesChannelFilter.pointOfSale
5455
let orderSettings = StoredOrderSettings.Setting(siteID: siteID,
5556
orderStatusesFilter: orderStatuses,
5657
dateRangeFilter: dateRange,
5758
productFilter: productFilter,
58-
customerFilter: customerFilter
59+
customerFilter: customerFilter,
60+
salesChannelFilter: salesChannelFilter
5961
)
6062

6163
// When
@@ -73,7 +75,8 @@ final class AppSettingsStoreTests_OrdersSettings: XCTestCase {
7375
orderStatusesFilter: orderStatuses,
7476
dateRangeFilter: dateRange,
7577
productFilter: productFilter,
76-
customerFilter: customerFilter) { error in
78+
customerFilter: customerFilter,
79+
salesChannelFilter: salesChannelFilter) { error in
7780
XCTAssertNil(error)
7881
}
7982
subject.onAction(writeAction)
@@ -102,31 +105,36 @@ final class AppSettingsStoreTests_OrdersSettings: XCTestCase {
102105
let dateRange = OrderDateRangeFilter(filter: .custom, startDate: startDate, endDate: endDate)
103106
let productFilter = FilterOrdersByProduct(id: 1, name: "Sample product 1")
104107
let customerFilter = CustomerFilter(customer: Customer.fake().copy(customerID: 1))
108+
let salesChannelFilter = SalesChannelFilter.any
105109

106110
let orderStatuses2: [OrderStatusEnum] = [.pending, .cancelled]
107111
let startDate2 = Date().yearStart
108112
let endDate2 = Date().yearEnd
109113
let dateRange2 = OrderDateRangeFilter(filter: .custom, startDate: startDate2, endDate: endDate2)
110114
let productFilter2 = FilterOrdersByProduct(id: 2, name: "Sample product 2")
111115
let customerFilter2 = CustomerFilter(customer: Customer.fake().copy(customerID: 2))
116+
let salesChannelFilter2 = SalesChannelFilter.pointOfSale
112117

113118
let orderSettings1 = StoredOrderSettings.Setting(siteID: siteID1,
114-
orderStatusesFilter: orderStatuses,
115-
dateRangeFilter: dateRange,
119+
orderStatusesFilter: orderStatuses,
120+
dateRangeFilter: dateRange,
116121
productFilter: productFilter,
117-
customerFilter: customerFilter)
122+
customerFilter: customerFilter,
123+
salesChannelFilter: salesChannelFilter)
118124
let orderSettings2 = StoredOrderSettings.Setting(siteID: siteID2,
119-
orderStatusesFilter: orderStatuses2,
120-
dateRangeFilter: dateRange2,
125+
orderStatusesFilter: orderStatuses2,
126+
dateRangeFilter: dateRange2,
121127
productFilter: productFilter2,
122-
customerFilter: customerFilter2)
128+
customerFilter: customerFilter2,
129+
salesChannelFilter: salesChannelFilter2)
123130

124131
// When
125132
let writeAction1 = AppSettingsAction.upsertOrdersSettings(siteID: siteID1,
126133
orderStatusesFilter: orderStatuses,
127134
dateRangeFilter: dateRange,
128135
productFilter: productFilter,
129-
customerFilter: customerFilter) { error in
136+
customerFilter: customerFilter,
137+
salesChannelFilter: salesChannelFilter) { error in
130138
XCTAssertNil(error)
131139
}
132140
subject.onAction(writeAction1)
@@ -135,7 +143,8 @@ final class AppSettingsStoreTests_OrdersSettings: XCTestCase {
135143
orderStatusesFilter: orderStatuses2,
136144
dateRangeFilter: dateRange2,
137145
productFilter: productFilter2,
138-
customerFilter: customerFilter2) { error in
146+
customerFilter: customerFilter2,
147+
salesChannelFilter: salesChannelFilter2) { error in
139148
XCTAssertNil(error)
140149
}
141150
subject.onAction(writeAction2)

‎WooCommerce/Classes/Tools/BackgroundTasks/OrderListSyncBackgroundTask.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ private struct CurrentOrderListSyncUseCase {
7373
let action = AppSettingsAction.loadOrdersSettings(siteID: siteID) { (result) in
7474
switch result {
7575
case .success(let settings):
76-
// Cannot convert value of type 'SalesChannelFilter?' to expected argument type 'FilterOrderListViewModel.SalesChannelFilter?'
7776
let filters = FilterOrderListViewModel.Filters(orderStatus: settings.orderStatusesFilter,
7877
dateRange: settings.dateRangeFilter,
7978
product: settings.productFilter,

‎WooCommerce/WooCommerceTests/Notifications/PushNotificationBackgroundSynchronizerTests.swift‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,12 @@ private extension PushNotificationBackgroundSynchronizerTests {
8686
stores.whenReceivingAction(ofType: AppSettingsAction.self) { action in
8787
switch action {
8888
case let .loadOrdersSettings(_, onCompletion):
89-
onCompletion(.success(.init(siteID: order.siteID, orderStatusesFilter: nil, dateRangeFilter: nil, productFilter: nil, customerFilter: nil)))
89+
onCompletion(.success(.init(siteID: order.siteID,
90+
orderStatusesFilter: nil,
91+
dateRangeFilter: nil,
92+
productFilter: nil,
93+
customerFilter: nil,
94+
salesChannelFilter: nil)))
9095
default:
9196
break
9297
}

‎WooCommerce/WooCommerceTests/ViewRelated/Orders/Filters/FilterOrderListViewModelTests.swift‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ final class FilterOrderListViewModelTests: XCTestCase {
105105
dateRange: OrderDateRangeFilter(filter: .today),
106106
product: FilterOrdersByProduct(id: 1, name: "Sample product"),
107107
customer: CustomerFilter(customer: Customer.fake().copy(customerID: 1)),
108-
salesChannel: nil,
109-
numberOfActiveFilters: 4)
108+
salesChannel: SalesChannelFilter.pointOfSale,
109+
numberOfActiveFilters: 5)
110110
let viewModel = FilterOrderListViewModel(filters: filters,
111111
allowedStatuses: [],
112112
siteID: siteID,
@@ -122,13 +122,13 @@ final class FilterOrderListViewModelTests: XCTestCase {
122122
dateRange: result1.dateRangeFilter,
123123
product: result1.productFilter,
124124
customer: result1.customerFilter,
125-
salesChannel: nil,
125+
salesChannel: result1.salesChannelFilter,
126126
numberOfActiveFilters: result1.numberOfActiveFilters()),
127127
FilterOrderListViewModel.Filters(orderStatus: result2.orderStatusesFilter,
128128
dateRange: result2.dateRangeFilter,
129129
product: result2.productFilter,
130130
customer: result2.customerFilter,
131-
salesChannel: nil,
131+
salesChannel: result2.salesChannelFilter,
132132
numberOfActiveFilters: result2.numberOfActiveFilters())
133133
])
134134
}
@@ -215,10 +215,12 @@ private extension FilterOrderListViewModelTests {
215215
let dateRange = OrderDateRangeFilter(filter: .custom, startDate: startDate, endDate: endDate)
216216
let productFilter = FilterOrdersByProduct(id: 1, name: "Sample product")
217217
let customerFilter = CustomerFilter(customer: Customer.fake().copy(customerID: 1))
218+
let salesChannelFilter = SalesChannelFilter.pointOfSale
218219
return StoredOrderSettings.Setting(siteID: siteID,
219220
orderStatusesFilter: orderStatuses,
220221
dateRangeFilter: dateRange,
221222
productFilter: productFilter,
222-
customerFilter: customerFilter)
223+
customerFilter: customerFilter,
224+
salesChannelFilter: salesChannelFilter)
223225
}
224226
}

0 commit comments

Comments
 (0)