fix conflicts

Author: findms

wire-ios/WireUITests/Pages/AccountSettingsPage.swift

@@ -16,60 +16,61 @@
 // along with this program. If not, see http://www.gnu.org/licenses/.
 //
 
+import WireLocators
 import XCTest
 
 class AccountSettingsPage: PageModel {
 
     override var pageMainElement: XCUIElement {
-        accountSettingsPageHeader
-    }
-
-    var accountSettingsPageHeader: XCUIElement {
-        app.staticTexts["Account"]
+        nameField
     }
 
     var nameField: XCUIElement {
-        app.descendants(matching: .any)["NameField"].firstMatch
+        app.textFields[Locators.AccountSettingsPage.nameField.rawValue]
     }
 
     var usernameField: XCUIElement {
-        app.descendants(matching: .any)["UsernameField"].firstMatch
+        app.staticTexts[Locators.AccountSettingsPage.usernameField.rawValue]
     }
 
     var emailField: XCUIElement {
-        app.descendants(matching: .any)["EmailField"].firstMatch
+        app.staticTexts[Locators.AccountSettingsPage.emailField.rawValue]
     }
 
     var domainField: XCUIElement {
-        app.descendants(matching: .any)["DomainFieldDisabled"].firstMatch
+        app.descendants(matching: .any)[Locators.AccountSettingsPage.domainFieldDisabled.rawValue].firstMatch
     }
 
     var logoutButton: XCUIElement {
-        app.staticTexts["Log Out"]
+        app.staticTexts[Locators.AccountSettingsPage.logOut.rawValue]
     }
 
     var deleteAccountButtonOnAccount: XCUIElement {
-        app.descendants(matching: .any)["Delete AccountField"].firstMatch
+        app.descendants(matching: .any)[Locators.AccountSettingsPage.deleteAccountField.rawValue].firstMatch
     }
 
     var oKButtonOnDeleteAccountAlert: XCUIElement {
-        app.buttons["OK"]
+        app.buttons[Locators.AccountSettingsPage.ok.rawValue]
     }
 
-    var backToSettingsButton: XCUIElement {
-        app.buttons["Settings"]
+    var backToPreviousPage: XCUIElement {
+        app.navigationBars.buttons.element(boundBy: 0)
     }
 
     var backupOrRestoreButton: XCUIElement {
-        app.descendants(matching: .any)["Back up or RestoreField"].firstMatch
+        app.descendants(matching: .any)[Locators.AccountSettingsPage.backuporRestoreField.rawValue].firstMatch
     }
 
     var resetPasswordButton: XCUIElement {
-        app.descendants(matching: .any)["Reset Password"].firstMatch
+        app.descendants(matching: .any)[Locators.AccountSettingsPage.resetPasswordField.rawValue].firstMatch
     }
 
     func getAccountName() -> String? {
-        nameField.value as? String
+        XCTAssertTrue(
+            nameField.waitForExistence(timeout: 5.0),
+            "NameField should exist before reading account name"
+        )
+        return nameField.value as? String
     }
 
     func getUsername() -> String {
@@ -85,9 +86,7 @@ class AccountSettingsPage: PageModel {
     }
 
     func backToSettings() throws -> SettingsPage {
-        if backToSettingsButton.exists {
-            backToSettingsButton.tap()
-        }
+        backToPreviousPage.tap()
         return try SettingsPage()
     }
 
@@ -115,15 +114,17 @@ class AccountSettingsPage: PageModel {
     }
 
     func goBackToSettingsPage() throws -> SettingsPage {
+
         if app.iPadOnly() {
             return try SettingsPage()
         }
-        backToSettingsButton.tap()
+        backToPreviousPage.tap()
         return try SettingsPage()
     }
 
     func tapOnResetPasswordButton() throws -> WebViewPage {
         resetPasswordButton.tap()
         return try WebViewPage()
     }
+
 }

wire-ios/WireUITests/Pages/ConversationsPage.swift

@@ -29,27 +29,27 @@ class ConversationsPage: PageModel {
     }
 
     var plusButtonToCreateGroupOrSearch: XCUIElement {
-        app.descendants(matching: .any)["create_group_or_search_button"].firstMatch
+        app.descendants(matching: .any)[Locators.ConversationsPage.createGroupOrSearchButton.rawValue].firstMatch
     }
 
     var conversationCell: XCUIElement {
-        app.buttons["title"]
+        app.buttons[Locators.ConversationsPage.conversationCell.rawValue]
     }
 
     var blockButtonOnMoreOptions: XCUIElement {
-        app.buttons["Block…"]
+        app.buttons[Locators.ConversationsPage.blockOptionOnContextMenu.rawValue]
     }
 
     var blockButtonOnBottomSheet: XCUIElement {
-        app.buttons["Block"]
+        app.buttons[Locators.ConversationsPage.blockButtonOnBottomSheet.rawValue].firstMatch
     }
 
     var videoCallButton: XCUIElement {
-        app.descendants(matching: .any)["videoCallBarButton"].firstMatch
+        app.descendants(matching: .any)[Locators.ActiveConversationPage.videoCallBarButton.rawValue].firstMatch
     }
 
     var acceptRequestButton: XCUIElement {
-        app.buttons["accept"]
+        app.buttons[Locators.ConnectionRequestsPage.connectRequestButton.rawValue]
     }
 
     var sidePanel: XCUIElement {
@@ -70,7 +70,8 @@ class ConversationsPage: PageModel {
         return try SettingsPage()
     }
 
-    func openUserAccountPageForUser(with input: String) throws -> UserAccountPage {
+
+    func openUserAccountPageForUser(with input: String) throws -> UserProfilePage {
         app.iPadOnly {
             if self.sideBarPanel.exists {
                 self.sideBarPanel.tap()
@@ -81,7 +82,7 @@ class ConversationsPage: PageModel {
         if button.waitForExistence(timeout: 2), button.isHittable {
             button.tap()
         }
-        return try UserAccountPage()
+        return try UserProfilePage()
     }
 
     func tapPlusButtonToCreateGroup() throws -> NewConversationPage {

wire-ios/WireUITests/Pages/OnMyDevicePage.swift

@@ -16,6 +16,7 @@
 // along with this program. If not, see http://www.gnu.org/licenses/.
 //
 
+import WireLocators
 import XCTest
 
 class OnMyDevicePage: PageModel {
@@ -30,7 +31,7 @@ class OnMyDevicePage: PageModel {
     }
 
     var saveButton: XCUIElement {
-        app.buttons["Save"]
+        app.buttons[Locators.OnMyiPhonePage.save.rawValue]
     }
 
     var backupFile: (String) -> XCUIElement {