Merge pull request #2858 from element-hq/feature/bma/moreTests

Add test about redacting an Event that has not been sent

features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt

@@ -69,12 +69,14 @@ import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
 import io.element.android.libraries.matrix.api.room.MessageEventType
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
+import io.element.android.libraries.matrix.api.timeline.item.event.LocalEventSendState
 import io.element.android.libraries.matrix.api.user.CurrentSessionIdHolder
 import io.element.android.libraries.matrix.test.AN_AVATAR_URL
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.A_SESSION_ID_2
+import io.element.android.libraries.matrix.test.A_TRANSACTION_ID
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.core.aBuildMeta
 import io.element.android.libraries.matrix.test.permalink.FakePermalinkBuilder
@@ -456,6 +458,31 @@ class MessagesPresenterTest {
         }
     }
 
+    @Test
+    fun `present - handle action redact message in error, in this case the message is just cancelled`() = runTest {
+        val coroutineDispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true)
+        val matrixRoom = FakeMatrixRoom()
+        val presenter = createMessagesPresenter(matrixRoom = matrixRoom, coroutineDispatchers = coroutineDispatchers)
+        moleculeFlow(RecompositionMode.Immediate) {
+            presenter.present()
+        }.test {
+            skipItems(1)
+            val initialState = awaitItem()
+            initialState.eventSink.invoke(
+                MessagesEvents.HandleAction(
+                    action = TimelineItemAction.Redact,
+                    event = aMessageEvent(
+                        transactionId = A_TRANSACTION_ID,
+                        sendState = LocalEventSendState.SendingFailed("Failed to send message")
+                    )
+                )
+            )
+            assertThat(matrixRoom.cancelSendCount).isEqualTo(1)
+            assertThat(matrixRoom.redactEventEventIdParam).isNull()
+            assertThat(awaitItem().actionListState.target).isEqualTo(ActionListState.Target.None)
+        }
+    }
+
     @Test
     fun `present - handle action report content`() = runTest {
         val navigator = FakeMessagesNavigator()

features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/fixtures/MessageEventFixtures.kt

@@ -28,6 +28,7 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.TransactionId
 import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugInfo
 import io.element.android.libraries.matrix.api.timeline.item.event.LocalEventSendState
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
@@ -38,6 +39,7 @@ import kotlinx.collections.immutable.toImmutableList
 
 internal fun aMessageEvent(
     eventId: EventId? = AN_EVENT_ID,
+    transactionId: TransactionId? = null,
     isMine: Boolean = true,
     isEditable: Boolean = true,
     content: TimelineItemEventContent = TimelineItemTextContent(body = A_MESSAGE, htmlDocument = null, formattedBody = null, isEdited = false),
@@ -48,6 +50,7 @@ internal fun aMessageEvent(
 ) = TimelineItem.Event(
     id = eventId?.value.orEmpty(),
     eventId = eventId,
+    transactionId = transactionId,
     senderId = A_USER_ID,
     senderProfile = aProfileTimelineDetailsReady(displayName = A_USER_NAME),
     senderAvatar = AvatarData(A_USER_ID.value, A_USER_NAME, size = AvatarSize.TimelineSender),