chore: Tests compatible to iPad - WPB-20998

WireNetwork/Sources/WireNetwork/APIs/Rest/AuthenticationAPI/AuthenticationAPIV0.swift

@@ -213,8 +213,7 @@ class AuthenticationAPIV0: AuthenticationAPI, VersionedAPI {
         let (data, response) = try await networkService.executeRequest(request)
 
         guard
-            let responseURL = response.url,
-            let responseHeaders = response.allHeaderFields as? [String: String]
+            response.allHeaderFields is [String: String]
         else {
             throw AuthenticationAPIError.invalidResponse
         }
@@ -239,7 +238,7 @@ class AuthenticationAPIV0: AuthenticationAPI, VersionedAPI {
             .withBody(body, contentType: .json)
             .build()
 
-        let (data, response) = try await networkService.executeRequest(request)
+        let (_, response) = try await networkService.executeRequest(request)
 
         guard
             let responseURL = response.url,
@@ -271,11 +270,12 @@ class AuthenticationAPIV0: AuthenticationAPI, VersionedAPI {
             .withBody(body, contentType: .json)
             .build()
 
-        let (data, response) = try await networkService.executeRequest(request)
+        let (_, response) = try await networkService.executeRequest(request)
 
         try ResponseParser()
             .success(code: .ok)
             .failure(code: .badRequest, label: "bad-request", error: AuthenticationAPIError.invalidEmail)
+            .parse(code: response.statusCode, data: nil)
     }
 
     func requestEmailVerificationCode(for email: String) async throws {

WireUI/Sources/WireSidebarUI/Views/SidebarView.swift

@@ -219,6 +219,7 @@ public struct SidebarView<AccountImageView: View, LegalHoldIndicatorView: View>:
         let icon: String
         var iconHighlighted: String?
         let accessibilityLabel: Text
+        var accessibilityIdentifier: String?
         switch menuItem {
         case .all:
             text = Text(Strings.ConversationFilter.All.title)
@@ -294,6 +295,7 @@ public struct SidebarView<AccountImageView: View, LegalHoldIndicatorView: View>:
             text = Text(Strings.Settings.title)
             icon = "gearshape"
             accessibilityLabel = Text(Labels.Settings.description)
+            accessibilityIdentifier = "bottomBarSettingsButton"
         }
 
         return SidebarMenuItemView(
@@ -306,6 +308,7 @@ public struct SidebarView<AccountImageView: View, LegalHoldIndicatorView: View>:
             accessibilityLabel: { accessibilityLabel },
             action: action
         )
+        .accessibilityIdentifier(accessibilityIdentifier ?? "")
     }
 
     public typealias AccountImageSource = SidebarAccountInfo.AccountImageSource

wire-ios/WireUITests/BackupRestoreHistoryTests.swift

@@ -79,7 +79,7 @@ final class BackupRestoreHistoryTests: WireUITestCase {
         let backupFileName = try XCTUnwrap(saveBackupFileBottomSheetPage.getBackupFileName())
 
         _ = try saveBackupFileBottomSheetPage.tapSaveToFilesOnBottomSheet()
-            .tapSaveButtonOnMyiPhonePage()
+            .tapSaveButton()
             .goBackToAccountPage()
             .logout()
             .enterPassword(teamOwner.password)
@@ -110,7 +110,7 @@ final class BackupRestoreHistoryTests: WireUITestCase {
         _ = try setPasswordPage.acceptHistoryrestoredAlert()
             .goBackToAccountPage()
             .goBackToSettingsPage()
-            .switchToConversationsTab()
+            .switchToAllConversations()
             .openConversation()
 
         sentMessages = try XCTUnwrap(activeConversationPage.fetchMessages())

wire-ios/WireUITests/Helper/UserHelper.swift

@@ -81,7 +81,7 @@ class UserHelper {
             email: user.email,
             password: user.password
         )
-        cookieStorage.cookies = cookies
+        try await cookieStorage.storeCookies(cookies)
 
         // Get activation code
         let (activationCode, activationKey) = try await authenticationAPI.getActivationCode(
@@ -306,8 +306,8 @@ enum FilterConversationsByCriteria {
     case conversationType(ConversationType?)
 }
 
-private final class MockCookieStorage: CookieStorageProtocol {
-    var cookies: [HTTPCookie]
+private actor MockCookieStorage: CookieStorageProtocol {
+    private var cookies: [HTTPCookie]
 
     init() {
         self.cookies = []

wire-ios/WireUITests/MultiBackendSupportTests.swift

@@ -53,7 +53,7 @@ final class MultiBackendSupportTests: WireUITestCase {
 
         _ = try accountPageBackend1
             .backToSettings()
-            .switchToConversationsTab()
+            .switchToAllConversations()
             .openUserAccountPageForUser(with: userBackend1.name)
             .tapAddAccountOrTeamButton()
 
@@ -63,7 +63,7 @@ final class MultiBackendSupportTests: WireUITestCase {
 
         accountPageBackend1 = try accountPageBackend2
             .backToSettings()
-            .switchToConversationsTab()
+            .switchToAllConversations()
             .openUserAccountPageForUser(with: userBackend2.name)
             .switchUserAccountForUser(withName: userBackend1.name)
             .openSettings()

wire-ios/WireUITests/Pages/AccountSettingsPage.swift

@@ -85,7 +85,9 @@ class AccountSettingsPage: PageModel {
     }
 
     func backToSettings() throws -> SettingsPage {
-        backToSettingsButton.tap()
+        if backToSettingsButton.exists {
+            backToSettingsButton.tap()
+        }
         return try SettingsPage()
     }
 
@@ -113,6 +115,9 @@ class AccountSettingsPage: PageModel {
     }
 
     func goBackToSettingsPage() throws -> SettingsPage {
+        if app.iPadOnly() {
+            return try SettingsPage()
+        }
         backToSettingsButton.tap()
         return try SettingsPage()
     }

wire-ios/WireUITests/Pages/ActiveConversationPage .swift

@@ -74,11 +74,19 @@ class ActiveConversationPage: PageModel {
     func sendMessage(_ message: String) throws -> ActiveConversationPage {
         try inputMessageField.tapIfKeyboardNotFocused().typeText(message)
         sendButton.tap()
+        // Revert this temporary workaround once WPB-17997 is fixed
+        // See: https://wearezeta.atlassian.net/browse/WPB-17997
+        let hideKeyboard = app.buttons["Hide keyboard"]
+        app.iPadOnly {
+            hideKeyboard.tap()
+        }
         return self
     }
 
     func goBackToConversationPage() throws -> ConversationsPage {
-        conversationBackButton.tap()
+        if conversationBackButton.exists {
+            conversationBackButton.tap()
+        }
         return try ConversationsPage()
     }
 

wire-ios/WireUITests/Pages/BackupOrRestorePage.swift

@@ -40,17 +40,34 @@ class BackupOrRestorePage: PageModel {
         app.tabBars.buttons["Browse"].firstMatch
     }
 
+    var moreButton: XCUIElement {
+        app.buttons["More"]
+    }
+
+    var sortByDateButton: XCUIElement {
+        app.buttons["Date"]
+    }
+
     func tapBackupNow() throws -> SetPasswordPage {
         backupNowButton.tap()
         return try SetPasswordPage()
     }
 
-    func tapRestoreFromBackupButton() throws -> OnMyiPhonePage {
+    func tapRestoreFromBackupButton() throws -> OnMyDevicePage {
         restoreFromBackupButton.tap()
+        sortFiles()
+        return try OnMyDevicePage()
+    }
+
+    private func sortFiles() {
+        if app.iPadOnly() {
+            return
+        }
         if !browseButtonOnBottom.isSelected {
             browseButtonOnBottom.tap()
+            moreButton.tap()
+            sortByDateButton.tap()
         }
-        return try OnMyiPhonePage()
     }
 
     func goBackToAccountPage() throws -> AccountSettingsPage {

wire-ios/WireUITests/Pages/ConversationsPage.swift

@@ -21,18 +21,14 @@ import XCTest
 
 class ConversationsPage: PageModel {
     override var pageMainElement: XCUIElement {
-        conversationsButton
-    }
-
-    var conversationsButton: XCUIElement {
-        app.buttons[Locators.ConversationsPage.bottomBarRecentListButton.rawValue]
+        plusButtonToCreateGroupOrSearch
     }
 
     var settingsButton: XCUIElement {
         app.buttons[Locators.ConversationsPage.bottomBarSettingsButton.rawValue]
     }
 
-    var plusButtonToCreateGroup: XCUIElement {
+    var plusButtonToCreateGroupOrSearch: XCUIElement {
         app.descendants(matching: .any)["create_group_or_search_button"].firstMatch
     }
 
@@ -56,12 +52,30 @@ class ConversationsPage: PageModel {
         app.buttons["accept"]
     }
 
+    var sidePanel: XCUIElement {
+        app.otherElements["PopoverDismissRegion"]
+    }
+
+    var sideBarPanel: XCUIElement {
+        app.buttons["ToggleSidebar"]
+    }
+
     func openSettings() throws -> SettingsPage {
+        app.iPadOnly {
+            if self.sideBarPanel.exists {
+                self.sideBarPanel.tap()
+            }
+        }
         settingsButton.tap()
         return try SettingsPage()
     }
 
     func openUserAccountPageForUser(with input: String) throws -> UserAccountPage {
+        app.iPadOnly {
+            if self.sideBarPanel.exists {
+                self.sideBarPanel.tap()
+            }
+        }
         let predicate = NSPredicate(format: "value BEGINSWITH %@", input)
         let button = app.buttons.containing(predicate).firstMatch
         if button.waitForExistence(timeout: 2), button.isHittable {
@@ -71,11 +85,21 @@ class ConversationsPage: PageModel {
     }
 
     func tapPlusButtonToCreateGroup() throws -> NewConversationPage {
-        plusButtonToCreateGroup.tap()
+        app.iPadOnly {
+            if self.sidePanel.exists {
+                self.sidePanel.tap()
+            }
+        }
+        plusButtonToCreateGroupOrSearch.tap()
         return try NewConversationPage()
     }
 
     func openPendingRequest() throws -> ConnectionRequestsPage {
+        app.iPadOnly {
+            if self.sidePanel.exists {
+                self.sidePanel.tap()
+            }
+        }
         XCTAssertTrue(conversationCell.waitForExistence(timeout: 5), "Conversation cell did not appear")
 
         let maxDuration: TimeInterval = 10
@@ -91,6 +115,11 @@ class ConversationsPage: PageModel {
     }
 
     func openConversation() throws -> ActiveConversationPage {
+        app.iPadOnly {
+            if self.sidePanel.exists {
+                self.sidePanel.tap()
+            }
+        }
         XCTAssertTrue(conversationCell.waitForExistence(timeout: 5), "Conversation cell did not appear")
 
         let maxDuration: TimeInterval = 10
@@ -117,6 +146,11 @@ class ConversationsPage: PageModel {
     }
 
     func getNameLabel() -> String? {
-        conversationCell.label
+        app.iPadOnly {
+            if self.sidePanel.exists {
+                self.sidePanel.tap()
+            }
+        }
+        return conversationCell.label
     }
 }

wire-ios/WireUITests/Pages/OnMyiPhonePage.swift → wire-ios/WireUITests/Pages/OnMyDevicePage.swift

@@ -18,47 +18,34 @@
 
 import XCTest
 
-class OnMyiPhonePage: PageModel {
+class OnMyDevicePage: PageModel {
 
     override var pageMainElement: XCUIElement {
-        onMyiPhonePageLabel
+        onMyDevicePageLabel
     }
 
-    var onMyiPhonePageLabel: XCUIElement {
-        app.staticTexts["On My iPhone"]
+    var onMyDevicePageLabel: XCUIElement {
+        let expected = UIDevice.current.userInterfaceIdiom == .pad ? "On My iPad" : "On My iPhone"
+        return app.staticTexts[expected]
     }
 
     var saveButton: XCUIElement {
         app.buttons["Save"]
     }
 
-    var searchField: XCUIElement {
-        app.searchFields["Search"]
-    }
-
-    var moreButton: XCUIElement {
-        app.buttons["More"]
-    }
-
-    var sortByDateButton: XCUIElement {
-        app.buttons["Date"]
-    }
-
     var backupFile: (String) -> XCUIElement {
         { name in
             let predicate = NSPredicate(format: "identifier CONTAINS %@", name)
             return self.app.cells.matching(predicate).firstMatch
         }
     }
 
-    func tapSaveButtonOnMyiPhonePage() throws -> BackupOrRestorePage {
+    func tapSaveButton() throws -> BackupOrRestorePage {
         saveButton.tap()
         return try BackupOrRestorePage()
     }
 
     func selectBackupFile(withName name: String) throws -> SetPasswordPage {
-        moreButton.tap()
-        sortByDateButton.tap()
         backupFile(name).tap()
         return try SetPasswordPage()
     }

wire-ios/WireUITests/Pages/SaveBackupFileBottomSheetPage.swift

@@ -40,9 +40,9 @@ class SaveBackupFileBottomSheetPage: PageModel {
         return element.exists ? element.label : nil
     }
 
-    func tapSaveToFilesOnBottomSheet() throws -> OnMyiPhonePage {
+    func tapSaveToFilesOnBottomSheet() throws -> OnMyDevicePage {
         saveToFilesOption.tap()
-        return try OnMyiPhonePage()
+        return try OnMyDevicePage()
     }
 
 }

wire-ios/WireUITests/Pages/SettingsPage.swift

@@ -37,6 +37,14 @@ class SettingsPage: PageModel {
         app.buttons[Locators.ConversationsPage.bottomBarRecentListButton.rawValue]
     }
 
+    var sideBarPanel: XCUIElement {
+        app.buttons["ToggleSidebar"]
+    }
+
+    var allConversations: XCUIElement {
+        app.buttons["All"]
+    }
+
     func openAccountSettings() throws -> AccountSettingsPage {
         accountSettingsMenu.tap()
         return try AccountSettingsPage()
@@ -47,8 +55,20 @@ class SettingsPage: PageModel {
         return try OptionsOnSettingsPage()
     }
 
-    func switchToConversationsTab() throws -> ConversationsPage {
-        conversationsTab.tap()
+    func switchToAllConversations() throws -> ConversationsPage {
+        if conversationsTab.exists {
+            conversationsTab.tap()
+        } else {
+            app.iPadOnly { [self] in
+                if sideBarPanel.exists {
+                    sideBarPanel.tap()
+                }
+
+                if allConversations.exists {
+                    allConversations.tap()
+                }
+            }
+        }
         return try ConversationsPage()
     }
 }