Adds screen object for ShippingLineDetails

rachelmcr · rachelmcr · commit 256bc9b8ec76 · 2022-06-21T19:03:34.000+01:00
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Creation/PaymentSection/ShippingLineDetails.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Creation/PaymentSection/ShippingLineDetails.swift
@@ -37,6 +37,7 @@ struct ShippingLineDetails: View {
                                         .onTapGesture {
                                             focusAmountInput = true
                                         }
+                                        .accessibilityIdentifier("add-shipping-amount-field")
                                 }
                             }
                             .frame(minHeight: Layout.amountRowHeight)
@@ -50,6 +51,7 @@ struct ShippingLineDetails: View {
                                                  text: $viewModel.methodTitle,
                                                  symbol: nil,
                                                  keyboardType: .default)
+                                .accessibilityIdentifier("add-shipping-name-field")
                         }
                         .padding(.horizontal, insets: safeAreaInsets)
                         .addingTopAndBottomDividers()
@@ -90,6 +92,7 @@ struct ShippingLineDetails: View {
                         presentation.wrappedValue.dismiss()
                     }
                     .disabled(viewModel.shouldDisableDoneButton)
+                    .accessibilityIdentifier("add-shipping-done-button")
                 }
             }
         }
diff --git a/WooCommerce/UITestsFoundation/Screens/Orders/AddShippingScreen.swift b/WooCommerce/UITestsFoundation/Screens/Orders/AddShippingScreen.swift
@@ -0,0 +1,56 @@
+import ScreenObject
+import XCTest
+
+public final class AddShippingScreen: ScreenObject {
+
+    private let shippingAmountGetter: (XCUIApplication) -> XCUIElement = {
+        $0.textFields["add-shipping-amount-field"]
+    }
+
+    private let shippingNameGetter: (XCUIApplication) -> XCUIElement = {
+        $0.textFields["add-shipping-name-field"]
+    }
+
+    private let doneButtonGetter: (XCUIApplication) -> XCUIElement = {
+        $0.buttons["add-shipping-done-button"]
+    }
+
+    private var shippingAmountField: XCUIElement { shippingAmountGetter(app) }
+
+    private var shippingNameField: XCUIElement { shippingNameGetter(app) }
+
+    private var doneButton: XCUIElement { doneButtonGetter(app) }
+
+    init(app: XCUIApplication = XCUIApplication()) throws {
+        try super.init(
+            expectedElementGetters: [ shippingAmountGetter ],
+            app: app
+        )
+    }
+
+    /// Enters a shipping amount.
+    /// - Returns: Add Shipping screen object.
+    @discardableResult
+    public func enterShippingAmount(_ amount: String) throws -> Self {
+        shippingAmountField.tap()
+        shippingAmountField.typeText(amount)
+        return self
+    }
+
+    /// Enters a shipping name.
+    /// - Returns: Add Shipping screen object.
+    @discardableResult
+    public func enterShippingName(_ name: String) throws -> Self {
+        shippingNameField.tap()
+        shippingNameField.typeText(name)
+        return self
+    }
+
+    /// Confirms entered shipping details and closes Add Shipping screen.
+    /// - Returns: New Order screen object.
+    @discardableResult
+    public func confirmShippingDetails() throws -> NewOrderScreen {
+        doneButton.tap()
+        return try NewOrderScreen()
+    }
+}
diff --git a/WooCommerce/WooCommerce.xcodeproj/project.pbxproj b/WooCommerce/WooCommerce.xcodeproj/project.pbxproj
@@ -1283,6 +1283,7 @@
 		CC666F2627F359590045AF1E /* OrdersTopBannerFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC666F2527F359590045AF1E /* OrdersTopBannerFactory.swift */; };
 		CC69236226010946002FB669 /* LoginProloguePages.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC69236126010946002FB669 /* LoginProloguePages.swift */; };
 		CC6923AC26010D8D002FB669 /* LoginProloguePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC6923AB26010D8D002FB669 /* LoginProloguePageViewController.swift */; };
+		CC71353B2862285300A28B42 /* AddShippingScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC71353A2862285300A28B42 /* AddShippingScreen.swift */; };
 		CC72BB6427BD842500837876 /* DisclosureIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC72BB6327BD842500837876 /* DisclosureIndicator.swift */; };
 		CC770C8A27B1497700CE6ABC /* SearchHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC770C8927B1497700CE6ABC /* SearchHeader.swift */; };
 		CC77488E2719A07D0043CDD7 /* ShippingLabelAddressTopBannerFactoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC77488D2719A07D0043CDD7 /* ShippingLabelAddressTopBannerFactoryTests.swift */; };
@@ -3054,6 +3055,7 @@
 		CC666F2527F359590045AF1E /* OrdersTopBannerFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrdersTopBannerFactory.swift; sourceTree = "<group>"; };
 		CC69236126010946002FB669 /* LoginProloguePages.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginProloguePages.swift; sourceTree = "<group>"; };
 		CC6923AB26010D8D002FB669 /* LoginProloguePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginProloguePageViewController.swift; sourceTree = "<group>"; };
+		CC71353A2862285300A28B42 /* AddShippingScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddShippingScreen.swift; sourceTree = "<group>"; };
 		CC72BB6327BD842500837876 /* DisclosureIndicator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisclosureIndicator.swift; sourceTree = "<group>"; };
 		CC770C8927B1497700CE6ABC /* SearchHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchHeader.swift; sourceTree = "<group>"; };
 		CC77488D2719A07D0043CDD7 /* ShippingLabelAddressTopBannerFactoryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShippingLabelAddressTopBannerFactoryTests.swift; sourceTree = "<group>"; };
@@ -8073,6 +8075,7 @@
 				F997173C23DBFBBF00592D8E /* OrderSearchScreen.swift */,
 				CC1AB56727FC5821003DEF43 /* OrderStatusScreen.swift */,
 				C044961228058FE8003B3081 /* AddProductScreen.swift */,
+				CC71353A2862285300A28B42 /* AddShippingScreen.swift */,
 			);
 			path = Orders;
 			sourceTree = "<group>";
@@ -8779,6 +8782,7 @@
 				3FF314EA26FC751B0012E68E /* XCTest+Extensions.swift in Sources */,
 				3F0CF3002704490A00EF3D71 /* OrderSearchScreen.swift in Sources */,
 				3F0CF3012704490A00EF3D71 /* ReviewsScreen.swift in Sources */,
+				CC71353B2862285300A28B42 /* AddShippingScreen.swift in Sources */,
 				3F0CF30A2704490A00EF3D71 /* OrdersScreen.swift in Sources */,
 				C044961328058FE8003B3081 /* AddProductScreen.swift in Sources */,
 				3F0CF3132704490A00EF3D71 /* PrologueScreen.swift in Sources */,

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ struct ShippingLineDetails: View {`
`37`	`37`	`.onTapGesture {`
`38`	`38`	`focusAmountInput = true`
`39`	`39`	`}`
	`40`	`+ .accessibilityIdentifier("add-shipping-amount-field")`
`40`	`41`	`}`
`41`	`42`	`}`
`42`	`43`	`.frame(minHeight: Layout.amountRowHeight)`
`@@ -50,6 +51,7 @@ struct ShippingLineDetails: View {`
`50`	`51`	`text: $viewModel.methodTitle,`
`51`	`52`	`symbol: nil,`
`52`	`53`	`keyboardType: .default)`
	`54`	`+ .accessibilityIdentifier("add-shipping-name-field")`
`53`	`55`	`}`
`54`	`56`	`.padding(.horizontal, insets: safeAreaInsets)`
`55`	`57`	`.addingTopAndBottomDividers()`
`@@ -90,6 +92,7 @@ struct ShippingLineDetails: View {`
`90`	`92`	`presentation.wrappedValue.dismiss()`
`91`	`93`	`}`
`92`	`94`	`.disabled(viewModel.shouldDisableDoneButton)`
	`95`	`+ .accessibilityIdentifier("add-shipping-done-button")`
`93`	`96`	`}`
`94`	`97`	`}`
`95`	`98`	`}`