Resolve multiple matches for ChatChannelView accessibility identifier (#325)

testableapple · web-flow · commit d436b08f4d45 · 2023-06-01T10:35:21.000+01:00
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/ChatChannelView.swift b/Sources/StreamChatSwiftUI/ChatChannel/ChatChannelView.swift
@@ -179,6 +179,7 @@ public struct ChatChannelView<Factory: ViewFactory>: View, KeyboardReadable {
         )
         .padding(.bottom, keyboardShown || !tabBarAvailable || generatingSnapshot ? 0 : bottomPadding)
         .ignoresSafeArea(.container, edges: tabBarAvailable ? .bottom : [])
+        .accessibilityElement(children: .contain)
         .accessibilityIdentifier("ChatChannelView")
     }
 
diff --git a/StreamChatSwiftUITestsAppTests/Pages/MessageListPage.swift b/StreamChatSwiftUITestsAppTests/Pages/MessageListPage.swift
@@ -24,7 +24,7 @@ class MessageListPage {
     }
 
     static var list: XCUIElement {
-        app.scrollViews.matching(NSPredicate(format: "identifier LIKE 'ChatChannelView' or identifier LIKE 'MessageListScrollView'")).firstMatch
+        app.scrollViews.matching(NSPredicate(format: "identifier LIKE 'MessageListView' or identifier LIKE 'MessageListScrollView'")).firstMatch
     }
 
     static var typingIndicator: XCUIElement {

Original file line number	Diff line number	Diff line change
`@@ -179,6 +179,7 @@ public struct ChatChannelView<Factory: ViewFactory>: View, KeyboardReadable {`
`179`	`179`	`)`
`180`	`180`	`.padding(.bottom, keyboardShown \|\| !tabBarAvailable \|\| generatingSnapshot ? 0 : bottomPadding)`
`181`	`181`	`.ignoresSafeArea(.container, edges: tabBarAvailable ? .bottom : [])`
	`182`	`+ .accessibilityElement(children: .contain)`
`182`	`183`	`.accessibilityIdentifier("ChatChannelView")`
`183`	`184`	`}`
`184`	`185`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class MessageListPage {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`static var list: XCUIElement {`
`27`		`- app.scrollViews.matching(NSPredicate(format: "identifier LIKE 'ChatChannelView' or identifier LIKE 'MessageListScrollView'")).firstMatch`
	`27`	`+ app.scrollViews.matching(NSPredicate(format: "identifier LIKE 'MessageListView' or identifier LIKE 'MessageListScrollView'")).firstMatch`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`static var typingIndicator: XCUIElement {`