Merge pull request #7354 from woocommerce/add/ui-test-for-order-edit-flow

[Unified Order Editing] Add basic UI test for editing flow

Author: ealeksandrov

WooCommerce/Classes/ViewRelated/Orders/Order Creation/OrderForm.swift

@@ -171,6 +171,7 @@ struct OrderForm: View {
                         viewModel.finishEditing()
                         dismissHandler()
                     }
+                    .accessibilityIdentifier(Accessibility.doneButtonIdentifier)
                 case .loading:
                     ProgressView()
                 }
@@ -316,6 +317,7 @@ private extension OrderForm {
     enum Accessibility {
         static let createButtonIdentifier = "new-order-create-button"
         static let cancelButtonIdentifier = "new-order-cancel-button"
+        static let doneButtonIdentifier = "edit-order-done-button"
         static let addProductButtonIdentifier = "new-order-add-product-button"
     }
 }

WooCommerce/Classes/ViewRelated/Orders/Order Details/OrderDetailsViewController.swift

@@ -138,6 +138,7 @@ private extension OrderDetailsViewController {
                                          style: .plain,
                                          target: self,
                                          action: #selector(editOrder))
+        editButton.accessibilityIdentifier = "order-details-edit-button"
         editButton.isEnabled = viewModel.editButtonIsEnabled
         if ServiceLocator.featureFlagService.isFeatureFlagEnabled(FeatureFlag.unifiedOrderEditing) {
             navigationItem.rightBarButtonItem = editButton

WooCommerce/UITestsFoundation/Screens/Orders/AddFeeScreen.swift

@@ -32,10 +32,10 @@ public final class AddFeeScreen: ScreenObject {
     }
 
     /// Confirms entered fee and closes Add Fee screen.
-    /// - Returns: New Order screen object.
+    /// - Returns: Unified Order screen object.
     @discardableResult
-    public func confirmFee() throws -> NewOrderScreen {
+    public func confirmFee() throws -> UnifiedOrderScreen {
         doneButton.tap()
-        return try NewOrderScreen()
+        return try UnifiedOrderScreen()
     }
 }

WooCommerce/UITestsFoundation/Screens/Orders/AddProductScreen.swift

@@ -15,10 +15,10 @@ public final class AddProductScreen: ScreenObject {
     }
 
     /// Selects a product from the list.
-    /// - Returns: New Order screen object.
+    /// - Returns: Unified Order screen object.
     @discardableResult
-    public func selectProduct(byName name: String) throws -> NewOrderScreen {
+    public func selectProduct(byName name: String) throws -> UnifiedOrderScreen {
         app.buttons.staticTexts[name].tap()
-        return try NewOrderScreen()
+        return try UnifiedOrderScreen()
     }
 }

WooCommerce/UITestsFoundation/Screens/Orders/AddShippingScreen.swift

@@ -47,10 +47,10 @@ public final class AddShippingScreen: ScreenObject {
     }
 
     /// Confirms entered shipping details and closes Add Shipping screen.
-    /// - Returns: New Order screen object.
+    /// - Returns: Unified Order screen object.
     @discardableResult
-    public func confirmShippingDetails() throws -> NewOrderScreen {
+    public func confirmShippingDetails() throws -> UnifiedOrderScreen {
         doneButton.tap()
-        return try NewOrderScreen()
+        return try UnifiedOrderScreen()
     }
 }

WooCommerce/UITestsFoundation/Screens/Orders/CustomerDetailsScreen.swift

@@ -36,15 +36,15 @@ public final class CustomerDetailsScreen: ScreenObject {
     }
 
     /// Updates the order with minimal customer details.
-    /// - Returns: New Order screen object.
+    /// - Returns: Unified Order screen object.
     @discardableResult
-    public func enterCustomerDetails(name: String) throws -> NewOrderScreen {
+    public func enterCustomerDetails(name: String) throws -> UnifiedOrderScreen {
         billingFirstNameField.tap()
         billingFirstNameField.typeText(name)
         addressToggle.tap()
         shippingFirstNameField.tap()
         shippingFirstNameField.typeText(name)
         doneButton.tap()
-        return try NewOrderScreen()
+        return try UnifiedOrderScreen()
     }
 }

WooCommerce/UITestsFoundation/Screens/Orders/CustomerNoteScreen.swift

@@ -32,10 +32,10 @@ public final class CustomerNoteScreen: ScreenObject {
     }
 
     /// Confirms entered note and closes Customer Note screen.
-    /// - Returns: New Order screen object.
+    /// - Returns: Unified Order screen object.
     @discardableResult
-    public func confirmNote() throws -> NewOrderScreen {
+    public func confirmNote() throws -> UnifiedOrderScreen {
         doneButton.tap()
-        return try NewOrderScreen()
+        return try UnifiedOrderScreen()
     }
 }

WooCommerce/UITestsFoundation/Screens/Orders/OrderStatusScreen.swift

@@ -21,8 +21,8 @@ public final class OrderStatusScreen: ScreenObject {
     /// Selects a new order status from the list.
     /// - Returns: Order Status screen object (self).
     @discardableResult
-    public func selectOrderStatus(atIndex index: Int) throws -> NewOrderScreen {
+    public func selectOrderStatus(atIndex index: Int) throws -> UnifiedOrderScreen {
         orderStatusTable.cells.element(boundBy: index).tap()
-        return try NewOrderScreen()
+        return try UnifiedOrderScreen()
     }
 }

WooCommerce/UITestsFoundation/Screens/Orders/OrdersScreen.swift

@@ -81,11 +81,11 @@ public final class OrdersScreen: ScreenObject {
     }
 
     /// Starts the order creation flow by navigating from the Orders screen to the New Order screen.
-    /// - Returns: New Order screen object.
+    /// - Returns: Unified Order screen object.
     @discardableResult
-    public func startOrderCreation() throws -> NewOrderScreen {
+    public func startOrderCreation() throws -> UnifiedOrderScreen {
         createButton.tap()
         newOrderButton.tap()
-        return try NewOrderScreen()
+        return try UnifiedOrderScreen()
     }
 }

WooCommerce/UITestsFoundation/Screens/Orders/SingleOrderScreen.swift

@@ -6,15 +6,25 @@ public final class SingleOrderScreen: ScreenObject {
     // TODO: Remove force `try` once `ScreenObject` migration is completed
     let tabBar = try! TabNavComponent()
 
+    private let editOrderButtonGetter: (XCUIApplication) -> XCUIElement = {
+        $0.buttons["order-details-edit-button"]
+    }
+
+    private let summaryCellGetter: (XCUIApplication) -> XCUIElement = {
+        $0.staticTexts["summary-table-view-cell-title-label"]
+    }
+
     private let collectPaymentButtonGetter: (XCUIApplication) -> XCUIElement = {
         $0.buttons["order-details-collect-payment-button"]
     }
 
+    private var editOrderButton: XCUIElement { editOrderButtonGetter(app) }
+
     private var collectPaymentButton: XCUIElement { collectPaymentButtonGetter(app) }
 
     public init(app: XCUIApplication = XCUIApplication()) throws {
         try super.init(
-            expectedElementGetters: [ { $0.staticTexts["summary-table-view-cell-title-label"]} ],
+            expectedElementGetters: [ summaryCellGetter ],
             app: app
         )
     }
@@ -63,4 +73,10 @@ public final class SingleOrderScreen: ScreenObject {
         pop()
         return try OrdersScreen()
     }
+
+    @discardableResult
+    public func tapEditOrderButton() throws -> UnifiedOrderScreen {
+        editOrderButton.tap()
+        return try UnifiedOrderScreen(flow: .editing)
+    }
 }