Skip to content

Commit 528d318

Browse files
ealeksandrovealeksandrov
committed
Rename NewOrderScreen -> UnifiedOrderScreen
1 parent de87585 commit 528d318

File tree

10 files changed

+48
-40
lines changed

10 files changed

+48
-40
lines changed

‎WooCommerce/UITestsFoundation/Screens/Orders/AddFeeScreen.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ public final class AddFeeScreen: ScreenObject {
3232
}
3333

3434
/// Confirms entered fee and closes Add Fee screen.
35-
/// - Returns: New Order screen object.
35+
/// - Returns: Unified Order screen object.
3636
@discardableResult
37-
public func confirmFee() throws -> NewOrderScreen {
37+
public func confirmFee() throws -> UnifiedOrderScreen {
3838
doneButton.tap()
39-
return try NewOrderScreen()
39+
return try UnifiedOrderScreen()
4040
}
4141
}

‎WooCommerce/UITestsFoundation/Screens/Orders/AddProductScreen.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ public final class AddProductScreen: ScreenObject {
1515
}
1616

1717
/// Selects a product from the list.
18-
/// - Returns: New Order screen object.
18+
/// - Returns: Unified Order screen object.
1919
@discardableResult
20-
public func selectProduct(byName name: String) throws -> NewOrderScreen {
20+
public func selectProduct(byName name: String) throws -> UnifiedOrderScreen {
2121
app.buttons.staticTexts[name].tap()
22-
return try NewOrderScreen()
22+
return try UnifiedOrderScreen()
2323
}
2424
}

‎WooCommerce/UITestsFoundation/Screens/Orders/AddShippingScreen.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ public final class AddShippingScreen: ScreenObject {
4747
}
4848

4949
/// Confirms entered shipping details and closes Add Shipping screen.
50-
/// - Returns: New Order screen object.
50+
/// - Returns: Unified Order screen object.
5151
@discardableResult
52-
public func confirmShippingDetails() throws -> NewOrderScreen {
52+
public func confirmShippingDetails() throws -> UnifiedOrderScreen {
5353
doneButton.tap()
54-
return try NewOrderScreen()
54+
return try UnifiedOrderScreen()
5555
}
5656
}

‎WooCommerce/UITestsFoundation/Screens/Orders/CustomerDetailsScreen.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ public final class CustomerDetailsScreen: ScreenObject {
3636
}
3737

3838
/// Updates the order with minimal customer details.
39-
/// - Returns: New Order screen object.
39+
/// - Returns: Unified Order screen object.
4040
@discardableResult
41-
public func enterCustomerDetails(name: String) throws -> NewOrderScreen {
41+
public func enterCustomerDetails(name: String) throws -> UnifiedOrderScreen {
4242
billingFirstNameField.tap()
4343
billingFirstNameField.typeText(name)
4444
addressToggle.tap()
4545
shippingFirstNameField.tap()
4646
shippingFirstNameField.typeText(name)
4747
doneButton.tap()
48-
return try NewOrderScreen()
48+
return try UnifiedOrderScreen()
4949
}
5050
}

‎WooCommerce/UITestsFoundation/Screens/Orders/CustomerNoteScreen.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ public final class CustomerNoteScreen: ScreenObject {
3232
}
3333

3434
/// Confirms entered note and closes Customer Note screen.
35-
/// - Returns: New Order screen object.
35+
/// - Returns: Unified Order screen object.
3636
@discardableResult
37-
public func confirmNote() throws -> NewOrderScreen {
37+
public func confirmNote() throws -> UnifiedOrderScreen {
3838
doneButton.tap()
39-
return try NewOrderScreen()
39+
return try UnifiedOrderScreen()
4040
}
4141
}

‎WooCommerce/UITestsFoundation/Screens/Orders/OrderStatusScreen.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ public final class OrderStatusScreen: ScreenObject {
2121
/// Selects a new order status from the list.
2222
/// - Returns: Order Status screen object (self).
2323
@discardableResult
24-
public func selectOrderStatus(atIndex index: Int) throws -> NewOrderScreen {
24+
public func selectOrderStatus(atIndex index: Int) throws -> UnifiedOrderScreen {
2525
orderStatusTable.cells.element(boundBy: index).tap()
26-
return try NewOrderScreen()
26+
return try UnifiedOrderScreen()
2727
}
2828
}

‎WooCommerce/UITestsFoundation/Screens/Orders/OrdersScreen.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ public final class OrdersScreen: ScreenObject {
8181
}
8282

8383
/// Starts the order creation flow by navigating from the Orders screen to the New Order screen.
84-
/// - Returns: New Order screen object.
84+
/// - Returns: Unified Order screen object.
8585
@discardableResult
86-
public func startOrderCreation() throws -> NewOrderScreen {
86+
public func startOrderCreation() throws -> UnifiedOrderScreen {
8787
createButton.tap()
8888
newOrderButton.tap()
89-
return try NewOrderScreen()
89+
return try UnifiedOrderScreen()
9090
}
9191
}

‎WooCommerce/UITestsFoundation/Screens/Orders/SingleOrderScreen.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ public final class SingleOrderScreen: ScreenObject {
7878
}
7979

8080
@discardableResult
81-
public func tapEditOrderButton() throws -> NewOrderScreen {
81+
public func tapEditOrderButton() throws -> UnifiedOrderScreen {
8282
editOrderButton.tap()
83-
return try NewOrderScreen(flow: .editing)
83+
return try UnifiedOrderScreen(flow: .editing)
8484
}
8585
}

WooCommerce/UITestsFoundation/Screens/Orders/NewOrderScreen.swift renamed to WooCommerce/UITestsFoundation/Screens/Orders/UnifiedOrderScreen.swift

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import ScreenObject
22
import XCTest
33

4-
public final class NewOrderScreen: ScreenObject {
4+
/// This screen is used in both Order Create and Edit flows to reflect that these are unified in the app codebase
5+
///
6+
public final class UnifiedOrderScreen: ScreenObject {
57

68
private let createButtonGetter: (XCUIApplication) -> XCUIElement = {
79
$0.buttons["new-order-create-button"]
@@ -78,6 +80,9 @@ public final class NewOrderScreen: ScreenObject {
7880
case editing
7981
}
8082

83+
/// Since the screen is unified for creation and editing, pass a parameter to use the correct flow
84+
/// - Parameter flow: order flow, default is `creation`.
85+
///
8186
public init(app: XCUIApplication = XCUIApplication(), flow: Flow = .creation) throws {
8287
switch flow {
8388
case .creation:
@@ -154,24 +159,24 @@ public final class NewOrderScreen: ScreenObject {
154159
}
155160

156161
/// Changes the new order status to the second status in the Order Status list.
157-
/// - Returns: New Order screen object.
162+
/// - Returns: Unified Order screen object.
158163
@discardableResult
159-
public func editOrderStatus() throws -> NewOrderScreen {
164+
public func editOrderStatus() throws -> UnifiedOrderScreen {
160165
return try openOrderStatusScreen()
161166
.selectOrderStatus(atIndex: 1)
162167
}
163168

164169
/// Select the first product from the addProductScreen
165-
/// - Returns: New Order screen object.
170+
/// - Returns: Unified Order screen object.
166171
@discardableResult
167-
public func addProduct(byName name: String) throws -> NewOrderScreen {
172+
public func addProduct(byName name: String) throws -> UnifiedOrderScreen {
168173
return try openAddProductScreen()
169174
.selectProduct(byName: name)
170175
}
171176

172177
/// Adds minimal customer details on the Customer Details screen
173-
/// - Returns: New Order screen object.
174-
public func addCustomerDetails(name: String) throws -> NewOrderScreen {
178+
/// - Returns: Unified Order screen object.
179+
public func addCustomerDetails(name: String) throws -> UnifiedOrderScreen {
175180
return try openCustomerDetailsScreen()
176181
.enterCustomerDetails(name: name)
177182
}
@@ -180,8 +185,8 @@ public final class NewOrderScreen: ScreenObject {
180185
/// - Parameters:
181186
/// - amount: Amount (in the store currency) to add for shipping.
182187
/// - name: Name of the shipping method (e.g. "Free Shipping" or "Flat Rate").
183-
/// - Returns: New Order screen object.
184-
public func addShipping(amount: String, name: String) throws -> NewOrderScreen {
188+
/// - Returns: Unified Order screen object.
189+
public func addShipping(amount: String, name: String) throws -> UnifiedOrderScreen {
185190
return try openAddShippingScreen()
186191
.enterShippingAmount(amount)
187192
.enterShippingName(name)
@@ -191,17 +196,17 @@ public final class NewOrderScreen: ScreenObject {
191196
/// Adds a fee on the Add Fee screen.
192197
/// - Parameters:
193198
/// - amount: Amount (in the store currency) to add as a fee.
194-
/// - Returns: New Order screen object.
195-
public func addFee(amount: String) throws -> NewOrderScreen {
199+
/// - Returns: Unified Order screen object.
200+
public func addFee(amount: String) throws -> UnifiedOrderScreen {
196201
return try openAddFeeScreen()
197202
.enterFixedFee(amount: amount)
198203
.confirmFee()
199204
}
200205

201206
/// Adds a note on the Customer Note screen.
202207
/// - Parameter text: Text to enter as the customer note.
203-
/// - Returns: New Order screen object.
204-
public func addCustomerNote(_ text: String) throws -> NewOrderScreen {
208+
/// - Returns: Unified Order screen object.
209+
public func addCustomerNote(_ text: String) throws -> UnifiedOrderScreen {
205210
return try openCustomerNoteScreen()
206211
.enterNote(text)
207212
.confirmNote()
@@ -221,8 +226,11 @@ public final class NewOrderScreen: ScreenObject {
221226
return try OrdersScreen()
222227
}
223228

229+
/// Checks the screen for existence of the title with correct order number.
230+
/// - Parameter orderNumber: Existing order number to check.
231+
/// - Returns: Unified Order screen object.
224232
@discardableResult
225-
public func checkForExistingOrderTitle(byOrderNumber orderNumber: String) throws -> NewOrderScreen {
233+
public func checkForExistingOrderTitle(byOrderNumber orderNumber: String) throws -> UnifiedOrderScreen {
226234
let orderNumberPredicate = NSPredicate(format: "label MATCHES %@", "Order #\(orderNumber)")
227235
XCTAssertTrue(app.staticTexts.containing(orderNumberPredicate).element.exists)
228236

‎WooCommerce/WooCommerce.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1317,7 +1317,7 @@
13171317
CC593A6726EA116300EF0E04 /* ShippingLabelAddNewPackageViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC593A6626EA116300EF0E04 /* ShippingLabelAddNewPackageViewModelTests.swift */; };
13181318
CC593A6B26EA640800EF0E04 /* PackageCreationError+UI.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC593A6A26EA640800EF0E04 /* PackageCreationError+UI.swift */; };
13191319
CC5BA5F5287EDC900072F307 /* OrderCustomFieldsViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC5BA5F4287EDC900072F307 /* OrderCustomFieldsViewModelTests.swift */; };
1320-
CC5C278727EE19A700B25D2A /* NewOrderScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC5C278627EE19A600B25D2A /* NewOrderScreen.swift */; };
1320+
CC5C278727EE19A700B25D2A /* UnifiedOrderScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC5C278627EE19A600B25D2A /* UnifiedOrderScreen.swift */; };
13211321
CC5C278B27EE314F00B25D2A /* orders_3337_create_order.json in Resources */ = {isa = PBXBuildFile; fileRef = CC5C278A27EE314E00B25D2A /* orders_3337_create_order.json */; };
13221322
CC666F2427F329DC0045AF1E /* View+DiscardChanges.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC666F2327F329DC0045AF1E /* View+DiscardChanges.swift */; };
13231323
CC666F2627F359590045AF1E /* OrdersTopBannerFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC666F2527F359590045AF1E /* OrdersTopBannerFactory.swift */; };
@@ -3133,7 +3133,7 @@
31333133
CC593A6626EA116300EF0E04 /* ShippingLabelAddNewPackageViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShippingLabelAddNewPackageViewModelTests.swift; sourceTree = "<group>"; };
31343134
CC593A6A26EA640800EF0E04 /* PackageCreationError+UI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PackageCreationError+UI.swift"; sourceTree = "<group>"; };
31353135
CC5BA5F4287EDC900072F307 /* OrderCustomFieldsViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderCustomFieldsViewModelTests.swift; sourceTree = "<group>"; };
3136-
CC5C278627EE19A600B25D2A /* NewOrderScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewOrderScreen.swift; sourceTree = "<group>"; };
3136+
CC5C278627EE19A600B25D2A /* UnifiedOrderScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnifiedOrderScreen.swift; sourceTree = "<group>"; };
31373137
CC5C278A27EE314E00B25D2A /* orders_3337_create_order.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = orders_3337_create_order.json; sourceTree = "<group>"; };
31383138
CC666F2327F329DC0045AF1E /* View+DiscardChanges.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+DiscardChanges.swift"; sourceTree = "<group>"; };
31393139
CC666F2527F359590045AF1E /* OrdersTopBannerFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrdersTopBannerFactory.swift; sourceTree = "<group>"; };
@@ -8259,7 +8259,7 @@
82598259
isa = PBXGroup;
82608260
children = (
82618261
F997173423DBEB1900592D8E /* OrdersScreen.swift */,
8262-
CC5C278627EE19A600B25D2A /* NewOrderScreen.swift */,
8262+
CC5C278627EE19A600B25D2A /* UnifiedOrderScreen.swift */,
82638263
C027470F2822673800985EAE /* CustomerDetailsScreen.swift */,
82648264
F997173623DBF02400592D8E /* SingleOrderScreen.swift */,
82658265
F997173C23DBFBBF00592D8E /* OrderSearchScreen.swift */,
@@ -8971,7 +8971,7 @@
89718971
3F0CF2FF2704490A00EF3D71 /* SettingsScreen.swift in Sources */,
89728972
3F0CF3052704490A00EF3D71 /* LoginEpilogueScreen.swift in Sources */,
89738973
C064EE2B2783480000D54B0D /* OrderDataStructs.swift in Sources */,
8974-
CC5C278727EE19A700B25D2A /* NewOrderScreen.swift in Sources */,
8974+
CC5C278727EE19A700B25D2A /* UnifiedOrderScreen.swift in Sources */,
89758975
3FF314F426FD4C4A0012E68E /* BaseScreen.swift in Sources */,
89768976
3F0CF3042704490A00EF3D71 /* PeriodStatsTable.swift in Sources */,
89778977
3F0CF3142704494A00EF3D71 /* TabNavComponent.swift in Sources */,

0 commit comments

Comments
 (0)