settings icon moved to menu

Author: jostnes

WooCommerce/UITestsFoundation/Screens/Menu/MenuScreen.swift

@@ -23,4 +23,10 @@ public final class MenuScreen: ScreenObject {
         app.staticTexts["Reviews"].tap()
         return try ReviewsScreen()
     }
+
+    @discardableResult
+    public func openSettingsPane() throws -> SettingsScreen {
+        app.buttons["dashboard-settings-button"].tap()
+        return try SettingsScreen()
+    }
 }

WooCommerce/UITestsFoundation/Screens/MyStore/MyStoreScreen.swift

@@ -8,19 +8,13 @@ public final class MyStoreScreen: ScreenObject {
     // TODO: Remove force `try` once `ScreenObject` migration is completed
     public let periodStatsTable = try! PeriodStatsTable()
 
-    private let settingsButtonGetter: (XCUIApplication) -> XCUIElement = {
-        $0.buttons["dashboard-settings-button"]
-    }
-
-    private var settingsButton: XCUIElement { settingsButtonGetter(app) }
-
     static var isVisible: Bool {
         (try? MyStoreScreen().isLoaded) ?? false
     }
 
     public init(app: XCUIApplication = XCUIApplication()) throws {
         try super.init(
-            expectedElementGetters: [settingsButtonGetter],
+            expectedElementGetters: [ { $0.staticTexts["Your WooCommerce Store"] }],
             app: app
         )
     }
@@ -33,10 +27,4 @@ public final class MyStoreScreen: ScreenObject {
         topBannerCloseButton.tap()
         return self
     }
-
-    @discardableResult
-    public func openSettingsPane() throws -> SettingsScreen {
-        settingsButton.tap()
-        return try SettingsScreen()
-    }
 }

WooCommerce/WooCommerceUITests/Tests/LoginTests.swift

@@ -22,6 +22,8 @@ final class LoginTests: XCTestCase {
             .continueWithSelectedSite()
 
             // Log out
+        try TabNavComponent()
+            .goToMenuScreen()
             .openSettingsPane()
             .verifySelectedStoreDisplays(storeName: TestCredentials.storeName, siteUrl: TestCredentials.siteUrl)
             .logOut()
@@ -38,6 +40,8 @@ final class LoginTests: XCTestCase {
             .continueWithSelectedSite()
 
             // Log out
+        try TabNavComponent()
+            .goToMenuScreen()
             .openSettingsPane()
             .verifySelectedStoreDisplays(storeName: TestCredentials.storeName, siteUrl: TestCredentials.siteUrl)
             .logOut()