File tree Expand file tree Collapse file tree 2 files changed +3
-7
lines changed
WooCommerce/UITestsFoundation/Screens Expand file tree Collapse file tree 2 files changed +3
-7
lines changed Original file line number Diff line number Diff line change @@ -21,11 +21,6 @@ public final class OrdersScreen: ScreenObject {
2121
2222 private var searchButton : XCUIElement { searchButtonGetter ( app) }
2323
24- // TODO: There's only one usage of this and it can be replaced with a screen instantiation
25- static var isVisible : Bool {
26- ( try ? OrdersScreen ( ) . isLoaded) ?? false
27- }
28-
2924 public init ( app: XCUIApplication = XCUIApplication ( ) ) throws {
3025 try super. init (
3126 expectedElementGetters: [
Original file line number Diff line number Diff line change @@ -48,11 +48,12 @@ public final class TabNavComponent: ScreenObject {
4848 @discardableResult
4949 public func gotoOrdersScreen( ) throws -> OrdersScreen {
5050 // Avoid transitioning if it is already on screen
51- if ! OrdersScreen. isVisible {
51+ guard let orderScreen = try ? OrdersScreen ( ) , orderScreen . isLoaded else {
5252 ordersTabButton. tap ( )
53+ return try OrdersScreen ( )
5354 }
5455
55- return try OrdersScreen ( )
56+ return orderScreen
5657 }
5758
5859 @discardableResult
You can’t perform that action at this time.
0 commit comments