feat: add accessibility identifiers to wire drive - WPB-23902 (#4444)

OlivellaO · web-flow · commit 8daa4e2d69e5 · 2026-03-20T09:58:18.000Z
diff --git a/WireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/Create/CreateFileView.swift b/WireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/Create/CreateFileView.swift
@@ -18,6 +18,7 @@
 
 import SwiftUI
 import WireDesign
+import WireLocators
 import WireReusableUIComponents
 
 private typealias Strings = L10n.Localizable.Conversation.WireCells
@@ -94,7 +95,7 @@ private extension CreateFileView {
                 Text(L10n.Localizable.General.cancel)
             }
         )
-        .accessibilityIdentifier("cancelButton")
+        .accessibilityIdentifier(Locators.WireDrive.CreateFilePage.cancelButton)
     }
 
     @ViewBuilder var createButton: some View {
@@ -110,7 +111,7 @@ private extension CreateFileView {
                 }
             )
             .disabled(viewModel.isCreateDisabled)
-            .accessibilityIdentifier("createButton")
+            .accessibilityIdentifier(Locators.WireDrive.CreateFilePage.createButton)
         }
     }
 }
diff --git a/WireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/Edit/EditFileView.swift b/WireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/Edit/EditFileView.swift
@@ -18,6 +18,7 @@
 
 import SwiftUI
 import WebKit
+import WireLocators
 
 // MARK: - EditFileView
 
@@ -79,7 +80,7 @@ struct EditFileView<ViewModel>: View where ViewModel: EditFileViewModelProtocol
                     .frame(width: 44, height: 44, alignment: .trailing)
             }
         )
-        .accessibilityIdentifier("close")
+        .accessibilityIdentifier(Locators.WireDrive.EditFilePage.close)
     }
 }
 
diff --git a/WireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/FilesContentView.swift b/WireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/FilesContentView.swift
@@ -18,6 +18,7 @@
 
 package import SwiftUI
 import WireDesign
+import WireLocators
 
 private typealias Strings = L10n.Localizable.Conversation.WireCells
 private typealias Accessibility = L10n.Accessibility.Conversation.WireCells
@@ -148,6 +149,7 @@ private extension FilesContentView {
             itemRow(index: index)
                 .onAppear { loadMoreIfNeededTask(index: index) }
                 .onTapGesture { Task { await viewModel.openItem(item: item) } }
+                .accessibilityIdentifier(Locators.WireDrive.FilesContentPage.fileItem(index))
         }
     }
 
@@ -178,7 +180,7 @@ private extension FilesContentView {
     }
 
     var loadMoreRow: some View {
-        LoadMoreView(isLoading: viewModel.isLoading, onLoadMore: loadMore)
+        LoadMoreView(isLoading: viewModel.isLoading, onLoadMore: loadMoreTask)
     }
 }
 
@@ -188,6 +190,7 @@ private extension FilesContentView {
 
     var confirmButton: some View {
         Button(L10n.Localizable.General.confirm, action: {})
+            .accessibilityIdentifier(Locators.WireDrive.FilesContentPage.confirm)
     }
 }
 
@@ -203,7 +206,7 @@ private extension FilesContentView {
         Task { await viewModel.loadMoreIfNeeded(index: index) }
     }
 
-    func loadMore() {
+    func loadMoreTask() {
         let lastRowIndex = viewModel.state.items.count - 1
         Task { await viewModel.loadMoreIfNeeded(index: lastRowIndex) }
     }
@@ -234,6 +237,7 @@ private extension FilesContentView {
             placement: .navigationBarDrawer(displayMode: .always),
             prompt: Strings.Files.Search.title
         )
+        .accessibilityIdentifier(Locators.WireDrive.FilesContentPage.search)
     }
 }
 
diff --git a/WireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/FilesInfoView.swift b/WireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/FilesInfoView.swift
@@ -18,6 +18,7 @@
 
 import SwiftUI
 import WireDesign
+import WireLocators
 
 private typealias Strings = L10n.Localizable.Conversation.WireCells
 private typealias Accessibility = L10n.Accessibility.Conversation.WireCells
@@ -110,23 +111,26 @@ struct FilesInfoView: View {
         }
 
         var accessibilityIdentifiers: (title: String, message: String) {
+            typealias Identifiers = Locators.WireDrive.FilesInfoPage
+
             switch self {
             case .preparingFiles:
-                ("preparing-files-title", "preparing-files-message")
+                return (Identifiers.preparingFilesTitle.rawValue, Identifiers.preparingFilesMessage.rawValue)
             case let .noFilesFound(scope, isSearch):
                 if isSearch {
-                    (
-                        "no-files-search-title",
-                        "no-files-search-message"
+                    return (
+                        Identifiers.noFilesSearchTitle.rawValue,
+                        Identifiers.noFilesSearchMessage.rawValue
                     )
                 } else {
-                    (
-                        "no-files-title",
-                        scope == .allConversations ? "no-files-all-conversations-message" : "no-files-message"
+                    return (
+                        Identifiers.noFilesTitle.rawValue,
+                        scope == .allConversations ? Identifiers.noFilesAllConversationsMessage.rawValue : Identifiers
+                            .noFilesMessage.rawValue
                     )
                 }
             case .error:
-                ("error-title", "error-message")
+                return (Identifiers.errorTitle.rawValue, Identifiers.errorMessage.rawValue)
             }
         }
     }
@@ -206,9 +210,8 @@ struct FilesInfoView: View {
                 )
         }
         .accessibilityLabel(Strings.Files.Error.retry)
-        .accessibilityIdentifier("filesBrowser.retryButton")
+        .accessibilityIdentifier(Locators.WireDrive.FilesInfoPage.retryButton)
     }
-
 }
 
 #Preview("no files found - single conversation") {
@@ -239,7 +242,7 @@ struct LoadMoreView: View {
             } else {
                 Button(Strings.Files.LoadMore.title, action: onLoadMore)
                     .accessibilityLabel(Accessibility.Files.LoadMore.title)
-                    .accessibilityIdentifier("load-more")
+                    .accessibilityIdentifier(Locators.WireDrive.FilesInfoPage.loadMore.rawValue)
                     .buttonStyle(.borderless)
                     .font(for: .body3)
                     .foregroundStyle(ColorTheme.Buttons.Secondary.onEnabled.color)
diff --git a/WireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/FilesView.swift b/WireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/FilesView.swift
@@ -21,6 +21,7 @@ import QuickLook
 package import SwiftUI
 import WireDesign
 import WireFoundation
+import WireLocators
 import WireMessagingDomain
 import WireReusableUIComponents
 
@@ -114,7 +115,7 @@ private extension FilesView {
             }
         )
         .accessibilityLabel(Accessibility.Files.close)
-        .accessibilityIdentifier("close")
+        .accessibilityIdentifier(Locators.WireDrive.FilesPage.close.rawValue)
         .tint(ColorTheme.Base.primary(accentColor).color)
     }
 
@@ -130,6 +131,7 @@ private extension FilesView {
                         .tint(SemanticColors.Icon.foregroundDefaultBlack.color)
                 }
             }
+            .accessibilityIdentifier(Locators.WireDrive.FilesPage.createFolder.rawValue)
 
             Menu {
                 ForEach(viewModel.templates, id: \.self) { template in
@@ -153,6 +155,7 @@ private extension FilesView {
                         .tint(SemanticColors.Icon.foregroundDefaultBlack.color)
                 }
             }
+            .accessibilityIdentifier(Locators.WireDrive.FilesPage.createFile.rawValue)
 
             Button {
                 onOpenRecycleBin()
@@ -164,6 +167,7 @@ private extension FilesView {
                         .tint(SemanticColors.Icon.foregroundDefaultBlack.color)
                 }
             }
+            .accessibilityIdentifier(Locators.WireDrive.FilesPage.recycleBin.rawValue)
         } label: {
             Image(systemName: "ellipsis.circle")
         }
diff --git a/WireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/Item/FilesItemViewModel.swift b/WireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/Item/FilesItemViewModel.swift
@@ -35,7 +35,7 @@ final class FilesItemViewModel: ObservableObject {
     private let localAssetRepository: any WireDriveLocalAssetRepositoryProtocol
     private var cancellables = Set<AnyCancellable>()
 
-    enum ItemAction {
+    enum ItemAction: String {
         case open
         case showVersionHistory
         case edit
diff --git a/WireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/Item/FilesViewItemView.swift b/WireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/Item/FilesViewItemView.swift
@@ -273,6 +273,7 @@ struct FilesItemView: View {
     ) -> some View {
         if viewModel.menuActions.contains(itemAction) {
             menuItem(itemAction)
+                .accessibilityIdentifier("fileMenu.\(itemAction)")
         }
     }
 
diff --git a/WireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/Rename/FileRenameView.swift b/WireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/Rename/FileRenameView.swift
@@ -18,6 +18,7 @@
 
 import SwiftUI
 import WireDesign
+import WireLocators
 import WireReusableUIComponents
 
 private typealias Strings = L10n.Localizable.Conversation.WireCells
@@ -95,7 +96,7 @@ private extension FileRenameView {
             }
         )
         .accessibilityLabel(L10n.Accessibility.General.cancel)
-        .accessibilityIdentifier("cancel")
+        .accessibilityIdentifier(Locators.WireDrive.FileRenamePage.cancel)
     }
 
     var saveButton: some View {
@@ -113,7 +114,7 @@ private extension FileRenameView {
                 )
                 .disabled(viewModel.isSaveDisabled)
                 .accessibilityLabel(L10n.Accessibility.General.save)
-                .accessibilityIdentifier("save")
+                .accessibilityIdentifier(Locators.WireDrive.FileRenamePage.save)
             }
         }
     }
diff --git a/WireMessaging/Sources/WireMessagingUI/WireDrive/Components/ShareLink/ShareLinkPasswordView.swift b/WireMessaging/Sources/WireMessagingUI/WireDrive/Components/ShareLink/ShareLinkPasswordView.swift
@@ -19,6 +19,7 @@
 import SwiftUI
 import WireDesign
 import WireFoundation
+import WireLocators
 import WireMessagingDomain
 import WireMessagingDomainSupport
 
@@ -165,6 +166,7 @@ struct ShareLinkPasswordView: View {
             RoundedRectangle(cornerRadius: 10)
                 .foregroundStyle(ColorTheme.Buttons.Secondary.enabled.color)
         }
+        .accessibilityIdentifier(Locators.WireDrive.ShareLinkPasswordPage.togglePassword.rawValue)
     }
 
     @ViewBuilder
@@ -279,6 +281,7 @@ struct ShareLinkPasswordView: View {
             }
         }
         .tint(.primaryText)
+        .accessibilityIdentifier(Locators.WireDrive.ShareLinkPasswordPage.sharePassword.rawValue)
     }
 
     @ViewBuilder
@@ -308,6 +311,7 @@ struct ShareLinkPasswordView: View {
             }
         }
         .tint(.primaryText)
+        .accessibilityIdentifier(Locators.WireDrive.ShareLinkPasswordPage.resetPassword.rawValue)
     }
 
     @ToolbarContentBuilder
@@ -340,6 +344,7 @@ struct ShareLinkPasswordView: View {
                 }
             }
             .disabled(!viewModel.canSave)
+            .accessibilityIdentifier(Locators.WireDrive.ShareLinkPasswordPage.savePassword.rawValue)
         }
     }
 }
diff --git a/WireMessaging/Sources/WireMessagingUI/WireDrive/Components/ShareLink/ShareLinkView.swift b/WireMessaging/Sources/WireMessagingUI/WireDrive/Components/ShareLink/ShareLinkView.swift
@@ -19,6 +19,7 @@
 import SwiftUI
 import WireDesign
 import WireFoundation
+import WireLocators
 import WireMessagingDomain
 import WireMessagingDomainSupport
 
@@ -220,6 +221,7 @@ struct ShareLinkView: View {
                         .shadow(color: Color.black.opacity(0.05), radius: 4, x: 0, y: 2)
                 }
             }
+            .accessibilityIdentifier(Locators.WireDrive.ShareLinkPage.sharePassword.rawValue)
         }
         .padding(.horizontal)
         .padding(.bottom, 8)
@@ -233,6 +235,7 @@ struct ShareLinkView: View {
                 ShareLink(item: Strings.ShareLink.sharedMessage(link.absoluteString)) {
                     shareLinkContent()
                 }
+                .accessibilityIdentifier(Locators.WireDrive.ShareLinkPage.shareLink.rawValue)
             } else {
                 shareLinkContent()
             }
diff --git a/WireUI/Sources/WireLocators/Locators+accessibilityIdentifier.swift b/WireUI/Sources/WireLocators/Locators+accessibilityIdentifier.swift
@@ -0,0 +1,53 @@
+//
+// Wire
+// Copyright (C) 2026 Wire Swiss GmbH
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see http://www.gnu.org/licenses/.
+//
+
+import SwiftUI
+
+public extension View {
+
+    /// Adds an accessibility identifier to a view for testing purposes. To be used with `Locators.swift'
+    ///
+    /// This method allows you to specify a testable ID for SwiftUI views, which is particularly useful in automated
+    /// testing scenarios such as XCUITest. It accepts any `RawRepresentable` type whose `RawValue` is a `String`,
+    /// providing flexibility in how you pass the identifier.
+    ///
+    /// - Parameter id: A value conforming to `RawRepresentable` where the `RawValue` is a `String`. For example, you
+    /// can pass a simple `String`, or an `Enum` with a `String` raw value.
+    /// - Returns: A view with the accessibility identifier set.
+    ///
+    /// ### Usage Examples
+    ///
+    /// ```swift
+    /// // Using a plain string
+    /// Text("Hello")
+    ///     .accessibilityIdentifier("greeting")
+    ///
+    /// // Using an enum with raw values
+    /// Button(action: { /* ... */ }) {
+    ///     Text("Submit")
+    /// }
+    /// .accessibilityIdentifier(TestId.submitButton)
+    ///
+    /// enum TestId: String {
+    ///     case submitButton = "submitButton"
+    /// }
+    /// ```
+    func accessibilityIdentifier<T: RawRepresentable>(_ id: T) -> some View where T.RawValue == String {
+        accessibilityIdentifier(id.rawValue)
+    }
+}
diff --git a/WireUI/Sources/WireLocators/Locators.swift b/WireUI/Sources/WireLocators/Locators.swift

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`
`19`	`19`	`import SwiftUI`
`20`	`20`	`import WireDesign`
	`21`	`+import WireLocators`
`21`	`22`	`import WireReusableUIComponents`
`22`	`23`
`23`	`24`	`private typealias Strings = L10n.Localizable.Conversation.WireCells`
`@@ -94,7 +95,7 @@ private extension CreateFileView {`
`94`	`95`	`Text(L10n.Localizable.General.cancel)`
`95`	`96`	`}`
`96`	`97`	`)`
`97`		`- .accessibilityIdentifier("cancelButton")`
	`98`	`+ .accessibilityIdentifier(Locators.WireDrive.CreateFilePage.cancelButton)`
`98`	`99`	`}`
`99`	`100`
`100`	`101`	`@ViewBuilder var createButton: some View {`
`@@ -110,7 +111,7 @@ private extension CreateFileView {`
`110`	`111`	`}`
`111`	`112`	`)`
`112`	`113`	`.disabled(viewModel.isCreateDisabled)`
`113`		`- .accessibilityIdentifier("createButton")`
	`114`	`+ .accessibilityIdentifier(Locators.WireDrive.CreateFilePage.createButton)`
`114`	`115`	`}`
`115`	`116`	`}`
`116`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ import QuickLook`
`21`	`21`	`package import SwiftUI`
`22`	`22`	`import WireDesign`
`23`	`23`	`import WireFoundation`
	`24`	`+import WireLocators`
`24`	`25`	`import WireMessagingDomain`
`25`	`26`	`import WireReusableUIComponents`
`26`	`27`
`@@ -114,7 +115,7 @@ private extension FilesView {`
`114`	`115`	`}`
`115`	`116`	`)`
`116`	`117`	`.accessibilityLabel(Accessibility.Files.close)`
`117`		`- .accessibilityIdentifier("close")`
	`118`	`+ .accessibilityIdentifier(Locators.WireDrive.FilesPage.close.rawValue)`
`118`	`119`	`.tint(ColorTheme.Base.primary(accentColor).color)`
`119`	`120`	`}`
`120`	`121`
`@@ -130,6 +131,7 @@ private extension FilesView {`
`130`	`131`	`.tint(SemanticColors.Icon.foregroundDefaultBlack.color)`
`131`	`132`	`}`
`132`	`133`	`}`
	`134`	`+ .accessibilityIdentifier(Locators.WireDrive.FilesPage.createFolder.rawValue)`
`133`	`135`
`134`	`136`	`Menu {`
`135`	`137`	`ForEach(viewModel.templates, id: \.self) { template in`
`@@ -153,6 +155,7 @@ private extension FilesView {`
`153`	`155`	`.tint(SemanticColors.Icon.foregroundDefaultBlack.color)`
`154`	`156`	`}`
`155`	`157`	`}`
	`158`	`+ .accessibilityIdentifier(Locators.WireDrive.FilesPage.createFile.rawValue)`
`156`	`159`
`157`	`160`	`Button {`
`158`	`161`	`onOpenRecycleBin()`
`@@ -164,6 +167,7 @@ private extension FilesView {`
`164`	`167`	`.tint(SemanticColors.Icon.foregroundDefaultBlack.color)`
`165`	`168`	`}`
`166`	`169`	`}`
	`170`	`+ .accessibilityIdentifier(Locators.WireDrive.FilesPage.recycleBin.rawValue)`
`167`	`171`	`} label: {`
`168`	`172`	`Image(systemName: "ellipsis.circle")`
`169`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -273,6 +273,7 @@ struct FilesItemView: View {`
`273`	`273`	`) -> some View {`
`274`	`274`	`if viewModel.menuActions.contains(itemAction) {`
`275`	`275`	`menuItem(itemAction)`
	`276`	`+ .accessibilityIdentifier("fileMenu.\(itemAction)")`
`276`	`277`	`}`
`277`	`278`	`}`
`278`	`279`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`import SwiftUI`
`20`	`20`	`import WireDesign`
`21`	`21`	`import WireFoundation`
	`22`	`+import WireLocators`
`22`	`23`	`import WireMessagingDomain`
`23`	`24`	`import WireMessagingDomainSupport`
`24`	`25`
`@@ -165,6 +166,7 @@ struct ShareLinkPasswordView: View {`
`165`	`166`	`RoundedRectangle(cornerRadius: 10)`
`166`	`167`	`.foregroundStyle(ColorTheme.Buttons.Secondary.enabled.color)`
`167`	`168`	`}`
	`169`	`+ .accessibilityIdentifier(Locators.WireDrive.ShareLinkPasswordPage.togglePassword.rawValue)`
`168`	`170`	`}`
`169`	`171`
`170`	`172`	`@ViewBuilder`
`@@ -279,6 +281,7 @@ struct ShareLinkPasswordView: View {`
`279`	`281`	`}`
`280`	`282`	`}`
`281`	`283`	`.tint(.primaryText)`
	`284`	`+ .accessibilityIdentifier(Locators.WireDrive.ShareLinkPasswordPage.sharePassword.rawValue)`
`282`	`285`	`}`
`283`	`286`
`284`	`287`	`@ViewBuilder`
`@@ -308,6 +311,7 @@ struct ShareLinkPasswordView: View {`
`308`	`311`	`}`
`309`	`312`	`}`
`310`	`313`	`.tint(.primaryText)`
	`314`	`+ .accessibilityIdentifier(Locators.WireDrive.ShareLinkPasswordPage.resetPassword.rawValue)`
`311`	`315`	`}`
`312`	`316`
`313`	`317`	`@ToolbarContentBuilder`
`@@ -340,6 +344,7 @@ struct ShareLinkPasswordView: View {`
`340`	`344`	`}`
`341`	`345`	`}`
`342`	`346`	`.disabled(!viewModel.canSave)`
	`347`	`+ .accessibilityIdentifier(Locators.WireDrive.ShareLinkPasswordPage.savePassword.rawValue)`
`343`	`348`	`}`
`344`	`349`	`}`
`345`	`350`	`}`