Skip to content

Commit f39d665

Browse files
committed
Update tests
1 parent 3c3694b commit f39d665

File tree

2 files changed

+47
-6
lines changed

2 files changed

+47
-6
lines changed

Modules/Tests/YosemiteTests/PointOfSale/PointOfSaleOrderServiceTests.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import XCTest
33
import struct NetworkingCore.PagedItems
44
import struct NetworkingCore.Order
55
import enum NetworkingCore.OrderStatusEnum
6+
import WooFoundation
67

78
final class PointOfSaleOrderServiceTests: XCTestCase {
89
private let siteID: Int64 = 13092
@@ -12,7 +13,11 @@ final class PointOfSaleOrderServiceTests: XCTestCase {
1213
override func setUp() {
1314
super.setUp()
1415
mockOrdersRemote = MockPOSOrdersRemote()
15-
orderProvider = PointOfSaleOrderListService(siteID: siteID, ordersRemote: mockOrdersRemote)
16+
orderProvider = PointOfSaleOrderListService(
17+
siteID: siteID,
18+
ordersRemote: mockOrdersRemote,
19+
currencyFormatter: CurrencyFormatter(currencySettings: CurrencySettings())
20+
)
1621
}
1722

1823
override func tearDown() {

WooCommerce/WooCommerceTests/POS/Mocks/MockPointOfSaleOrderListService.swift

Lines changed: 41 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ extension MockPointOfSaleOrderListService {
7373
datePaid: baseDate,
7474
status: .completed,
7575
total: "25.99",
76+
formattedTotal: "$25.99",
77+
formattedSubtotal: "$25.99",
7678
customerEmail: "[email protected]",
7779
paymentMethodID: "cod",
7880
paymentMethodTitle: "Cash",
@@ -84,8 +86,10 @@ extension MockPointOfSaleOrderListService {
8486
variationID: 0,
8587
quantity: 2,
8688
price: NSDecimalNumber(string: "10.00"),
89+
formattedPrice: "$10.00",
8790
subtotal: "20.00",
8891
total: "20.00",
92+
formattedTotal: "$20.00",
8993
attributes: []
9094
),
9195
POSOrderItem(
@@ -95,15 +99,21 @@ extension MockPointOfSaleOrderListService {
9599
variationID: 0,
96100
quantity: 1,
97101
price: NSDecimalNumber(string: "5.99"),
102+
formattedPrice: "$5.99",
98103
subtotal: "5.99",
99104
total: "5.99",
105+
formattedTotal: "$5.99",
100106
attributes: []
101107
)
102108
],
103109
refunds: [],
104110
currency: "USD",
105111
discountTotal: "0.00",
106-
totalTax: "0.00"
112+
totalTax: "0.00",
113+
formattedTotalTax: "$0.00",
114+
formattedDiscountTotal: nil,
115+
formattedPaymentTotal: "$25.99",
116+
formattedNetAmount: nil
107117
)
108118

109119
let order2 = POSOrder(
@@ -113,6 +123,8 @@ extension MockPointOfSaleOrderListService {
113123
datePaid: baseDate.addingTimeInterval(3600),
114124
status: .completed,
115125
total: "15.50",
126+
formattedTotal: "$15.50",
127+
formattedSubtotal: "$15.50",
116128
customerEmail: "[email protected]",
117129
paymentMethodID: "cod",
118130
paymentMethodTitle: "Card",
@@ -124,15 +136,21 @@ extension MockPointOfSaleOrderListService {
124136
variationID: 0,
125137
quantity: 1,
126138
price: NSDecimalNumber(string: "15.50"),
139+
formattedPrice: "$15.50",
127140
subtotal: "15.50",
128141
total: "15.50",
142+
formattedTotal: "$15.50",
129143
attributes: []
130144
)
131145
],
132146
refunds: [],
133147
currency: "USD",
134148
discountTotal: "0.00",
135-
totalTax: "0.00"
149+
totalTax: "0.00",
150+
formattedTotalTax: "$0.00",
151+
formattedDiscountTotal: nil,
152+
formattedPaymentTotal: "$15.50",
153+
formattedNetAmount: nil
136154
)
137155

138156
return [order1, order2]
@@ -148,6 +166,8 @@ extension MockPointOfSaleOrderListService {
148166
datePaid: baseDate.addingTimeInterval(7200),
149167
status: .completed,
150168
total: "42.75",
169+
formattedTotal: "$42.75",
170+
formattedSubtotal: "$42.75",
151171
customerEmail: "[email protected]",
152172
paymentMethodID: "cod",
153173
paymentMethodTitle: "Cash",
@@ -159,8 +179,10 @@ extension MockPointOfSaleOrderListService {
159179
variationID: 0,
160180
quantity: 1,
161181
price: NSDecimalNumber(string: "12.00"),
182+
formattedPrice: "$12.00",
162183
subtotal: "12.00",
163184
total: "12.00",
185+
formattedTotal: "$12.00",
164186
attributes: []
165187
),
166188
POSOrderItem(
@@ -170,15 +192,21 @@ extension MockPointOfSaleOrderListService {
170192
variationID: 0,
171193
quantity: 2,
172194
price: NSDecimalNumber(string: "15.375"),
195+
formattedPrice: "$15.38",
173196
subtotal: "30.75",
174197
total: "30.75",
198+
formattedTotal: "$30.75",
175199
attributes: []
176200
)
177201
],
178202
refunds: [],
179203
currency: "USD",
180204
discountTotal: "0.00",
181-
totalTax: "0.00"
205+
totalTax: "0.00",
206+
formattedTotalTax: "$0.00",
207+
formattedDiscountTotal: nil,
208+
formattedPaymentTotal: "$42.75",
209+
formattedNetAmount: nil
182210
)
183211

184212
let order4 = POSOrder(
@@ -188,6 +216,8 @@ extension MockPointOfSaleOrderListService {
188216
datePaid: baseDate.addingTimeInterval(10800),
189217
status: .refunded,
190218
total: "12.00",
219+
formattedTotal: "$12.00",
220+
formattedSubtotal: "$12.00",
191221
customerEmail: "[email protected]",
192222
paymentMethodID: "cod",
193223
paymentMethodTitle: "Card",
@@ -199,17 +229,23 @@ extension MockPointOfSaleOrderListService {
199229
variationID: 0,
200230
quantity: 1,
201231
price: NSDecimalNumber(string: "12.00"),
232+
formattedPrice: "$12.00",
202233
subtotal: "12.00",
203234
total: "12.00",
235+
formattedTotal: "$12.00",
204236
attributes: []
205237
)
206238
],
207239
refunds: [
208-
POSOrderRefund(refundID: 1001, total: "-12.00", reason: "Customer request")
240+
POSOrderRefund(refundID: 1001, total: "-12.00", formattedTotal: "-$12.00", reason: "Customer request")
209241
],
210242
currency: "USD",
211243
discountTotal: "0.00",
212-
totalTax: "0.00"
244+
totalTax: "0.00",
245+
formattedTotalTax: "$0.00",
246+
formattedDiscountTotal: nil,
247+
formattedPaymentTotal: "$12.00",
248+
formattedNetAmount: "$0.00"
213249
)
214250

215251
return [order3, order4]

0 commit comments

Comments
 (0)