fix: for CI failures where setUsernamePage doesn't load and flaky AccountSettingPage identifier removed - WPB-22561 (#4062)

findms · netbe · web-flow · commit ee2515f06c03 · 2026-01-05T16:21:15.000Z
Co-authored-by: François Benaiteau &lt;francois.benaiteau@wire.com&gt;
diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Settings/CellDescriptors/SettingsExternalScreenCellDescriptor.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Settings/CellDescriptors/SettingsExternalScreenCellDescriptor.swift
@@ -132,6 +132,7 @@ class SettingsExternalScreenCellDescriptor: SettingsGroupCellDescriptorType, Set
         cell.titleText = title
 
         if let tableCell = cell as? SettingsTableCell {
+            tableCell.accessibilityIdentifier = settingsTopLevelMenuItem?.accessibilityID
             tableCell.valueLabel.accessibilityIdentifier = title + "Field"
             tableCell.valueLabel.isAccessibilityElement = true
         }
diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Settings/SettingsCell.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Settings/SettingsCell.swift
@@ -193,6 +193,7 @@ class SettingsTableCell: SettingsTableCellProtocol {
     override func prepareForReuse() {
         super.prepareForReuse()
         preview = .none
+        accessibilityIdentifier = nil
     }
 
     func setup() {
diff --git a/wire-ios/WireUITests/AccountManagementTests.swift b/wire-ios/WireUITests/AccountManagementTests.swift
@@ -25,28 +25,13 @@ final class AccountManagementTests: WireUITestCase {
 
     @MainActor
     func test_Account_Management_Lock_With_Passcode() async throws {
+
         let passcode = UserGenerator.generateAppPasscode()
 
-        do {
-            let (_, teamOwner) = try await userHelper.registerUserAsTeamOwner()
-            let ownerAccessToken = try await userHelper.fetchAccessToken(
-                email: teamOwner.email,
-                password: teamOwner.password
-            )
-            let teamID = try XCTUnwrap(teamOwner.teamID)
-
-            let (_, userInfo) = try await userHelper.registerUsersAsTeamMember(
-                ownerAccessToken: ownerAccessToken,
-                teamID: teamID
-            )
-            teamMember = userInfo
-        } catch {
-            throw XCTSkip("error in setup of test: \(error)")
-        }
-
-        let page = try await app.loginUser(email: teamMember.email, password: teamMember.password)
-            .acceptPopupOnTeamMemberSetup(with: self)
-            .setUsername(teamMember.username)
+        let user = try await userHelper.createPersonalUser()
+
+        let page = try await app.loginUser(email: user.email, password: user.password)
+            .acceptPopup(with: self)
             .openSettings()
             .openOptionsMenu()
             .enableLockWithPasscode()
@@ -59,32 +44,18 @@ final class AccountManagementTests: WireUITestCase {
         )
 
         _ = try page.enterPasscode(passcode)
+
     }
 
     @MainActor
     func test_Account_Management_Update_Email_Reset_password() async throws {
+
         let updatedUserDetails = UserGenerator.generateUniqueUserInfo()
 
-        do {
-            let (_, teamOwner) = try await userHelper.registerUserAsTeamOwner()
-            let ownerAccessToken = try await userHelper.fetchAccessToken(
-                email: teamOwner.email,
-                password: teamOwner.password
-            )
-            let teamID = try XCTUnwrap(teamOwner.teamID)
-
-            let (_, userInfo) = try await userHelper.registerUsersAsTeamMember(
-                ownerAccessToken: ownerAccessToken,
-                teamID: teamID
-            )
-            teamMember = userInfo
-        } catch {
-            throw XCTSkip("error in setup of test: \(error)")
-        }
-
-        let verifyEmailPage = try app.loginUser(email: teamMember.email, password: teamMember.password)
-            .acceptPopupOnTeamMemberSetup(with: self)
-            .setUsername(teamMember.username)
+        let user = try await userHelper.createPersonalUser()
+
+        let verifyEmailPage = try app.loginUser(email: user.email, password: user.password)
+            .acceptPopup(with: self)
             .openSettings()
             .openAccountSettings()
             .tapEmailField()
diff --git a/wire-ios/WireUITests/BackupRestoreHistoryTests.swift b/wire-ios/WireUITests/BackupRestoreHistoryTests.swift
@@ -38,7 +38,7 @@ final class BackupRestoreHistoryTests: WireUITestCase {
 
         for _ in 0 ..< countOfMembers {
             let (qualifiedId, teamMember) = try await userHelper.registerUsersAsTeamMember(
-                ownerAccessToken: ownerAccessToken,
+                ownerAccessToken: ownerAccessToken.token,
                 teamID: teamID
             )
             qualifiedIds.append(qualifiedId)
@@ -52,8 +52,7 @@ final class BackupRestoreHistoryTests: WireUITestCase {
         )
 
         var activeConversationPage = try app.loginUser(email: teamOwner.email, password: teamOwner.password)
-            .acceptPopupOnTeamMemberSetup(with: self)
-            .setUsername(teamOwner.username)
+            .acceptPopup(with: self)
             .openConversation()
             .sendMessage(messageFromOwner)
 
diff --git a/wire-ios/WireUITests/Helper/UserHelper.swift b/wire-ios/WireUITests/Helper/UserHelper.swift
@@ -168,26 +168,37 @@ class UserHelper {
         )
 
         teamOwner.teamID = teamID
-        createdUsers.append(teamOwner)
-        return (qualifiedID: qualifiedId, owner: teamOwner)
-    }
 
-    func fetchAccessToken(email: String, password: String) async throws -> String {
+        // Get activation code
         let (activationCode, activationKey) = try await authenticationAPI.getActivationCode(
-            forEmail: email,
+            forEmail: teamOwner.email,
             basicAuth: basicAuth()
         )
 
-        try await authenticationAPI.activateUser(email: email, key: activationKey, code: activationCode)
+        // Activate user
+        try await authenticationAPI.activateUser(email: teamOwner.email, key: activationKey, code: activationCode)
+
+        authenticationManager.accessToken = try await fetchAccessToken(
+            email: teamOwner.email,
+            password: teamOwner.password
+        )
 
+        // Set username
+        try await selfUserAPI.updateHandle(handle: teamOwner.username)
+
+        createdUsers.append(teamOwner)
+        return (qualifiedID: qualifiedId, owner: teamOwner)
+    }
+
+    func fetchAccessToken(email: String, password: String) async throws -> AccessToken {
         let (_, accessToken) = try await authenticationAPI.login(
             email: email,
             password: password,
             verificationCode: nil,
             label: nil
         )
 
-        return accessToken.token
+        return accessToken
     }
 
     func registerUsersAsTeamMember(
diff --git a/wire-ios/WireUITests/Pages/SettingsPage.swift b/wire-ios/WireUITests/Pages/SettingsPage.swift
@@ -38,6 +38,7 @@ class SettingsPage: PageModel {
     }
 
     func openAccountSettings() throws -> AccountSettingsPage {
+        XCTAssertTrue(accountSettingsMenu.waitForExistence(timeout: 3))
         accountSettingsMenu.tap()
         return try AccountSettingsPage()
     }
diff --git a/wire-ios/WireUITests/TeamManageTests.swift b/wire-ios/WireUITests/TeamManageTests.swift
@@ -25,18 +25,16 @@ final class TeamManageTests: WireUITestCase {
     func test_Migrate_PersonalUserToTeam() async throws {
         let user = try await userHelper.createPersonalUser()
 
-        let firstTimePage = try app.loginUser(email: user.email, password: user.password)
-        var userProfilePage = try  firstTimePage.acceptPopup(with: self)
+        let conversationPage = try app.loginUser(email: user.email, password: user.password)
+            .acceptPopup(with: self)
             .openUserAccountPageForUser(with: user.name)
-
-        let conversationPage = try userProfilePage
             .tapCreateTeamButton()
             .tapContinue()
             .typeTeamNameAndContinue(user.teamName)
             .acceptTheConfirmationAndContinue()
             .tapBackToWireButton()
 
-        userProfilePage = try conversationPage.openUserAccountPageForUser(with: user.name)
+        let userProfilePage = try conversationPage.openUserAccountPageForUser(with: user.name)
 
         let teamName = try XCTUnwrap(userProfilePage.getTeamName())
         XCTAssertEqual(teamName, user.teamName, "Team name didn't match expected value \(user.teamName)")
@@ -93,20 +91,18 @@ final class TeamManageTests: WireUITestCase {
         )
 
         let (_, teamMember1) = try await userHelper.registerUsersAsTeamMember(
-            ownerAccessToken: ownerAccessToken,
+            ownerAccessToken: ownerAccessToken.token,
             teamID: teamID,
         )
 
         let (_, teamMember2) = try await userHelper.registerUsersAsTeamMember(
-            ownerAccessToken: ownerAccessToken,
+            ownerAccessToken: ownerAccessToken.token,
             teamID: teamID,
         )
 
-        let firstTimePage = try app.loginUser(email: teamOwner.email, password: teamOwner.password)
-        let conversationPage = try firstTimePage.acceptPopupOnTeamMemberSetup(with: self)
-            .setUsername(teamOwner.username)
-
-        let activeConversationPage = try conversationPage.tapPlusButtonToCreateGroup()
+        let activeConversationPage = try app.loginUser(email: teamOwner.email, password: teamOwner.password)
+            .acceptPopup(with: self)
+            .tapPlusButtonToCreateGroup()
             .tapNewGroupButton()
             .enterGroupName(groupName)
             .tapMemberCells(withLabelPrefixes: [teamMember1.name, teamMember2.name])
@@ -140,7 +136,7 @@ final class TeamManageTests: WireUITestCase {
 
         for _ in 0 ..< countOfMembers {
             let (qualifiedId, teamMember) = try await userHelper.registerUsersAsTeamMember(
-                ownerAccessToken: ownerAccessToken,
+                ownerAccessToken: ownerAccessToken.token,
                 teamID: teamID
             )
             qualifiedIds.append(qualifiedId)
@@ -154,8 +150,7 @@ final class TeamManageTests: WireUITestCase {
         )
 
         let conversationDetailsPage = try app.loginUser(email: teamOwner.email, password: teamOwner.password)
-            .acceptPopupOnTeamMemberSetup(with: self)
-            .setUsername(teamOwner.username)
+            .acceptPopup(with: self)
             .openConversation()
             .openConversationDetails()
             .openUserDetailsPage(byName: teamMembers[0].name)

Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,7 @@ class SettingsExternalScreenCellDescriptor: SettingsGroupCellDescriptorType, Set`
`132`	`132`	`cell.titleText = title`
`133`	`133`
`134`	`134`	`if let tableCell = cell as? SettingsTableCell {`
	`135`	`+ tableCell.accessibilityIdentifier = settingsTopLevelMenuItem?.accessibilityID`
`135`	`136`	`tableCell.valueLabel.accessibilityIdentifier = title + "Field"`
`136`	`137`	`tableCell.valueLabel.isAccessibilityElement = true`
`137`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,7 @@ class SettingsTableCell: SettingsTableCellProtocol {`
`193`	`193`	`override func prepareForReuse() {`
`194`	`194`	`super.prepareForReuse()`
`195`	`195`	`preview = .none`
	`196`	`+ accessibilityIdentifier = nil`
`196`	`197`	`}`
`197`	`198`
`198`	`199`	`func setup() {`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ class SettingsPage: PageModel {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`func openAccountSettings() throws -> AccountSettingsPage {`
	`41`	`+ XCTAssertTrue(accountSettingsMenu.waitForExistence(timeout: 3))`
`41`	`42`	`accountSettingsMenu.tap()`
`42`	`43`	`return try AccountSettingsPage()`
`43`	`44`	`}`