Skip to content

Commit be1a8a3

Browse files
committed
knock requests : fix test on room details view
1 parent 5ac401b commit be1a8a3

File tree

5 files changed

+24
-5
lines changed

5 files changed

+24
-5
lines changed

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ fun RoomDetailsView(
241241
@Composable
242242
private fun KnockRequestsItem(knockRequestsCount: Int?, onKnockRequestsClick: () -> Unit) {
243243
ListItem(
244-
headlineContent = { Text(stringResource(CommonStrings.screen_room_details_requests_to_join_title)) },
244+
headlineContent = { Text(stringResource(R.string.screen_room_details_requests_to_join_title)) },
245245
leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Notifications())),
246246
trailingContent = if (knockRequestsCount == null || knockRequestsCount == 0) {
247247
null
@@ -546,7 +546,7 @@ private fun PinnedMessagesItem(
546546
) {
547547
val analyticsService = LocalAnalyticsService.current
548548
ListItem(
549-
headlineContent = { Text(stringResource(CommonStrings.screen_room_details_pinned_events_row_title)) },
549+
headlineContent = { Text(stringResource(R.string.screen_room_details_pinned_events_row_title)) },
550550
leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Pin())),
551551
trailingContent =
552552
if (pinnedMessagesCount == null) {

features/roomdetails/impl/src/main/res/values/localazy.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,12 @@
4949
<string name="screen_room_details_invite_people_title">"Invite people"</string>
5050
<string name="screen_room_details_leave_conversation_title">"Leave conversation"</string>
5151
<string name="screen_room_details_leave_room_title">"Leave room"</string>
52+
<string name="screen_room_details_media_gallery_title">"Media and files"</string>
5253
<string name="screen_room_details_notification_mode_custom">"Custom"</string>
5354
<string name="screen_room_details_notification_mode_default">"Default"</string>
5455
<string name="screen_room_details_notification_title">"Notifications"</string>
56+
<string name="screen_room_details_pinned_events_row_title">"Pinned messages"</string>
57+
<string name="screen_room_details_requests_to_join_title">"Requests to join"</string>
5558
<string name="screen_room_details_roles_and_permissions">"Roles and permissions"</string>
5659
<string name="screen_room_details_room_name_label">"Room name"</string>
5760
<string name="screen_room_details_security_title">"Security"</string>

features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsViewTest.kt

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ class RoomDetailsViewTest {
129129
),
130130
onPinnedMessagesClick = callback,
131131
)
132-
rule.clickOn(CommonStrings.screen_room_details_pinned_events_row_title)
132+
rule.clickOn(R.string.screen_room_details_pinned_events_row_title)
133133
}
134134
}
135135

@@ -253,6 +253,21 @@ class RoomDetailsViewTest {
253253
rule.clickOn(R.string.screen_room_details_leave_room_title)
254254
eventsRecorder.assertSingle(RoomDetailsEvent.LeaveRoom)
255255
}
256+
257+
@Config(qualifiers = "h1024dp")
258+
@Test
259+
fun `click on knock requests invokes expected callback`() {
260+
ensureCalledOnce { callback ->
261+
rule.setRoomDetailView(
262+
state = aRoomDetailsState(
263+
eventSink = EventsRecorder(expectEvents = false),
264+
canShowKnockRequests = true,
265+
),
266+
onKnockRequestsClick = callback,
267+
)
268+
rule.clickOn(R.string.screen_room_details_requests_to_join_title)
269+
}
270+
}
256271
}
257272

258273
private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRoomDetailView(
@@ -270,6 +285,7 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRoomD
270285
openAdminSettings: () -> Unit = EnsureNeverCalled(),
271286
onJoinCallClick: () -> Unit = EnsureNeverCalled(),
272287
onPinnedMessagesClick: () -> Unit = EnsureNeverCalled(),
288+
onKnockRequestsClick: () -> Unit = EnsureNeverCalled(),
273289
) {
274290
setContent {
275291
RoomDetailsView(
@@ -285,6 +301,7 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRoomD
285301
openAdminSettings = openAdminSettings,
286302
onJoinCallClick = onJoinCallClick,
287303
onPinnedMessagesClick = onPinnedMessagesClick,
304+
onKnockRequestsClick = onKnockRequestsClick,
288305
)
289306
}
290307
}

libraries/ui-strings/src/main/res/values/localazy.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,8 +320,6 @@ Reason: %1$s."</string>
320320
<string name="screen_resolve_send_failure_unsigned_device_title">"Your message was not sent because %1$s has not verified all devices"</string>
321321
<string name="screen_resolve_send_failure_you_unsigned_device_subtitle">"One or more of your devices are unverified. You can send the message anyway, or you can cancel for now and try again later after you have verified all of your devices."</string>
322322
<string name="screen_resolve_send_failure_you_unsigned_device_title">"Your message was not sent because you have not verified one or more of your devices"</string>
323-
<string name="screen_room_details_pinned_events_row_title">"Pinned messages"</string>
324-
<string name="screen_room_details_requests_to_join_title">"Requests to join"</string>
325323
<string name="screen_room_error_failed_processing_media">"Failed processing media to upload, please try again."</string>
326324
<string name="screen_room_error_failed_retrieving_user_details">"Could not retrieve user details"</string>
327325
<plurals name="screen_room_multiple_knock_requests_title">

tools/localazy/config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@
165165
"name" : ":features:roomdetails:impl",
166166
"includeRegex" : [
167167
"screen_room_details_.*",
168+
"screen\\.room_details\\..*",
168169
"screen_room_member_list_.*",
169170
"screen_room_notification_settings_.*",
170171
"screen_notification_settings_edit_failed_updating_default_mode",

0 commit comments

Comments
 (0)